diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index e7e91e0dd..946ac1a5f 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -152,7 +152,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 8} + m_AnchoredPosition: {x: 0, y: 9} m_SizeDelta: {x: 0, y: 10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &321673 @@ -5496,93 +5496,6 @@ MonoBehaviour: BarrelClipping: 0.25 Anamorphism: 0 BlendHint: 0 ---- !u!1 &548280683 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 548280685} - - component: {fileID: 548280684} - m_Layer: 0 - m_Name: BlueHead - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &548280684 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 548280683} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 9fd77125fee64f943ae87b17e69d0d9a, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &548280685 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 548280683} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -2.9, y: 0, z: -4.49} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!1001 &566176540 PrefabInstance: m_ObjectHideFlags: 0 @@ -8940,7 +8853,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 8} + m_AnchoredPosition: {x: 0, y: 11} m_SizeDelta: {x: 0, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &963867004 @@ -9067,7 +8980,7 @@ Transform: m_GameObject: {fileID: 970735071} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.100006, y: 18.8, z: 0} + m_LocalPosition: {x: 4.1, y: 19, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9411,6 +9324,7 @@ MonoBehaviour: _liquidRenderer: {fileID: 1947402520} _reachedCollider: {fileID: 2070548849} _amountText: {fileID: 963867004} + _balloonImage: {fileID: 1172519050} _completeCocktailImage: {fileID: 1821459832} _completeText: {fileID: 321673} _spawnTransform: {fileID: 970735072} @@ -9424,8 +9338,10 @@ MonoBehaviour: _colorLerpSpeed: 0.5 _colorIntensity: 2 _objectPoolCount: 1000 - _moveToPlayerDuration: 0.3 - _moveToCenterDuration: 0.1 + _centerBalloonImage: {fileID: 21300000, guid: 140fdbe02cd90bf47994129e6be6bafe, type: 3} + _playerBalloonImage: {fileID: 21300000, guid: e7b746bc5bff9d64fb1129b9aa8ccf3e, type: 3} + _moveToPlayerDuration: 0.5 + _moveToCenterDuration: 0.2 _centerPosition: {x: -300, y: 0, z: 0} _endPositionOffset: {x: 0, y: 20, z: 0} _endScale: {x: 0.3, y: 0.3, z: 0.3} @@ -11037,7 +10953,7 @@ GameObject: - component: {fileID: 1172519051} - component: {fileID: 1172519050} m_Layer: 5 - m_Name: Background + m_Name: BalloonImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -11053,7 +10969,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 282398544} - {fileID: 1795654740} @@ -11085,7 +11001,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 140fdbe02cd90bf47994129e6be6bafe, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11093,7 +11009,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2 --- !u!222 &1172519051 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12814,7 +12730,7 @@ Transform: m_GameObject: {fileID: 1321215892} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 2, z: 0} m_LocalScale: {x: 25, y: 25, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -14318,8 +14234,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f0f3dc568d0721b48ad5f24339d24951, type: 3} m_Name: m_EditorClassIdentifier: - _tycoonPlayer: {fileID: 0} - _isEntered: 0 --- !u!114 &1400792463 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17046,6 +16960,7 @@ MonoBehaviour: k__BackingField: {fileID: 1665075873} _dailyBgm: TycoonDailyBgm1 k__BackingField: + _currentLevel: 0 _maxPlayerHealth: 0 _currentPlayerHealth: 0 _playerMoveSpeedMultiplier: 0 @@ -17072,7 +16987,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f1f3fbad52bf14f4a919767bb32ac24f, type: 3} m_Name: m_EditorClassIdentifier: + _customerTableRoot: {fileID: 1903060916} _customerTables: [] + _activeCustomerTables: [] --- !u!114 &1665075872 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19628,7 +19545,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -25} + m_AnchoredPosition: {x: 0, y: -23} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1821459832 @@ -20718,6 +20635,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1903060916 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1582116343231843844, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} --- !u!1 &1909799356 GameObject: m_ObjectHideFlags: 0 @@ -22603,7 +22525,7 @@ Transform: m_GameObject: {fileID: 2070548847} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -10.5, z: 0} + m_LocalPosition: {x: 0, y: -8.5, z: 0} m_LocalScale: {x: 20, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -24681,7 +24603,7 @@ PrefabInstance: - target: {fileID: 5910700114136101566, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 488f84473afeade458a0b9a9df28930f, type: 2} + objectReference: {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} - target: {fileID: 5944316304459150779, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x value: 0.04741089 @@ -25030,6 +24952,10 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.27579662 objectReference: {fileID: 0} + - target: {fileID: 7860912239456808729, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8258969574862853637, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x value: 0.14923969 @@ -25118,6 +25044,10 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.35711366 objectReference: {fileID: 0} + - target: {fileID: 8804688619532928159, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8873814250568851775, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x value: -0.15334415 @@ -25594,6 +25524,5 @@ SceneRoots: - {fileID: 852387592} - {fileID: 7827484746149782377} - {fileID: 5626406452199475265} - - {fileID: 548280685} - {fileID: 1006730365} - {fileID: 20736010} diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs index 6b4efb199..0c9acfbe2 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs @@ -10,23 +10,23 @@ namespace BlueWater.BehaviorTrees.Actions [Serializable] public class FindTable : Action { - private Customer _customer; - - public override void OnAwake() - { - _customer = GetComponent(); - } - - public override void OnStart() - { - CustomerManager.Instance.TryFindEmptySeat(_customer); - } - - public override TaskStatus OnUpdate() - { - if (_customer.TableSeat == null) return TaskStatus.Running; - - return TaskStatus.Success; - } + // private Customer _customer; + // + // public override void OnAwake() + // { + // _customer = GetComponent(); + // } + // + // public override void OnStart() + // { + // CustomerManager.Instance.TryFindEmptySeat(_customer); + // } + // + // public override TaskStatus OnUpdate() + // { + // if (_customer.TableSeat == null) return TaskStatus.Running; + // + // return TaskStatus.Success; + // } } } \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs index a358516c1..7b5c67573 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs @@ -8,18 +8,18 @@ namespace BlueWater.BehaviorTrees.Actions [Serializable] public class CheckOrderBeverage : Conditional { - private Customer _customer; - private CustomerData _customerData; - - public override void OnAwake() - { - _customer = GetComponent(); - _customerData = _customer.CustomerData; - } - - public override TaskStatus OnUpdate() - { - return _customerData.IsOrderedBeverage() ? TaskStatus.Success : TaskStatus.Failure; - } + // private Customer _customer; + // private CustomerData _customerData; + // + // public override void OnAwake() + // { + // _customer = GetComponent(); + // _customerData = _customer.CustomerData; + // } + // + // public override TaskStatus OnUpdate() + // { + // return _customerData.IsOrderedBeverage() ? TaskStatus.Success : TaskStatus.Failure; + // } } } \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs index a540c1f31..80af11f6f 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs @@ -12,82 +12,82 @@ namespace BlueWater.BehaviorTrees.Actions [Serializable] public class OrderBeverage : Conditional { - private Customer _customer; - private CustomerData _customerData; - private BalloonUi _balloonUi; - - public override void OnAwake() - { - _customer = GetComponent(); - _customerData = _customer.CustomerData; - } - - public override void OnStart() - { - _balloonUi = _customer.BalloonUi; - // TODO : 음료가 다양해질 때 수정해야함 - _balloonUi.OrderItem("40001", _customerData.WaitTime, _customerData.HurryTime); - - _customer.OnInteraction += HandleBeverageInteraction; - _customer.RegisterPlayerInteraction(); - _customer.Bark("OrderBeverage", BarkOrder.FirstValid); - } - - public override TaskStatus OnUpdate() - { - if (_balloonUi.IsFoodReceive()) - { - _customer.OnInteraction -= HandleBeverageInteraction; - _customer.UnregisterPlayerInteraction(); - return TaskStatus.Success; - } - - if (_balloonUi.IsWaitTimeOver()) - { - _customer.OnInteraction -= HandleBeverageInteraction; - _customer.UnregisterPlayerInteraction(); - _customer.AddHappyPoint(-3); - if (_customer.HappyPoint <= 0) - { - _balloonUi.CancelOrder(); - var barkName = _customer.HappyPoint switch - { - >= 3 => "SatisfactoryEvaluation", - >= 2 => "MediocreEvaluation", - >= 1 => "MediocreEvaluation", - _ => "UnsatisfactoryEvaluation" - }; - _customer.Bark(barkName, BarkOrder.FirstValid); - } - return TaskStatus.Failure; - } - - return TaskStatus.Running; - } - - private void HandleBeverageInteraction() - { - var tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer; - var carriedBeverageData = tycoonPlayer.GetCurrentItemData(); - if (carriedBeverageData == null) - { - Debug.Log("플레이어가 가지고 있는 음식의 데이터가 없습니다."); - return; - } - - // TODO : 음료가 다양해질 때 수정해야함 - if (carriedBeverageData.Idx == "40001") - { - tycoonPlayer.GiveItem(); - _balloonUi.ReceiveFood(); - var itemData = ItemManager.Instance.ItemDataSo.GetDataByIdx(carriedBeverageData.Idx); - _customer.SetFood(itemData); - if (itemData.Quality == ItemQuality.High) - { - _customer.AddHappyPoint(1); - } - _customer.SpineController.PlayAnimation(CustomerSpineAnimation.Eat.ToString(), true); - } - } + // private Customer _customer; + // private CustomerData _customerData; + // private BalloonUi _balloonUi; + // + // public override void OnAwake() + // { + // _customer = GetComponent(); + // _customerData = _customer.CustomerData; + // } + // + // public override void OnStart() + // { + // _balloonUi = _customer.BalloonUi; + // // TODO : 음료가 다양해질 때 수정해야함 + // _balloonUi.OrderItem("40001", _customerData.WaitTime, _customerData.HurryTime); + // + // _customer.OnInteraction += HandleBeverageInteraction; + // _customer.RegisterPlayerInteraction(); + // _customer.Bark("OrderBeverage", BarkOrder.FirstValid); + // } + // + // public override TaskStatus OnUpdate() + // { + // if (_balloonUi.IsFoodReceive()) + // { + // _customer.OnInteraction -= HandleBeverageInteraction; + // _customer.UnregisterPlayerInteraction(); + // return TaskStatus.Success; + // } + // + // if (_balloonUi.IsWaitTimeOver()) + // { + // _customer.OnInteraction -= HandleBeverageInteraction; + // _customer.UnregisterPlayerInteraction(); + // _customer.AddHappyPoint(-3); + // if (_customer.HappyPoint <= 0) + // { + // _balloonUi.CancelOrder(); + // var barkName = _customer.HappyPoint switch + // { + // >= 3 => "SatisfactoryEvaluation", + // >= 2 => "MediocreEvaluation", + // >= 1 => "MediocreEvaluation", + // _ => "UnsatisfactoryEvaluation" + // }; + // _customer.Bark(barkName, BarkOrder.FirstValid); + // } + // return TaskStatus.Failure; + // } + // + // return TaskStatus.Running; + // } + // + // private void HandleBeverageInteraction() + // { + // var tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer; + // var carriedBeverageData = tycoonPlayer.GetCurrentItemData(); + // if (carriedBeverageData == null) + // { + // Debug.Log("플레이어가 가지고 있는 음식의 데이터가 없습니다."); + // return; + // } + // + // // TODO : 음료가 다양해질 때 수정해야함 + // if (carriedBeverageData.Idx == "40001") + // { + // tycoonPlayer.GiveItem(); + // _balloonUi.ReceiveFood(); + // var itemData = ItemManager.Instance.ItemDataSo.GetDataByIdx(carriedBeverageData.Idx); + // _customer.SetFood(itemData); + // if (itemData.Quality == ItemQuality.High) + // { + // _customer.AddHappyPoint(1); + // } + // _customer.SpineController.PlayAnimation(CustomerSpineAnimation.Eat.ToString(), true); + // } + // } } } \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs index e4e4d5625..668cd3aa5 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs @@ -13,103 +13,103 @@ namespace BlueWater.BehaviorTrees.Actions [Serializable] public class OrderFood : Conditional { - private Customer _customer; - private CustomerData _customerData; - private BalloonUi _balloonUi; - private string _orderFoodIdx; - - public override void OnAwake() - { - _customer = GetComponent(); - _customerData = _customer.CustomerData; - } - - public override void OnStart() - { - SetPreferredFoods(); - - _balloonUi = _customer.BalloonUi; - _balloonUi.OrderItem(_orderFoodIdx, _customerData.WaitTime, _customerData.HurryTime); - _customer.OnInteraction += HandleFoodInteraction; - _customer.RegisterPlayerInteraction(); - _customer.Bark("OrderFood", BarkOrder.FirstValid); - } - - public override TaskStatus OnUpdate() - { - if (_balloonUi.IsFoodReceive()) - { - _customer.OnInteraction -= HandleFoodInteraction; - _customer.UnregisterPlayerInteraction(); - return TaskStatus.Success; - } - - if (_balloonUi.IsWaitTimeOver()) - { - _customer.OnInteraction -= HandleFoodInteraction; - _customer.UnregisterPlayerInteraction(); - _customer.AddHappyPoint(-3); - if (_customer.HappyPoint <= 0) - { - _balloonUi.CancelOrder(); - var barkName = _customer.HappyPoint switch - { - >= 3 => "SatisfactoryEvaluation", - >= 2 => "MediocreEvaluation", - >= 1 => "MediocreEvaluation", - _ => "UnsatisfactoryEvaluation" - }; - _customer.Bark(barkName, BarkOrder.FirstValid); - } - return TaskStatus.Failure; - } - - return TaskStatus.Running; - } - - private void HandleFoodInteraction() - { - var tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer; - var carriedFoodData = tycoonPlayer.GetCurrentItemData(); - if (carriedFoodData == null) - { - Debug.Log("플레이어가 가지고 있는 음식의 데이터가 없습니다."); - return; - } - - if (carriedFoodData.Idx == _orderFoodIdx) - { - tycoonPlayer.GiveItem(); - _balloonUi.ReceiveFood(); - var itemData = ItemManager.Instance.ItemDataSo.GetDataByIdx(carriedFoodData.Idx); - _customer.SetFood(itemData); - if (itemData.Quality == ItemQuality.High) - { - _customer.AddHappyPoint(1); - } - - _customer.SpineController.PlayAnimation(CustomerSpineAnimation.Eat2.ToString(), true); - } - } - - private void SetPreferredFoods() - { - var dailyFoodSlotUis = TycoonUiManager.Instance.TycoonManagementUi.CookMenuUi.DailyFoodMenuUi.DailyFoodSlotUis; - FoodTaste[] preferredTastes = { _customerData.GetPreferredFood(0), _customerData.GetPreferredFood(1), _customerData.GetPreferredFood(2) }; - - foreach (var taste in preferredTastes) - { - var preferredFoods = dailyFoodSlotUis.FindAll(food => food.FoodData.Taste == taste); - if (preferredFoods.Count > 0) - { - var randomIndex = Random.Range(0, preferredFoods.Count); - _orderFoodIdx = preferredFoods[randomIndex].FoodData.Idx; - return; - } - } - - var randomDailyFoodIndex = Random.Range(0, dailyFoodSlotUis.Count); - _orderFoodIdx = dailyFoodSlotUis[randomDailyFoodIndex].FoodData.Idx; - } + // private Customer _customer; + // private CustomerData _customerData; + // private BalloonUi _balloonUi; + // private string _orderFoodIdx; + // + // public override void OnAwake() + // { + // _customer = GetComponent(); + // _customerData = _customer.CustomerData; + // } + // + // public override void OnStart() + // { + // SetPreferredFoods(); + // + // _balloonUi = _customer.BalloonUi; + // _balloonUi.OrderItem(_orderFoodIdx, _customerData.WaitTime, _customerData.HurryTime); + // _customer.OnInteraction += HandleFoodInteraction; + // _customer.RegisterPlayerInteraction(); + // _customer.Bark("OrderFood", BarkOrder.FirstValid); + // } + // + // public override TaskStatus OnUpdate() + // { + // if (_balloonUi.IsFoodReceive()) + // { + // _customer.OnInteraction -= HandleFoodInteraction; + // _customer.UnregisterPlayerInteraction(); + // return TaskStatus.Success; + // } + // + // if (_balloonUi.IsWaitTimeOver()) + // { + // _customer.OnInteraction -= HandleFoodInteraction; + // _customer.UnregisterPlayerInteraction(); + // _customer.AddHappyPoint(-3); + // if (_customer.HappyPoint <= 0) + // { + // _balloonUi.CancelOrder(); + // var barkName = _customer.HappyPoint switch + // { + // >= 3 => "SatisfactoryEvaluation", + // >= 2 => "MediocreEvaluation", + // >= 1 => "MediocreEvaluation", + // _ => "UnsatisfactoryEvaluation" + // }; + // _customer.Bark(barkName, BarkOrder.FirstValid); + // } + // return TaskStatus.Failure; + // } + // + // return TaskStatus.Running; + // } + // + // private void HandleFoodInteraction() + // { + // var tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer; + // var carriedFoodData = tycoonPlayer.GetCurrentItemData(); + // if (carriedFoodData == null) + // { + // Debug.Log("플레이어가 가지고 있는 음식의 데이터가 없습니다."); + // return; + // } + // + // if (carriedFoodData.Idx == _orderFoodIdx) + // { + // tycoonPlayer.GiveItem(); + // _balloonUi.ReceiveFood(); + // var itemData = ItemManager.Instance.ItemDataSo.GetDataByIdx(carriedFoodData.Idx); + // _customer.SetFood(itemData); + // if (itemData.Quality == ItemQuality.High) + // { + // _customer.AddHappyPoint(1); + // } + // + // _customer.SpineController.PlayAnimation(CustomerSpineAnimation.Eat2.ToString(), true); + // } + // } + // + // private void SetPreferredFoods() + // { + // var dailyFoodSlotUis = TycoonUiManager.Instance.TycoonManagementUi.CookMenuUi.DailyFoodMenuUi.DailyFoodSlotUis; + // FoodTaste[] preferredTastes = { _customerData.GetPreferredFood(0), _customerData.GetPreferredFood(1), _customerData.GetPreferredFood(2) }; + // + // foreach (var taste in preferredTastes) + // { + // var preferredFoods = dailyFoodSlotUis.FindAll(food => food.FoodData.Taste == taste); + // if (preferredFoods.Count > 0) + // { + // var randomIndex = Random.Range(0, preferredFoods.Count); + // _orderFoodIdx = preferredFoods[randomIndex].FoodData.Idx; + // return; + // } + // } + // + // var randomDailyFoodIndex = Random.Range(0, dailyFoodSlotUis.Count); + // _orderFoodIdx = dailyFoodSlotUis[randomDailyFoodIndex].FoodData.Idx; + // } } } \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/PayMoney.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/PayMoney.cs index 0b28463a2..823171d4b 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/PayMoney.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/PayMoney.cs @@ -10,88 +10,88 @@ namespace BlueWater.BehaviorTrees.Actions [Serializable] public class PayMoney : Conditional { - private Customer _customer; - private CustomerData _customerData; - private BalloonUi _balloonUi; - private int _goldIdx; - private bool _isPaidMoney; - - public override void OnAwake() - { - _customer = GetComponent(); - _customerData = _customer.CustomerData; - } - - public override void OnStart() - { - _balloonUi = _customer.BalloonUi; - _balloonUi.PayMoney(_customerData.WaitTime, _customerData.HurryTime); - _customer.OnInteraction += HandlePayMoneyInteraction; - _customer.RegisterPlayerInteraction(); - } - - public override TaskStatus OnUpdate() - { - if (_isPaidMoney) - { - return TaskStatus.Success; - } - - if (_balloonUi.IsWaitTimeOver()) - { - _customer.OnInteraction -= HandlePayMoneyInteraction; - _customer.UnregisterPlayerInteraction(); - _balloonUi.CancelOrder(); - _balloonUi.HideUi(); - // _customer.AddHappyPoint(-3); - // if (_customer.HappyPoint <= 0) - // { - // _foodBalloonUi.CancelOrder(); - // _customer.Bark("CancelOrder"); - // } - return TaskStatus.Failure; - } - - return TaskStatus.Running; - } - - private void HandlePayMoneyInteraction() - { - var tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer; - var foodPrice = _customer.ItemData.Price; - float tipCoefficient; - string barkName; - switch (_customer.HappyPoint) - { - case >= 3: - tipCoefficient = 2f; - barkName = "SatisfactoryEvaluation"; - break; - case >= 2: - tipCoefficient = 1.5f; - barkName = "MediocreEvaluation"; - break; - case >= 1: - tipCoefficient = 1.1f; - barkName = "MediocreEvaluation"; - break; - default: - tipCoefficient = 1f; - barkName = "UnsatisfactoryEvaluation"; - break; - } - - var tipAmount = foodPrice * (int)tipCoefficient; - var paidAmount = foodPrice + tipAmount; - tycoonPlayer.GetMoney(paidAmount); - _customer.PayMoney(foodPrice, tipAmount); - _balloonUi.HideUi(); - _customer.OnInteraction -= HandlePayMoneyInteraction; - _customer.Bark(barkName, BarkOrder.FirstValid); - _customer.UnregisterPlayerInteraction(); - _balloonUi.CancelOrder(); - - _isPaidMoney = true; - } + // private Customer _customer; + // private CustomerData _customerData; + // private BalloonUi _balloonUi; + // private int _goldIdx; + // private bool _isPaidMoney; + // + // public override void OnAwake() + // { + // _customer = GetComponent(); + // _customerData = _customer.CustomerData; + // } + // + // public override void OnStart() + // { + // _balloonUi = _customer.BalloonUi; + // _balloonUi.PayMoney(_customerData.WaitTime, _customerData.HurryTime); + // _customer.OnInteraction += HandlePayMoneyInteraction; + // _customer.RegisterPlayerInteraction(); + // } + // + // public override TaskStatus OnUpdate() + // { + // if (_isPaidMoney) + // { + // return TaskStatus.Success; + // } + // + // if (_balloonUi.IsWaitTimeOver()) + // { + // _customer.OnInteraction -= HandlePayMoneyInteraction; + // _customer.UnregisterPlayerInteraction(); + // _balloonUi.CancelOrder(); + // _balloonUi.HideUi(); + // // _customer.AddHappyPoint(-3); + // // if (_customer.HappyPoint <= 0) + // // { + // // _foodBalloonUi.CancelOrder(); + // // _customer.Bark("CancelOrder"); + // // } + // return TaskStatus.Failure; + // } + // + // return TaskStatus.Running; + // } + // + // private void HandlePayMoneyInteraction() + // { + // var tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer; + // var foodPrice = _customer.ItemData.Price; + // float tipCoefficient; + // string barkName; + // switch (_customer.HappyPoint) + // { + // case >= 3: + // tipCoefficient = 2f; + // barkName = "SatisfactoryEvaluation"; + // break; + // case >= 2: + // tipCoefficient = 1.5f; + // barkName = "MediocreEvaluation"; + // break; + // case >= 1: + // tipCoefficient = 1.1f; + // barkName = "MediocreEvaluation"; + // break; + // default: + // tipCoefficient = 1f; + // barkName = "UnsatisfactoryEvaluation"; + // break; + // } + // + // var tipAmount = foodPrice * (int)tipCoefficient; + // var paidAmount = foodPrice + tipAmount; + // tycoonPlayer.GetMoney(paidAmount); + // _customer.PayMoney(foodPrice, tipAmount); + // _balloonUi.HideUi(); + // _customer.OnInteraction -= HandlePayMoneyInteraction; + // _customer.Bark(barkName, BarkOrder.FirstValid); + // _customer.UnregisterPlayerInteraction(); + // _balloonUi.CancelOrder(); + // + // _isPaidMoney = true; + // } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs index 497bdeaae..2ec8d1315 100644 --- a/Assets/02.Scripts/Character/Npc/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -13,13 +13,10 @@ using UnityEngine; namespace BlueWater.Npcs.Customers { - public enum CustomerSpineAnimation + public static class CustomerSpineAnimation { - Idle = 0, - Run, - RunSlow, - Eat, - Eat2 + public const string Idle = "Idle"; + public const string Walk = "Run"; } public class Customer : MonoBehaviour, IPlayerInteraction @@ -63,9 +60,6 @@ namespace BlueWater.Npcs.Customers public PayMoneyUi PayMoneyUi { get; private set; } // Classes - [field: SerializeField, Required] - public CustomerData CustomerData { get; private set; } - [field: SerializeField, Required] public SpineController SpineController { get; private set; } @@ -81,19 +75,21 @@ namespace BlueWater.Npcs.Customers public string InteractionMessage { get; private set; } private IAstarAI _astarAi; + + public LevelData LevelData { get; private set; } public TableSeat TableSeat { get; private set; } public ItemData ItemData { get; private set; } - private int _happyPoint; - public int HappyPoint - { - get => _happyPoint; - private set - { - var newHappyPoint = Mathf.Max(0, value); - _happyPoint = newHappyPoint; - } - } + // private int _happyPoint; + // public int HappyPoint + // { + // get => _happyPoint; + // private set + // { + // var newHappyPoint = Mathf.Max(0, value); + // _happyPoint = newHappyPoint; + // } + // } private bool _isMoving; public bool IsMoving @@ -105,7 +101,7 @@ namespace BlueWater.Npcs.Customers _isMoving = value; SpineController.PlayAnimation(_isMoving - ? CustomerSpineAnimation.Run.ToString() + ? CustomerSpineAnimation.Walk.ToString() : CustomerSpineAnimation.Idle.ToString(), true); } } @@ -186,11 +182,12 @@ namespace BlueWater.Npcs.Customers _astarAi = GetComponent(); } - public void Initialize() + public void Initialize(LevelData levelData) { - CustomerData = CustomerManager.Instance.GetRandomCustomerData(); - AIMovement.SetMoveSpeed(CustomerData.MoveSpeed); - HappyPoint = CustomerData.BaseHappyPoint; + LevelData = levelData; + //CustomerData = CustomerManager.Instance.GetRandomCustomerData(); + //AIMovement.SetMoveSpeed(CustomerData.MoveSpeed); + //HappyPoint = CustomerData.BaseHappyPoint; BehaviorTree.EnableBehavior(); } @@ -281,7 +278,7 @@ namespace BlueWater.Npcs.Customers } } - public void AddHappyPoint(int value) => HappyPoint += value; + //public void AddHappyPoint(int value) => HappyPoint += value; public void Bark(string conversation, BarkOrder barkOrder = BarkOrder.Random) { @@ -305,8 +302,8 @@ namespace BlueWater.Npcs.Customers public void CheckOut() { - var customerVisitInfo = new CustomerVisitInfo(HappyPoint, _foodPrice, _tipAmount, _paidAmount); - TycoonManager.Instance.TycoonStageController.RegisterCustomerVisitInfo(customerVisitInfo); + //var customerVisitInfo = new CustomerVisitInfo(HappyPoint, _foodPrice, _tipAmount, _paidAmount); + //TycoonManager.Instance.TycoonStageController.RegisterCustomerVisitInfo(customerVisitInfo); Destroy(gameObject); } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs index da8329ac5..c827e60e8 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -19,9 +19,6 @@ namespace BlueWater.Players.Tycoons [SerializeField] private PlayerInput _playerInput; - [SerializeField] - protected float InteractionRadius = 2f; - private List _playerInteractions = new(); private IPlayerInteraction _closestInteraction; private IPlayerInteraction _previousInteraction; @@ -57,6 +54,7 @@ namespace BlueWater.Players.Tycoons } else { + _previousInteraction?.CancelInteraction(); _previousInteraction?.HideInteractionUi(); _previousInteraction = null; } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs index 0ef640e02..11c8c58f9 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs @@ -33,11 +33,13 @@ namespace BlueWater.Players.Tycoons string animationName; if (_isMoving) { - animationName = _tycoonPickupHandler.IsPickedUpItem() ? TycoonPlayerSpineAnimation.ServingSide : TycoonPlayerSpineAnimation.RunSide; + animationName = TycoonPlayerSpineAnimation.Walk; + //animationName = _tycoonPickupHandler.IsPickedUpItem() ? TycoonPlayerSpineAnimation.ServingSide : TycoonPlayerSpineAnimation.RunSide; } else { - animationName = _tycoonPickupHandler.IsPickedUpItem() ? TycoonPlayerSpineAnimation.IdleServingUpside : TycoonPlayerSpineAnimation.IdleSide; + animationName = TycoonPlayerSpineAnimation.Idle; + //animationName = _tycoonPickupHandler.IsPickedUpItem() ? TycoonPlayerSpineAnimation.IdleServingUpside : TycoonPlayerSpineAnimation.IdleSide; } if (animationName == previousAnimationName) return; diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 3db658d0f..deaf6c8bb 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -9,14 +9,11 @@ namespace BlueWater.Players.Tycoons { public static class TycoonPlayerSpineAnimation { + public const string Cleaning = "Cleaning"; public const string Idle = "Idle"; - public const string IdleSide = "IdleSide"; - public const string IdleServingDown = "ServingIdleDown"; - public const string IdleServingUpside = "ServingIdleUpside"; - public const string RunDown = "Tycoon/RunDown"; - public const string RunSide = "Tycoon/RunUpSide"; - public const string ServingDown = "Tycoon/ServingDown"; - public const string ServingSide = "Tycoon/ServingUpSide"; + public const string MakeCocktail = "BeerMaker"; + public const string Run = "Run"; + public const string Walk = "RunSlow"; } [DefaultExecutionOrder(-1)] diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index 7732dd98a..c930a617e 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -25,13 +25,19 @@ namespace BlueWater // Tycoon events #region Tycoon events + + // 플레이어 + public static Action OnLevelUp; + + // Npc + public static Action OnCreateCustomer; // 음료 // public static Action OnDrinkRecipeAcquired; // public static Action OnDrinkRecipeSelected; - public static Action OnTycoonOpenedEvent; - public static Action OnTycoonClosedEvent; + public static Action OnTycoonGameStarted; + public static Action OnTycoonGameOvered; // public static Action OnLiquidRegionEntered; // public static Action OnLiquidRegionExited; diff --git a/Assets/02.Scripts/GameTimeManager.cs b/Assets/02.Scripts/GameTimeManager.cs index a661258d7..38c2f0bb2 100644 --- a/Assets/02.Scripts/GameTimeManager.cs +++ b/Assets/02.Scripts/GameTimeManager.cs @@ -28,8 +28,8 @@ namespace BlueWater private void Start() { - EventManager.OnTycoonOpenedEvent += OnTycoonOpened; - EventManager.OnTycoonClosedEvent += OnTycoonClosed; + EventManager.OnTycoonGameStarted += OnTycoonOpened; + EventManager.OnTycoonGameOvered += OnTycoonClosed; _timeIncrementPerMinutes = _gameTimeDataSo.TimeIncrementPerMinutes; } @@ -51,8 +51,8 @@ namespace BlueWater { if (Quitting) return; - EventManager.OnTycoonOpenedEvent -= OnTycoonOpened; - EventManager.OnTycoonClosedEvent -= OnTycoonClosed; + EventManager.OnTycoonGameStarted -= OnTycoonOpened; + EventManager.OnTycoonGameOvered -= OnTycoonClosed; } public void PauseGameTime() diff --git a/Assets/02.Scripts/Prop/Tycoon/Cookware.cs b/Assets/02.Scripts/Prop/Tycoon/Cookware.cs index 7eb60c2ea..ea1075722 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Cookware.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Cookware.cs @@ -46,7 +46,7 @@ namespace BlueWater.Tycoons protected override void OnEnable() { - EventManager.OnTycoonOpenedEvent += OpenTycoonSwitch; + EventManager.OnTycoonGameStarted += OpenTycoonSwitch; base.OnEnable(); } diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs index ecac013f8..8f107ccbe 100644 --- a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs @@ -55,8 +55,8 @@ namespace BlueWater.Tycoons protected virtual void OnEnable() { - EventManager.OnTycoonOpenedEvent += OpenTycoonSwitch; - EventManager.OnTycoonClosedEvent += ClosedTycoonSwitch; + EventManager.OnTycoonGameStarted += OpenTycoonSwitch; + EventManager.OnTycoonGameOvered += ClosedTycoonSwitch; RegisterPlayerInteraction(); } @@ -65,8 +65,8 @@ namespace BlueWater.Tycoons { if (IsQuitting) return; - EventManager.OnTycoonOpenedEvent -= OpenTycoonSwitch; - EventManager.OnTycoonClosedEvent -= ClosedTycoonSwitch; + EventManager.OnTycoonGameStarted -= OpenTycoonSwitch; + EventManager.OnTycoonGameOvered -= ClosedTycoonSwitch; UnregisterPlayerInteraction(); } diff --git a/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs b/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs index a7d6e7f33..d0b1c75c2 100644 --- a/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs +++ b/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs @@ -11,7 +11,7 @@ namespace BlueWater.Tycoons public override void Interaction() { - EventManager.OnTycoonOpenedEvent?.Invoke(); + EventManager.OnTycoonGameStarted?.Invoke(); } public override bool CanInteraction() diff --git a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset index 60668ad80..0520358a9 100644 --- a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset @@ -23,7 +23,7 @@ MonoBehaviour: k__BackingField: 20 k__BackingField: 20 k__BackingField: 10 - k__BackingField: + k__BackingField: Upgrade0 - k__BackingField: 2 k__BackingField: k__BackingField: 2 diff --git a/Assets/02.Scripts/Tycoon/CustomerManager.cs b/Assets/02.Scripts/Tycoon/CustomerManager.cs index b7450f928..ec28a5fe7 100644 --- a/Assets/02.Scripts/Tycoon/CustomerManager.cs +++ b/Assets/02.Scripts/Tycoon/CustomerManager.cs @@ -30,32 +30,43 @@ namespace BlueWater.Tycoons public List InstanceCustomers { get; private set; } = new(); [ShowInInspector] - private Queue _waitingCustomers = new(); + private Queue _waitingCustomers = new(); private CustomerTableController _customerTableController; private Coroutine _findEmptySeatCoroutineInstance; - public Action OnInstantiateCustomer; - private void Start() { _customerTableController = TycoonManager.Instance.CustomerTableController; + + EventManager.OnCreateCustomer += TryFindEmptySeat; } - public void InstantiateCustomer() + private void OnDestroy() { + EventManager.OnCreateCustomer -= TryFindEmptySeat; + } + + public Customer CreateCustomer() + { + var currentLevelData = TycoonManager.Instance.GetCurrentLevelData(); var newCustomer = Instantiate(_customerPrefab, _customerSpawnTransform.position, Quaternion.identity); - newCustomer.Initialize(); + newCustomer.Initialize(currentLevelData); RegisterCustomer(newCustomer); - OnInstantiateCustomer?.Invoke(newCustomer); + + return newCustomer; } - public void TryFindEmptySeat(Customer customer) + public void TryFindEmptySeat() { + // 1. 빈 자리를 체크한다. (빈 자리가 있다면 생성) + // 2. 빈 자리가 없는 경우, Queue에 대기 손님을 넣고 빈 자리가 생길 때 생성 + // 3. 생성하는 순간에 레벨 data 참조 + // 이미 대기열에 사람들이 있는 경우, 새로운 손님도 바로 대기열에 넣는다. if (_waitingCustomers.Count > 0) { - _waitingCustomers.Enqueue(customer); + _waitingCustomers.Enqueue(1); return; } @@ -64,14 +75,15 @@ namespace BlueWater.Tycoons if (emptySeat == null) { // 내가 첫 대기열 손님이 된다. - _waitingCustomers.Enqueue(customer); + _waitingCustomers.Enqueue(1); Utils.StartUniqueCoroutine(this, ref _findEmptySeatCoroutineInstance, CheckEmptySeatCoroutine()); return; } - - customer.SetTableSeat(emptySeat); + + var newCustomer = CreateCustomer(); + newCustomer.SetTableSeat(emptySeat); emptySeat.ReserveSeat(); - customer.AIMovement.Move(emptySeat.SeatTransform.position); + newCustomer.AIMovement.Move(emptySeat.SeatTransform.position); } private IEnumerator CheckEmptySeatCoroutine() @@ -82,7 +94,8 @@ namespace BlueWater.Tycoons var emptySeat = _customerTableController.FindEmptySeat(); if (emptySeat != null) { - var customer = _waitingCustomers.Dequeue(); + _waitingCustomers.Dequeue(); + var customer = CreateCustomer(); customer.SetTableSeat(emptySeat); emptySeat.ReserveSeat(); customer.AIMovement.Move(emptySeat.SeatTransform.position); diff --git a/Assets/02.Scripts/Tycoon/CustomerTableController.cs b/Assets/02.Scripts/Tycoon/CustomerTableController.cs index fbc7b77ef..b0309afdf 100644 --- a/Assets/02.Scripts/Tycoon/CustomerTableController.cs +++ b/Assets/02.Scripts/Tycoon/CustomerTableController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using BlueWater.Utility; @@ -6,26 +7,47 @@ using Random = System.Random; namespace BlueWater.Tycoons { + [DefaultExecutionOrder(-1)] public class CustomerTableController : MonoBehaviour { + [SerializeField] + private Transform _customerTableRoot; + [SerializeField] private List _customerTables; + + [SerializeField] + private List _activeCustomerTables; private Random _random = new(); - + private AstarPath _astarPath; + + private void Awake() + { + _astarPath = FindAnyObjectByType(); + _customerTables = _customerTableRoot.GetComponentsInChildren().ToList(); + + for (var i = 0; i < _customerTables.Count; i++) + { + HideCustomerTable(i); + } + } + public void RegisterTable(CustomerTable table) { - Utils.RegisterList(_customerTables, table); + Utils.RegisterList(_activeCustomerTables, table); + _astarPath.Scan(); } public void UnregisterTable(CustomerTable table) { - Utils.UnregisterList(_customerTables, table); + Utils.UnregisterList(_activeCustomerTables, table); + _astarPath.Scan(); } public TableSeat FindEmptySeat() { - var tableCount = _customerTables.Count; + var tableCount = _activeCustomerTables.Count; var indices = new List(Enumerable.Range(0, tableCount)); while (indices.Count > 0) @@ -34,7 +56,7 @@ namespace BlueWater.Tycoons var tableIndex = indices[randomIndex]; indices.RemoveAt(randomIndex); - var emptySeat = _customerTables[tableIndex].FindEmptySeat(); + var emptySeat = _activeCustomerTables[tableIndex].FindEmptySeat(); if (emptySeat != null) { return emptySeat; @@ -42,5 +64,15 @@ namespace BlueWater.Tycoons } return null; } + + public void ShowCustomerTable(int index) + { + _customerTables[index].gameObject.SetActive(true); + } + + public void HideCustomerTable(int index) + { + _customerTables[index].gameObject.SetActive(false); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/LiquidController.cs b/Assets/02.Scripts/Tycoon/LiquidController.cs index bd0c2da30..99809dd3c 100644 --- a/Assets/02.Scripts/Tycoon/LiquidController.cs +++ b/Assets/02.Scripts/Tycoon/LiquidController.cs @@ -6,12 +6,10 @@ using BlueWater.Items; using BlueWater.Players.Tycoons; using BlueWater.Tycoons; using BlueWater.Utility; -using DG.Tweening; using Sirenix.OdinInspector; using TMPro; using UnityEngine; using UnityEngine.Pool; -using UnityEngine.Serialization; using UnityEngine.UI; namespace BlueWater @@ -39,6 +37,9 @@ namespace BlueWater [SerializeField] private TMP_Text _amountText; + [SerializeField] + private Image _balloonImage; + [SerializeField] private Image _completeCocktailImage; @@ -80,8 +81,14 @@ namespace BlueWater [Title("오브젝트 풀링")] [SerializeField, Tooltip("오브젝트 풀링 최대 개수")] private int _objectPoolCount = 1000; - + [Title("패널")] + [SerializeField] + private Sprite _centerBalloonImage; + + [SerializeField] + private Sprite _playerBalloonImage; + [SerializeField] private float _moveToPlayerDuration = 0.5f; @@ -520,6 +527,7 @@ namespace BlueWater _liquidPanel.transform.localScale = _originalPanelScale; _liquidPanel.transform.position = _centerPosition; + _balloonImage.sprite = _centerBalloonImage; _liquidPanel.SetActive(true); _isShowingPanel = true; } @@ -553,6 +561,7 @@ namespace BlueWater yield return null; } + _balloonImage.sprite = _playerBalloonImage; _liquidPanel.transform.localScale = _endScale; // 완성되지 않았거나, 따르고 있지 않으면 플레이어를 추적함 @@ -574,6 +583,7 @@ namespace BlueWater private IEnumerator MovePanelToCenter() { + _balloonImage.sprite = _centerBalloonImage; var startScale = _liquidPanel.transform.localScale; var startPosition = _liquidPanel.transform.position; var elapsedTime = 0f; diff --git a/Assets/02.Scripts/Tycoon/StageDataSo.cs b/Assets/02.Scripts/Tycoon/StageDataSo.cs index 6b30920d6..6d3527937 100644 --- a/Assets/02.Scripts/Tycoon/StageDataSo.cs +++ b/Assets/02.Scripts/Tycoon/StageDataSo.cs @@ -6,12 +6,6 @@ namespace BlueWater.Tycoons public class StageDataSo : ScriptableObject { [field: SerializeField] - public int[] MaxCustomersByRating { get; private set; } = new int[5]; - - [field: SerializeField] - public float WaitTimeInStarted = 2f; - - [field: SerializeField] - public float CustomerEntryInterval = 1f; + public float WaitTimeInStarted = 3f; } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonManager.cs b/Assets/02.Scripts/Tycoon/TycoonManager.cs index c03e3d64d..e4bd3cb1b 100644 --- a/Assets/02.Scripts/Tycoon/TycoonManager.cs +++ b/Assets/02.Scripts/Tycoon/TycoonManager.cs @@ -42,6 +42,7 @@ namespace BlueWater.Tycoons AudioManager.Instance.PlayBgm(_dailyBgm); } + TycoonStatus = new TycoonStatus(); TycoonStatus.Initialize(); } @@ -52,5 +53,10 @@ namespace BlueWater.Tycoons TycoonStageController = GetComponent(); TycoonIngredientController = GetComponent(); } + + public LevelData GetCurrentLevelData() + { + return LevelDataSo.GetDataByIdx(TycoonStatus.CurrentLevel.ToString()); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index f24f321c3..b2ee8d7e6 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -17,66 +17,51 @@ namespace BlueWater.Tycoons private List _dailyCustomerVisitInfos; private bool _isClosedTime; - private GameTimeManager _gameTimeManager; private TycoonManager _tycoonManager; - private CustomerManager _customerManager; private Coroutine _startStageCoroutineInstance; private TimeSpan _closedTime; private void Start() { - _gameTimeManager = GameTimeManager.Instance; + EventManager.OnTycoonGameOvered += GameOver; + _tycoonManager = TycoonManager.Instance; - _customerManager = CustomerManager.Instance; + + _dailyCustomerVisitInfos = new List(); - var maxCount = _stageDataSo.MaxCustomersByRating.Length; - _dailyCustomerVisitInfos = new List(maxCount - 1); - - EventManager.OnTycoonOpenedEvent += StartStage; - } - - private void OnDestroy() - { - EventManager.OnTycoonOpenedEvent -= StartStage; + StartStage(); } private void StartStage() { + EventManager.OnTycoonGameOvered -= GameOver; + _dailyCustomerVisitInfos.Clear(); Utils.StartUniqueCoroutine(this, ref _startStageCoroutineInstance, StartStageCoroutine()); + + EventManager.OnTycoonGameStarted?.Invoke(); } private IEnumerator StartStageCoroutine() { yield return new WaitForSeconds(_stageDataSo.WaitTimeInStarted); - _closedTime = _gameTimeManager.GetTycoonCloseTimeSpan(); - _closedTime = _closedTime.Subtract(new TimeSpan(0, 30, 0)); - - var currentRating = DataManager.Instance.TycoonData.Rating; - var maxCustomer = _stageDataSo.MaxCustomersByRating[currentRating - 1]; - var entryCustomerCount = 0; - var entryInterval = new WaitForSeconds(_stageDataSo.CustomerEntryInterval); - - while (_closedTime > _gameTimeManager.GetCurrentGameTime() && entryCustomerCount < maxCustomer) + while (true) { - var emptySeat = _tycoonManager.CustomerTableController.FindEmptySeat(); - if (emptySeat != null) - { - _customerManager.InstantiateCustomer(); - entryCustomerCount++; - } + var currentLevelData = _tycoonManager.GetCurrentLevelData(); + EventManager.OnCreateCustomer?.Invoke(); - yield return entryInterval; + yield return new WaitForSeconds(currentLevelData.CustomerRespawn); } + } - while (_customerManager.GetCurrentCustomers().Count > 0) + private void GameOver() + { + if (_startStageCoroutineInstance != null) { - yield return null; + StopCoroutine(_startStageCoroutineInstance); + _startStageCoroutineInstance = null; } - - EventManager.OnTycoonClosedEvent?.Invoke(); - _startStageCoroutineInstance = null; } public void RegisterCustomerVisitInfo(CustomerVisitInfo customerVisitInfo) diff --git a/Assets/02.Scripts/Tycoon/TycoonStatus.cs b/Assets/02.Scripts/Tycoon/TycoonStatus.cs index 95ebe06cc..6dc26eb77 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStatus.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStatus.cs @@ -7,6 +7,18 @@ namespace BlueWater.Tycoons [Serializable] public class TycoonStatus { + [SerializeField] + private int _currentLevel; + public int CurrentLevel + { + get => _currentLevel; + set + { + _currentLevel = value; + LevelUp(); + } + } + [SerializeField] private int _maxPlayerHealth; public int MaxPlayerHealth @@ -60,19 +72,30 @@ namespace BlueWater.Tycoons private int _currentExp; public int CurrentExp { - get - { - return _currentExp; - } + get => _currentExp; set { - _currentExp = value; + var maxExp = TycoonManager.Instance.LevelDataSo.GetDataByIdx(_currentLevel.ToString()).RequiredExp; + if (value >= maxExp) + { + CurrentLevel++; + _currentExp = value - maxExp; + } + else + { + _currentExp = value; + } } } // 보류 [SerializeField] private int _currentGold; + public int CurrentGold + { + get => _currentGold; + set => _currentGold = value; + } [Title("원액")] [SerializeField] @@ -190,6 +213,7 @@ namespace BlueWater.Tycoons public void Initialize() { + CurrentLevel = 1; MaxPlayerHealth = GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.MaxHealthPoint; CurrentPlayerHealth = GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.CurrentHealthPoint; PlayerMoveSpeedMultiplier = GameManager.Instance.CurrentTycoonPlayer.TycoonMovement.MoveSpeedMultiplier; @@ -221,5 +245,38 @@ namespace BlueWater.Tycoons private void UpdateLiquidC(int amount) => CurrentLiquidAmountC = amount; private void UpdateLiquidD(int amount) => CurrentLiquidAmountD = amount; private void UpdateLiquidE(int amount) => CurrentLiquidAmountE = amount; + + private void LevelUp() + { + // TODO : 레벨업 연출 추가 및 업그레이드 연출 + var tycoonManager = TycoonManager.Instance; + var currentLevelData = tycoonManager.GetCurrentLevelData(); + switch (currentLevelData.OpenUpgrade) + { + case "Upgrade0": + tycoonManager.CustomerTableController.ShowCustomerTable(0); + break; + case "Upgrade1": + tycoonManager.CustomerTableController.ShowCustomerTable(1); + break; + case "Upgrade2": + tycoonManager.CustomerTableController.ShowCustomerTable(2); + break; + case "Upgrade3": + tycoonManager.CustomerTableController.ShowCustomerTable(3); + break; + case "Upgrade4": + tycoonManager.CustomerTableController.ShowCustomerTable(4); + break; + case "Upgrade5": + tycoonManager.CustomerTableController.ShowCustomerTable(5); + break; + case "Upgrade6": + tycoonManager.CustomerTableController.ShowCustomerTable(6); + break; + } + + EventManager.OnLevelUp?.Invoke(currentLevelData); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs b/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs index 9f14887b7..98c1b3c27 100644 --- a/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs @@ -30,12 +30,12 @@ namespace BlueWater.Uis _customerManager = CustomerManager.Instance; _mainCamera = TycoonCameraManager.Instance.MainCamera; - _customerManager.OnInstantiateCustomer += AddUiIndicator; + //EventManager.OnCreateCustomer += AddUiIndicator; } private void OnDestroy() { - _customerManager.OnInstantiateCustomer -= AddUiIndicator; + //EventManager.OnCreateCustomer -= AddUiIndicator; } private void LateUpdate() diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs index d10bae567..040dcafb1 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs @@ -51,8 +51,8 @@ namespace BlueWater.Uis { PopupUi.OnPopupUiOpenEvent += RegisterPopup; PopupUi.OnPopupUiCloseEvent += UnregisterPopup; - EventManager.OnTycoonOpenedEvent += TycoonOpenEvent; - EventManager.OnTycoonClosedEvent += TycoonClosedEvent; + EventManager.OnTycoonGameStarted += TycoonOpenEvent; + EventManager.OnTycoonGameOvered += TycoonClosedEvent; EventManager.FadeInOut += FadeInOut; } @@ -62,8 +62,8 @@ namespace BlueWater.Uis PopupUi.OnPopupUiOpenEvent -= RegisterPopup; PopupUi.OnPopupUiCloseEvent -= UnregisterPopup; - EventManager.OnTycoonOpenedEvent -= TycoonOpenEvent; - EventManager.OnTycoonClosedEvent -= TycoonClosedEvent; + EventManager.OnTycoonGameStarted -= TycoonOpenEvent; + EventManager.OnTycoonGameOvered -= TycoonClosedEvent; EventManager.FadeInOut -= FadeInOut; } diff --git a/Assets/03.Images/Ui/Tycoon/SquareTalkBalloon.png b/Assets/03.Images/Ui/Tycoon/Box.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/SquareTalkBalloon.png rename to Assets/03.Images/Ui/Tycoon/Box.png diff --git a/Assets/03.Images/Ui/Tycoon/SquareTalkBalloon.png.meta b/Assets/03.Images/Ui/Tycoon/Box.png.meta similarity index 98% rename from Assets/03.Images/Ui/Tycoon/SquareTalkBalloon.png.meta rename to Assets/03.Images/Ui/Tycoon/Box.png.meta index 728ba218a..1e6a8c52a 100644 --- a/Assets/03.Images/Ui/Tycoon/SquareTalkBalloon.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Box.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 1024 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 240, y: 240, z: 240, w: 240} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/03.Images/Ui/Tycoon/SquareTalkBalloontail.png b/Assets/03.Images/Ui/Tycoon/PlayerBalloon.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/SquareTalkBalloontail.png rename to Assets/03.Images/Ui/Tycoon/PlayerBalloon.png diff --git a/Assets/03.Images/Ui/Tycoon/SquareTalkBalloontail.png.meta b/Assets/03.Images/Ui/Tycoon/PlayerBalloon.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/SquareTalkBalloontail.png.meta rename to Assets/03.Images/Ui/Tycoon/PlayerBalloon.png.meta diff --git a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab index b042d5d9c..cc132292f 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab @@ -253,7 +253,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 678f2c946dedcdd4f9f8211872befbc0, type: 2} + - {fileID: 2100000, guid: eaf5a1e524cd8ae439ec7b6036090474, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -287,8 +287,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} m_Name: m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: ee5f908cebc409b498d389052e7d9a81, type: 2} - initialSkinName: 01 + skeletonDataAsset: {fileID: 11400000, guid: 90f596bc1a735a544985584af0b4180a, type: 2} + initialSkinName: Guest01 fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 initialFlipY: 0 @@ -864,7 +864,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3748026497419659573} @@ -967,7 +967,7 @@ MonoBehaviour: radius: 0.25 height: 1 canMove: 1 - maxSpeed: 3 + maxSpeed: 4 gravity: {x: NaN, y: NaN, z: NaN} groundMask: serializedVersion: 2 @@ -1057,7 +1057,7 @@ MonoBehaviour: byteDataArray: Version: 1.7.9 gizmoViewMode: 2 - showBehaviorDesignerGizmo: 0 + showBehaviorDesignerGizmo: 1 --- !u!114 &5279376384905517670 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1109,21 +1109,8 @@ MonoBehaviour: k__BackingField: {fileID: 8922295334492411225} k__BackingField: {fileID: 7800018367225963417} k__BackingField: {fileID: 6080095273351670320} - k__BackingField: {fileID: 7689708008984027505} k__BackingField: {fileID: 0} k__BackingField: {fileID: 1188822424991952652} - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 k__BackingField: {fileID: 5279376384905517670} k__BackingField: {fileID: 17978457728262906} k__BackingField: 1 @@ -1535,11 +1522,6 @@ MonoBehaviour: cancelWaitUntilSequenceEndsIfReplacingBark: 0 waitForContinueButton: 0 textDisplaySetting: 0 ---- !u!224 &7689708008984027505 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - m_PrefabInstance: {fileID: 2718897986636601543} - m_PrefabAsset: {fileID: 0} --- !u!223 &7800018367225963417 stripped Canvas: m_CorrespondingSourceObject: {fileID: 5297442833789713246, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index a44c6a1c2..5d7f148f9 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -67,7 +67,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 488f84473afeade458a0b9a9df28930f, type: 2} + - {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -101,8 +101,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} m_Name: m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 74d1caae8e1d56a43bca5a5873004922, type: 2} - initialSkinName: 01-1 + skeletonDataAsset: {fileID: 11400000, guid: 57e95ec929c09d64c9f85a40f849786a, type: 2} + initialSkinName: 01 fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 initialFlipY: 0 @@ -582,7 +582,7 @@ MonoBehaviour: k__BackingField: {fileID: 7125556968546628472} _originalMaterial: {fileID: 0} _replacementMaterial: {fileID: 0} - _initialSkinName: 01-1 + _initialSkinName: 01 _isRandomSkin: 0 _randomRange: {x: 0, y: 0} --- !u!114 &3359549505901716120 @@ -615,7 +615,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _playerInput: {fileID: 6054159730444663926} - InteractionRadius: 2 --- !u!114 &4836489897218844789 MonoBehaviour: m_ObjectHideFlags: 0 @@ -654,6 +653,14 @@ PrefabInstance: m_Modifications: - target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2971245722111912602, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e7b746bc5bff9d64fb1129b9aa8ccf3e, type: 3} + - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} @@ -684,6 +691,22 @@ PrefabInstance: propertyPath: m_Name value: InteractionCanvas objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.x + value: -0.39999998 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.y + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.04999999 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab index c20ee46f1..1b2719787 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab @@ -170,99 +170,12 @@ Transform: m_GameObject: {fileID: 867242612611201267} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.5, y: 0, z: -16.5} + m_LocalPosition: {x: 0, y: 0, z: -13.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3249711671270954515} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1099066450365460075 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8866771231835984327} - - component: {fileID: 49200800960826326} - m_Layer: 0 - m_Name: Casper (8) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8866771231835984327 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1099066450365460075} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 1.774, y: 0, z: -8.038} - m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &49200800960826326 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1099066450365460075} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1374224201695919457 GameObject: m_ObjectHideFlags: 0 @@ -458,93 +371,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1719347976689798360 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3270691531935032258} - - component: {fileID: 7438815326447434771} - m_Layer: 0 - m_Name: Casper (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3270691531935032258 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1719347976689798360} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -1.8140006, y: 0, z: -8.038} - m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &7438815326447434771 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1719347976689798360} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &2984908257173085434 GameObject: m_ObjectHideFlags: 0 @@ -663,96 +489,8 @@ Transform: m_Children: - {fileID: 1402113424960589398} - {fileID: 7906693004392999617} - - {fileID: 3381794055646013358} m_Father: {fileID: 2700294535905665279} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3763383041433937158 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3197825869306182158} - - component: {fileID: 1482820693525610513} - m_Layer: 0 - m_Name: Casper (9) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3197825869306182158 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3763383041433937158} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 3.2699995, y: 0, z: -8.038} - m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &1482820693525610513 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3763383041433937158} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &3995704242281828704 GameObject: m_ObjectHideFlags: 0 @@ -1134,528 +872,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &4546611608844881829 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8892784354761672115} - - component: {fileID: 5233311654455425902} - m_Layer: 0 - m_Name: Casper (12) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8892784354761672115 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4546611608844881829} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 1.89, y: 0, z: -12.033} - m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &5233311654455425902 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4546611608844881829} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &4843963029907789777 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6428688504360453741} - - component: {fileID: 6344663802719075091} - m_Layer: 0 - m_Name: Casper (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6428688504360453741 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4843963029907789777} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -3.31, y: 0, z: -8.038} - m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &6344663802719075091 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4843963029907789777} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &4971218943534145549 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 815724270373856547} - - component: {fileID: 4941871702207219062} - m_Layer: 0 - m_Name: Casper (11) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &815724270373856547 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4971218943534145549} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -1.8040004, y: 0, z: -12.033} - m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &4941871702207219062 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4971218943534145549} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &4991926777541976818 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8891451998569168178} - - component: {fileID: 3028096255281013696} - m_Layer: 0 - m_Name: Casper (13) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8891451998569168178 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4991926777541976818} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 3.3859997, y: 0, z: -12.033} - m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &3028096255281013696 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4991926777541976818} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &5272207894993496017 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5057426631584234559} - - component: {fileID: 4697862658936305834} - m_Layer: 0 - m_Name: Casper (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5057426631584234559 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5272207894993496017} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 5.7559996, y: 0, z: -10.01} - m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &4697862658936305834 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5272207894993496017} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &5319468534857577100 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3195312951363957278} - - component: {fileID: 8767483698691317651} - m_Layer: 0 - m_Name: Casper - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3195312951363957278 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5319468534857577100} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -0.7059994, y: 0, z: -10.01} - m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &8767483698691317651 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5319468534857577100} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &5483100566805265490 GameObject: m_ObjectHideFlags: 0 @@ -2004,180 +1220,6 @@ Transform: - {fileID: 3958622835900991993} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6206480876944792356 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4351969341894458829} - - component: {fileID: 5850324924784603964} - m_Layer: 0 - m_Name: Casper (10) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4351969341894458829 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6206480876944792356} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -3.3, y: 0, z: -12.033} - m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &5850324924784603964 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6206480876944792356} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &6484910103719326603 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3421010117935156042} - - component: {fileID: 1544478166679452664} - m_Layer: 0 - m_Name: Casper (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3421010117935156042 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6484910103719326603} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 4.26, y: 0, z: -10.01} - m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &1544478166679452664 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6484910103719326603} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &6598032962174604577 GameObject: m_ObjectHideFlags: 0 @@ -2561,93 +1603,6 @@ Transform: - {fileID: 6002764140371921921} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7004760966314485715 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3529211023619139497} - - component: {fileID: 8541738990300575654} - m_Layer: 0 - m_Name: Casper (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3529211023619139497 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7004760966314485715} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -5.754, y: 0, z: -10.01} - m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &8541738990300575654 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7004760966314485715} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &7411081930205196350 GameObject: m_ObjectHideFlags: 0 @@ -2735,225 +1690,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &7662153030604097049 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5128404508181236478} - - component: {fileID: 5714915610764465478} - m_Layer: 0 - m_Name: Casper (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5128404508181236478 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7662153030604097049} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -4.258001, y: 0, z: -10.01} - m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &5714915610764465478 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7662153030604097049} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &7946468324943106534 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1977558712039975322} - - component: {fileID: 1998603491148851833} - m_Layer: 0 - m_Name: Casper (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1977558712039975322 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7946468324943106534} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 0.79, y: 0, z: -10.01} - m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3381794055646013358} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &1998603491148851833 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7946468324943106534} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &8555244782544759037 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3381794055646013358} - m_Layer: 0 - m_Name: Caspers - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3381794055646013358 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8555244782544759037} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3195312951363957278} - - {fileID: 3529211023619139497} - - {fileID: 3421010117935156042} - - {fileID: 6428688504360453741} - - {fileID: 8866771231835984327} - - {fileID: 4351969341894458829} - - {fileID: 8892784354761672115} - - {fileID: 1977558712039975322} - - {fileID: 5128404508181236478} - - {fileID: 5057426631584234559} - - {fileID: 3270691531935032258} - - {fileID: 3197825869306182158} - - {fileID: 815724270373856547} - - {fileID: 8891451998569168178} - m_Father: {fileID: 4449232531499695111} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8687938782894991681 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab index 945cef6d3..0e0df3075 100644 --- a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab +++ b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab @@ -61,7 +61,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 5 + m_SortingOrder: 6 m_TargetDisplay: 0 --- !u!114 &8764364725249863370 MonoBehaviour: diff --git a/Assets/08.Spines/Characters/Players/Player02.meta b/Assets/08.Spines/Characters/Npcs/Crews.meta similarity index 77% rename from Assets/08.Spines/Characters/Players/Player02.meta rename to Assets/08.Spines/Characters/Npcs/Crews.meta index 90adbb939..f4b166191 100644 --- a/Assets/08.Spines/Characters/Players/Player02.meta +++ b/Assets/08.Spines/Characters/Npcs/Crews.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 85c3df72cbca31e449ed3e7a62826cbf +guid: 6a8de43ea1bcfd046a14882f2938b380 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/08.Spines/Characters/Npcs/Crews/Crew.atlas.txt b/Assets/08.Spines/Characters/Npcs/Crews/Crew.atlas.txt new file mode 100644 index 000000000..648552a8b --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew.atlas.txt @@ -0,0 +1,76 @@ +Crew.png +size:2026,1415 +filter:Linear,Linear +CrewSuit/Suit_Body +bounds:1828,470,162,161 +CrewSuit/Suit_HandLeft +bounds:2,14,188,201 +CrewSuit/Suit_HandRight +bounds:192,14,188,201 +CrewSuit/Suit_Pant +bounds:1306,832,200,126 +Item/Cleaningbroom +bounds:1510,65,238,476 +rotate:90 +Item/Cleaningbroom2 +bounds:1510,901,512,512 +Item/Cleaningbroom3 +bounds:1510,725,174,498 +rotate:90 +Item/Shaker +bounds:1204,1041,302,372 +crew02/backhair02 +bounds:2,217,584,435 +rotate:90 +crew02/face02 +bounds:2,803,610,437 +rotate:90 +crew02/fronthair02 +bounds:441,848,565,431 +rotate:90 +crew02/lefteye02 +bounds:752,2,172,222 +crew02/lefthair02 +bounds:1204,960,79,302 +rotate:90 +crew02/lefthand02 +bounds:382,14,188,201 +crew02/leftleg02 +bounds:1288,740,90,196 +rotate:90 +crew02/mouse02 +bounds:441,823,60,23 +crew03/Mouse03 +bounds:441,823,60,23 +crew02/righteye02 +bounds:1600,311,182,226 +rotate:90 +crew02/righthand02 +bounds:926,23,188,201 +crew02/rightleg02 +bounds:1828,633,90,196 +rotate:90 +crew03/Face03 +bounds:439,226,575,517 +rotate:90 +crew03/LeftEar +bounds:1204,853,105,100 +rotate:90 +crew03/LeftEye03 +bounds:572,2,178,222 +crew03/LeftHair03 +bounds:1288,303,145,420 +crew03/LeftHairA03 +bounds:874,852,328,561 +crew03/RightEye03 +bounds:1600,495,181,228 +crew03/RightHair03 +bounds:1435,305,163,418 +crew03/RightHairA03 +bounds:958,289,328,561 +crewMaid/body_maid +bounds:1273,37,250,235 +rotate:90 +crewMaid/pant_maid +bounds:1116,14,273,155 +rotate:90 diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.atlas.txt.meta b/Assets/08.Spines/Characters/Npcs/Crews/Crew.atlas.txt.meta similarity index 75% rename from Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.atlas.txt.meta rename to Assets/08.Spines/Characters/Npcs/Crews/Crew.atlas.txt.meta index b759d00dd..9c250f6d0 100644 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.atlas.txt.meta +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4e9600c3699c5554aabdee5d4ff02ab4 +guid: 8d96d7ecccc2c5d44b90e2e5139ffe66 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Characters/Npcs/Crews/Crew.png b/Assets/08.Spines/Characters/Npcs/Crews/Crew.png new file mode 100644 index 000000000..854b2fe54 Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Crews/Crew.png differ diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.png.meta b/Assets/08.Spines/Characters/Npcs/Crews/Crew.png.meta similarity index 88% rename from Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.png.meta rename to Assets/08.Spines/Characters/Npcs/Crews/Crew.png.meta index 4f8ed8261..30c7cb603 100644 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.png.meta +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1b77877659d1a746bbfcf68bfd37a5b +guid: 10aff9c324ace24489de5aa827c664ed TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 + spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -79,7 +79,7 @@ TextureImporter: overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 @@ -92,7 +92,7 @@ TextureImporter: overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -105,7 +105,7 @@ TextureImporter: overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 4 buildTarget: WindowsStoreApps maxTextureSize: 2048 @@ -118,7 +118,7 @@ TextureImporter: overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] @@ -126,7 +126,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes b/Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes new file mode 100644 index 000000000..2e6d617ba Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes differ diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.skel.bytes.meta b/Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes.meta similarity index 75% rename from Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.skel.bytes.meta rename to Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes.meta index fbc92b53c..5bb4b6adc 100644 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.skel.bytes.meta +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 62fad1444cc3651429bf6489b5cceaf5 +guid: 2104e4991d2094242aa5a4fb0f96195f TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer_Atlas.asset b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Atlas.asset similarity index 73% rename from Assets/08.Spines/Characters/Npcs/Customers/Customer_Atlas.asset rename to Assets/08.Spines/Characters/Npcs/Crews/Crew_Atlas.asset index 88ea4ee73..c5d2379cb 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer_Atlas.asset +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: Customer_Atlas + m_Name: Crew_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 35a3db6d5a669754ea79ba718e4a0c02, type: 3} + atlasFile: {fileID: 4900000, guid: 8d96d7ecccc2c5d44b90e2e5139ffe66, type: 3} materials: - - {fileID: 2100000, guid: 678f2c946dedcdd4f9f8211872befbc0, type: 2} + - {fileID: 2100000, guid: 98937673cc2d8aa47a5683aa1cd6ca74, type: 2} diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Atlas.asset.meta b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Atlas.asset.meta similarity index 79% rename from Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Atlas.asset.meta rename to Assets/08.Spines/Characters/Npcs/Crews/Crew_Atlas.asset.meta index b77b53a2e..21867619e 100644 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Atlas.asset.meta +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b61ce9da2aa41fc41b118c7d6ab55723 +guid: e66e17116e430574581abd6de7ae17c7 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_3.mat b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Material.mat similarity index 91% rename from Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_3.mat rename to Assets/08.Spines/Characters/Npcs/Crews/Crew_Material.mat index 96cf85b01..d93e35633 100644 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_3.mat +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Crew_Crew_3 + m_Name: Crew_Material m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -26,7 +26,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 47e1c53a5a359274684a8ad95652220b, type: 3} + m_Texture: {fileID: 2800000, guid: 10aff9c324ace24489de5aa827c664ed, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_2.mat.meta b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Material.mat.meta similarity index 79% rename from Assets/08.Spines/Characters/Players/Player01/02_character_02_character_2.mat.meta rename to Assets/08.Spines/Characters/Npcs/Crews/Crew_Material.mat.meta index ec7880dc8..1a4164de4 100644 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_2.mat.meta +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f63247b1e11abb4e9de4e2e07d60516 +guid: 98937673cc2d8aa47a5683aa1cd6ca74 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer_SkeletonData.asset b/Assets/08.Spines/Characters/Npcs/Crews/Crew_SkeletonData.asset similarity index 78% rename from Assets/08.Spines/Characters/Npcs/Customers/Customer_SkeletonData.asset rename to Assets/08.Spines/Characters/Npcs/Crews/Crew_SkeletonData.asset index a06b9a8d9..29c062691 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer_SkeletonData.asset +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_SkeletonData.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: Customer_SkeletonData + m_Name: Crew_SkeletonData m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 9376bae177025b0459db3374bfecd495, type: 2} - scale: 0.0025 - skeletonJSON: {fileID: 4900000, guid: 641d645d6bc60f74ab018b47e3050018, type: 3} + - {fileID: 11400000, guid: e66e17116e430574581abd6de7ae17c7, type: 2} + scale: 0.001 + skeletonJSON: {fileID: 4900000, guid: 2104e4991d2094242aa5a4fb0f96195f, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_SkeletonData.asset.meta b/Assets/08.Spines/Characters/Npcs/Crews/Crew_SkeletonData.asset.meta similarity index 79% rename from Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_SkeletonData.asset.meta rename to Assets/08.Spines/Characters/Npcs/Crews/Crew_SkeletonData.asset.meta index fceda03c8..c9b707f3d 100644 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_SkeletonData.asset.meta +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_SkeletonData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 74d1caae8e1d56a43bca5a5873004922 +guid: d96ab46e9aca1d142b153e02ea521a2a NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer.atlas.txt b/Assets/08.Spines/Characters/Npcs/Customers/Customer.atlas.txt deleted file mode 100644 index ca3c49030..000000000 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer.atlas.txt +++ /dev/null @@ -1,66 +0,0 @@ -Customer.png -size:946,487 -filter:Linear,Linear -02_ArmL -bounds:593,209,101,113 -02_ArmR -bounds:362,53,101,113 -02_Body -bounds:464,324,133,161 -02_EyeL -bounds:853,29,64,60 -02_EyeR -bounds:853,91,73,62 -02_Face -bounds:2,273,218,212 -02_Hair -bounds:222,168,240,136 -02_LegL -bounds:696,190,78,132 -02_LegR -bounds:864,352,80,133 -02_Mouse -bounds:153,40,65,17 -03/03DownAC -bounds:222,6,138,57 -03/03EyeL -bounds:777,19,69,61 -03/03EyeR -bounds:693,127,78,61 -03/03Hair -bounds:2,3,149,54 -04/04EyeL -bounds:777,82,74,71 -04/04EyeR -bounds:622,31,94,75 -rotate:90 -04/04Hair -bounds:222,306,240,179 -04/Body02 -bounds:599,324,133,161 -Arm_L -bounds:465,54,101,113 -Arm_R -bounds:832,238,101,112 -Beer -bounds:734,357,128,128 -Body -bounds:464,169,127,153 -Eye_L -bounds:622,127,69,80 -Eye_R -bounds:699,45,76,80 -Face02 -bounds:2,59,218,212 -Hair02 -bounds:776,206,149,54 -rotate:90 -Leg_L -bounds:362,2,49,131 -rotate:90 -Leg_R -bounds:568,34,52,133 -Mouse -bounds:832,155,102,81 -하의 -bounds:222,65,138,101 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer.png b/Assets/08.Spines/Characters/Npcs/Customers/Customer.png deleted file mode 100644 index d0826941f..000000000 Binary files a/Assets/08.Spines/Characters/Npcs/Customers/Customer.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer.skel.bytes b/Assets/08.Spines/Characters/Npcs/Customers/Customer.skel.bytes deleted file mode 100644 index 4935e8777..000000000 Binary files a/Assets/08.Spines/Characters/Npcs/Customers/Customer.skel.bytes and /dev/null differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer_Material.mat.meta b/Assets/08.Spines/Characters/Npcs/Customers/Customer_Material.mat.meta deleted file mode 100644 index b69deeccb..000000000 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer_Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 678f2c946dedcdd4f9f8211872befbc0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt new file mode 100644 index 000000000..dc15b67ec --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt @@ -0,0 +1,12 @@ +Guest01.png +size:1206,619 +filter:Linear,Linear +body +bounds:2,2,615,770 +rotate:90 +face +bounds:774,377,349,240 +left +bounds:774,90,214,285 +right +bounds:990,90,214,285 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer.skel.bytes.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt.meta similarity index 75% rename from Assets/08.Spines/Characters/Npcs/Customers/Customer.skel.bytes.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt.meta index 4517eb479..da23e3e2a 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer.skel.bytes.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 641d645d6bc60f74ab018b47e3050018 +guid: 365b60be853946e4f968c1b8721bc730 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png new file mode 100644 index 000000000..514e255b6 Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png differ diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character.png.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png.meta similarity index 97% rename from Assets/08.Spines/Characters/Players/Player02/02_character.png.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest01.png.meta index f5c12255e..8dd71fd33 100644 --- a/Assets/08.Spines/Characters/Players/Player02/02_character.png.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b09ecc61b04987d40ad5d74761aa885f +guid: 1a4f3c20594f16b49ba571734aa21edd TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -133,6 +133,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes new file mode 100644 index 000000000..ef3e29f9f Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character.skel.bytes.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes.meta similarity index 75% rename from Assets/08.Spines/Characters/Players/Player01/02_character.skel.bytes.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes.meta index 86533e624..edf7a70bb 100644 --- a/Assets/08.Spines/Characters/Players/Player01/02_character.skel.bytes.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b1a304d90516bd4aa2e716ace4f67be +guid: d1e49c07997c1e24ab298d4ed814d780 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character_Atlas.asset b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset similarity index 72% rename from Assets/08.Spines/Characters/Players/Player02/02_character_Atlas.asset rename to Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset index b683ce0c6..418279701 100644 --- a/Assets/08.Spines/Characters/Players/Player02/02_character_Atlas.asset +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: 02_character_Atlas + m_Name: Guest01_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: ef80d1eb0217c47468ceb785dcfd4fa3, type: 3} + atlasFile: {fileID: 4900000, guid: 365b60be853946e4f968c1b8721bc730, type: 3} materials: - - {fileID: 2100000, guid: c5ff73efdfe597a488e245216fd5d707, type: 2} + - {fileID: 2100000, guid: eaf5a1e524cd8ae439ec7b6036090474, type: 2} diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer_SkeletonData.asset.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset.meta similarity index 79% rename from Assets/08.Spines/Characters/Npcs/Customers/Customer_SkeletonData.asset.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset.meta index 92ee0684e..c26915316 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer_SkeletonData.asset.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ee5f908cebc409b498d389052e7d9a81 +guid: 20060a2c2207f3d46850db03d6cad991 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew.mat b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat similarity index 90% rename from Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew.mat rename to Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat index dbd324d4b..b1fa47ca1 100644 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew.mat +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Crew_Crew + m_Name: Guest01_Material m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -26,7 +26,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: d1b77877659d1a746bbfcf68bfd37a5b, type: 3} + m_Texture: {fileID: 2800000, guid: 1a4f3c20594f16b49ba571734aa21edd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_3.mat.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat.meta similarity index 79% rename from Assets/08.Spines/Characters/Players/Player01/02_character_02_character_3.mat.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat.meta index 6b3292e9c..16bdfcf02 100644 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_3.mat.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b57c1f6a61b871644bce56f2096562c4 +guid: eaf5a1e524cd8ae439ec7b6036090474 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character_SkeletonData.asset b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset similarity index 78% rename from Assets/08.Spines/Characters/Players/Player02/02_character_SkeletonData.asset rename to Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset index 34e30fb1a..316e13214 100644 --- a/Assets/08.Spines/Characters/Players/Player02/02_character_SkeletonData.asset +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: 02_character_SkeletonData + m_Name: Guest01_SkeletonData m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 30256e0cd4796a44e9f2c0b935f9f4e1, type: 2} - scale: 0.0005 - skeletonJSON: {fileID: 4900000, guid: 62d29a8038dd28a43b81cf4cab3e7f92, type: 3} + - {fileID: 11400000, guid: 20060a2c2207f3d46850db03d6cad991, type: 2} + scale: 0.001 + skeletonJSON: {fileID: 4900000, guid: d1e49c07997c1e24ab298d4ed814d780, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer_Atlas.asset.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset.meta similarity index 79% rename from Assets/08.Spines/Characters/Npcs/Customers/Customer_Atlas.asset.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset.meta index 7a83f9c2e..928dd9881 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer_Atlas.asset.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9376bae177025b0459db3374bfecd495 +guid: 90f596bc1a735a544985584af0b4180a NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/08.Spines/Characters/Players/Player01.meta b/Assets/08.Spines/Characters/Players/Player01.meta deleted file mode 100644 index c91b0f175..000000000 --- a/Assets/08.Spines/Characters/Players/Player01.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 060e02906acae824aa0e790818957e1e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character.atlas.txt b/Assets/08.Spines/Characters/Players/Player01/02_character.atlas.txt deleted file mode 100644 index 0e6791cd1..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character.atlas.txt +++ /dev/null @@ -1,171 +0,0 @@ -02_character.png -size:1982,1979 -filter:Linear,Linear -skin02-2/Back_hair -bounds:2,709,1336,1268 -skin02-2/Body -bounds:2,126,581,826 -rotate:90 -skin02/Body_up -bounds:1871,1692,109,285 -skin02/Eye -bounds:830,2,705,486 -rotate:90 -skin03-1/Hair02 -bounds:1340,907,529,1070 -skin03/L -bounds:1340,69,575,836 - -02_character_2.png -size:1999,1927 -filter:Linear,Linear -Guest01/하의 -bounds:1340,672,544,395 -skin02/Back_hair -bounds:2,657,1336,1268 -skin02/Body -bounds:2,82,573,832 -rotate:90 -skin03-1/Body -bounds:836,2,553,653 -skin03/Body -bounds:1391,10,606,660 -skin03/R -bounds:1340,1069,535,856 - -02_character_3.png -size:2018,1997 -filter:Linear,Linear -Guest01/Arm_L -bounds:1549,925,394,442 -rotate:90 -Guest01/Arm_R -bounds:1147,691,395,442 -Guest01/Hair -bounds:494,1788,588,207 -Guest01/Leg_L -bounds:2,1529,257,515 -rotate:90 -Guest01/Leg_R -bounds:1084,1740,255,523 -rotate:90 -Guest01/Mouse -bounds:1609,1681,399,314 -skin02-2/Body_back -bounds:2,143,566,427 -skin02/Arm_L -bounds:1052,262,427,479 -rotate:90 -skin02/Arm_R -bounds:1533,73,427,478 -rotate:90 -skin02/L -bounds:562,1140,374,425 -rotate:90 -skin02/Leg_L -bounds:2,1242,272,558 -rotate:90 -skin02/Leg_R -bounds:2,967,273,558 -rotate:90 -skin02/R -bounds:1623,1321,358,371 -rotate:90 -skin03-1/Leg_L -bounds:562,854,279,583 -rotate:90 -skin03-1/Leg_R -bounds:2,572,280,574 -rotate:90 -skin03/Arm_L -bounds:570,2,427,479 -rotate:90 -skin03/Leg_L -bounds:989,1135,272,558 -rotate:90 -skin03/Leg_R -bounds:989,1135,272,558 -rotate:90 -skin04/Arm_L -bounds:1544,502,421,472 -rotate:90 -skin04/Arm_R -bounds:578,431,421,472 -rotate:90 -skin04/Leg_L -bounds:519,1516,270,550 -rotate:90 -skin04/Leg_R -bounds:1071,1409,270,550 -rotate:90 -weapon/sword -bounds:2,1791,204,490 -rotate:90 - -02_character_4.png -size:2028,1814 -filter:Linear,Linear -Guest01/Body -bounds:983,463,499,608 -rotate:90 -Guest01/Eye -bounds:2,1492,647,320 -skin02/Body_back -bounds:2,1063,566,427 -skin03-1/Arm_L -bounds:2,626,435,489 -rotate:90 -skin03-1/Arm_R -bounds:493,531,435,488 -rotate:90 -skin03-1/Eye -bounds:1051,964,700,429 -skin03/Arm_R -bounds:570,968,427,479 -rotate:90 -skin03/Eye -bounds:1330,1395,696,417 -skin04/Body -bounds:2,2,527,631 -rotate:90 -skin04/Eye -bounds:651,1397,677,415 - -02_character_5.png -size:2000,1725 -filter:Linear,Linear -Guest01/Face -bounds:1132,883,866,840 -skin02/Face -bounds:894,2,903,879 -skin03/Hair -bounds:2,912,1128,811 -skin04/Face -bounds:2,44,890,866 - -02_character_6.png -size:2031,1191 -filter:Linear,Linear -skin03/Face -bounds:1150,209,980,879 -rotate:90 -skin04/Hair -bounds:2,2,1146,1187 - -02_character_7.png -size:1986,1222 -filter:Linear,Linear -skin03-1/Hair01 -bounds:2,2,1049,1218 -skin03-1/Hair03 -bounds:1053,92,1128,931 -rotate:90 - -02_character_8.png -size:2033,1032 -filter:Linear,Linear -skin02/Hair -bounds:2,15,1122,1015 -skin03-1/Face -bounds:1126,2,1028,905 -rotate:90 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character.png b/Assets/08.Spines/Characters/Players/Player01/02_character.png deleted file mode 100644 index 8940329f7..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player01/02_character.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character.png.meta b/Assets/08.Spines/Characters/Players/Player01/02_character.png.meta deleted file mode 100644 index 164ffba0e..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character.png.meta +++ /dev/null @@ -1,417 +0,0 @@ -fileFormatVersion: 2 -guid: 61606b972ee96194690b012fae2a9fd6 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: 02_character_0 - rect: - serializedVersion: 2 - x: 3 - y: 1273 - width: 824 - height: 579 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 8006b8c5102091545823f1f6ac48e9bf - internalID: -1480787238 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_1 - rect: - serializedVersion: 2 - x: 831 - y: 1694 - width: 41 - height: 282 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 69561403c66d8504c9bbdaf6a75fd3ed - internalID: 1484422564 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2 - rect: - serializedVersion: 2 - x: 957 - y: 1691 - width: 281 - height: 264 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 4a022f810314ea745af6f59aba6447a7 - internalID: -2125080106 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_3 - rect: - serializedVersion: 2 - x: 1257 - y: 1514 - width: 58 - height: 236 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: bf5b83e26cd2fca4caaea6e294eede6d - internalID: 256085308 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_4 - rect: - serializedVersion: 2 - x: 1341 - y: 1075 - width: 573 - height: 834 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 3ffa8fbed04041d449dd10b0a83b13a8 - internalID: -1373711292 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_5 - rect: - serializedVersion: 2 - x: 842 - y: 1280 - width: 62 - height: 251 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 5a9a22454aac4774c9a743e8a598cd3d - internalID: 101206819 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_6 - rect: - serializedVersion: 2 - x: 961 - y: 1273 - width: 277 - height: 262 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 58966d408fa53e948a98d00ecaa3e427 - internalID: -156793915 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_7 - rect: - serializedVersion: 2 - x: 916 - y: 1265 - width: 4 - height: 4 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: d2ecea00ec06f7041bd3ebc04d937063 - internalID: -739110474 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_8 - rect: - serializedVersion: 2 - x: 3 - y: 30 - width: 1334 - height: 1129 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a3f06297a3035aa46a8849acfbdc5a64 - internalID: -2091596919 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_9 - rect: - serializedVersion: 2 - x: 1341 - y: 3 - width: 527 - height: 1068 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c5dae90aa96a09742a3614b9ab0287be - internalID: 848896726 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_10 - rect: - serializedVersion: 2 - x: 1872 - y: 3 - width: 107 - height: 283 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 399e0371b81762c46bbca3bcdb584876 - internalID: -222811121 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_11 - rect: - serializedVersion: 2 - x: 281 - y: 3 - width: 5 - height: 4 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a40a1ed2666a8254587d2d77d858a33b - internalID: -1052495728 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 970be9a57053f5044ac40e9a12bb7c90 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: - 02_character_0: -1480787238 - 02_character_1: 1484422564 - 02_character_10: -222811121 - 02_character_11: -1052495728 - 02_character_2: -2125080106 - 02_character_3: 256085308 - 02_character_4: -1373711292 - 02_character_5: 101206819 - 02_character_6: -156793915 - 02_character_7: -739110474 - 02_character_8: -2091596919 - 02_character_9: 848896726 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character.skel.bytes b/Assets/08.Spines/Characters/Players/Player01/02_character.skel.bytes deleted file mode 100644 index c8476ac83..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player01/02_character.skel.bytes and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character.mat b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character.mat deleted file mode 100644 index f412f80b5..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 02_character_02_character - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 61606b972ee96194690b012fae2a9fd6, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_2.mat b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_2.mat deleted file mode 100644 index dcdb363f2..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_2.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 02_character_02_character_2 - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 3c1daa84fd7f72d4d851042296422033, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_3.mat b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_3.mat deleted file mode 100644 index e3de8c326..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_3.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 02_character_02_character_3 - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: a7e16263f0a19294d9d00822d117de8e, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_4.mat b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_4.mat deleted file mode 100644 index aa79a854d..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_4.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 02_character_02_character_4 - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: b826d297e90307849934b4a12a983a4e, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_4.mat.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_4.mat.meta deleted file mode 100644 index a47da7904..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_4.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b415669ca9284824ba690b7c9634cf7a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_5.mat b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_5.mat deleted file mode 100644 index eac0573ee..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_5.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 02_character_02_character_5 - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: d84fa10157b595f4daf71f327ecd7c1a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_5.mat.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_5.mat.meta deleted file mode 100644 index 0728400b3..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_5.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d17bf1e298c5a114d8d3855ad4d10966 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_6.mat b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_6.mat deleted file mode 100644 index 231e0b740..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_6.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 02_character_02_character_6 - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 1234875e954a9e74c833aae1395be414, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_6.mat.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_6.mat.meta deleted file mode 100644 index 00d9aa09a..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_6.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 980747877dda8784ca8e9a1a4b6c9b6b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_7.mat b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_7.mat deleted file mode 100644 index 725e2e51f..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_7.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 02_character_02_character_7 - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 58ec9747997148a40a85eea6efd0ddc1, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_7.mat.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_7.mat.meta deleted file mode 100644 index 3e034bfbd..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_7.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 626ae23d4377e5c4ba407587346c24a7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_8.mat b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_8.mat deleted file mode 100644 index 641425bad..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_8.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 02_character_02_character_8 - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7b1e5bfd96aa5c1449e9446a85d1b419, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_8.mat.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_8.mat.meta deleted file mode 100644 index 2a5ca13ee..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character_8.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1718233771b0c7547bdcb573e16a628e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_2.png b/Assets/08.Spines/Characters/Players/Player01/02_character_2.png deleted file mode 100644 index 50c72ed47..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player01/02_character_2.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_2.png.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_2.png.meta deleted file mode 100644 index 1fb3ba5fd..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_2.png.meta +++ /dev/null @@ -1,394 +0,0 @@ -fileFormatVersion: 2 -guid: 3c1daa84fd7f72d4d851042296422033 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: 02_character_2_0 - rect: - serializedVersion: 2 - x: 3 - y: 1273 - width: 852 - height: 571 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: ce655f21abd53124cb858696e874fc24 - internalID: 2002726916 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_1 - rect: - serializedVersion: 2 - x: 837 - y: 1346 - width: 522 - height: 578 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a1fa0a5494e5316409bca157ced9095b - internalID: -1132565905 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_2 - rect: - serializedVersion: 2 - x: 1373 - y: 1258 - width: 623 - height: 658 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: f07fdd803b7e7854986d942610ca24e9 - internalID: 842123748 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_3 - rect: - serializedVersion: 2 - x: 879 - y: 1276 - width: 6 - height: 5 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 1b1c62b1feda42043b1e3f37f55ca55f - internalID: 1947401434 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_4 - rect: - serializedVersion: 2 - x: 1017 - y: 1273 - width: 18 - height: 9 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 024ef15ed083c8a4e93ad16629d63ef7 - internalID: -173852935 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_5 - rect: - serializedVersion: 2 - x: 1329 - y: 1277 - width: 6 - height: 4 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: df7e11655a7274443bb584283e3b0fe8 - internalID: -422632944 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_6 - rect: - serializedVersion: 2 - x: 916 - y: 1265 - width: 4 - height: 4 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: f2911dc90a7068d4f8fd9382f4ea0879 - internalID: -1671106297 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_7 - rect: - serializedVersion: 2 - x: 1341 - y: 861 - width: 542 - height: 393 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 8f2fd43776177f54784e79f770fecf11 - internalID: -814284957 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_8 - rect: - serializedVersion: 2 - x: 3 - y: 54 - width: 1334 - height: 605 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 2271a90a656afd248a628a8debb25dfe - internalID: -704049670 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_9 - rect: - serializedVersion: 2 - x: 1341 - y: 3 - width: 533 - height: 854 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 294fe28a8e43f424095a984c5fc5b6cf - internalID: 1125290359 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: 02_character_2_10 - rect: - serializedVersion: 2 - x: 281 - y: 3 - width: 5 - height: 4 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c9ea0e1ef9558dd45b5470b1a443ab8f - internalID: -2017241296 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 1af691c867437f34b89241ffd8cf7e02 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: - 02_character_2_0: 2002726916 - 02_character_2_1: -1132565905 - 02_character_2_10: -2017241296 - 02_character_2_2: 842123748 - 02_character_2_3: 1947401434 - 02_character_2_4: -173852935 - 02_character_2_5: -422632944 - 02_character_2_6: -1671106297 - 02_character_2_7: -814284957 - 02_character_2_8: -704049670 - 02_character_2_9: 1125290359 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_3.png b/Assets/08.Spines/Characters/Players/Player01/02_character_3.png deleted file mode 100644 index d065bc471..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player01/02_character_3.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_3.png.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_3.png.meta deleted file mode 100644 index c4c1419fe..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_3.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: a7e16263f0a19294d9d00822d117de8e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_4.png b/Assets/08.Spines/Characters/Players/Player01/02_character_4.png deleted file mode 100644 index ea65b1e9b..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player01/02_character_4.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_4.png.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_4.png.meta deleted file mode 100644 index 65f4727f7..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_4.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: b826d297e90307849934b4a12a983a4e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_5.png b/Assets/08.Spines/Characters/Players/Player01/02_character_5.png deleted file mode 100644 index f90623018..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player01/02_character_5.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_5.png.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_5.png.meta deleted file mode 100644 index 5698bace5..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_5.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: d84fa10157b595f4daf71f327ecd7c1a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_6.png b/Assets/08.Spines/Characters/Players/Player01/02_character_6.png deleted file mode 100644 index 05ba4e551..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player01/02_character_6.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_6.png.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_6.png.meta deleted file mode 100644 index bf5e3fadc..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_6.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: 1234875e954a9e74c833aae1395be414 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_7.png b/Assets/08.Spines/Characters/Players/Player01/02_character_7.png deleted file mode 100644 index 2286282e2..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player01/02_character_7.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_7.png.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_7.png.meta deleted file mode 100644 index a86111d52..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_7.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: 58ec9747997148a40a85eea6efd0ddc1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_8.png b/Assets/08.Spines/Characters/Players/Player01/02_character_8.png deleted file mode 100644 index 6dc4bb918..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player01/02_character_8.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_8.png.meta b/Assets/08.Spines/Characters/Players/Player01/02_character_8.png.meta deleted file mode 100644 index a3e426621..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_8.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: 7b1e5bfd96aa5c1449e9446a85d1b419 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_Atlas.asset b/Assets/08.Spines/Characters/Players/Player01/02_character_Atlas.asset deleted file mode 100644 index 166c5e5b2..000000000 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_Atlas.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: 02_character_Atlas - m_EditorClassIdentifier: - textureLoadingMode: 0 - onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 098eed219e280c84bba0d2bcef3639e9, type: 3} - materials: - - {fileID: 2100000, guid: d688bae725a72f0458ea605a4ab68620, type: 2} - - {fileID: 2100000, guid: 3f63247b1e11abb4e9de4e2e07d60516, type: 2} - - {fileID: 2100000, guid: b57c1f6a61b871644bce56f2096562c4, type: 2} - - {fileID: 2100000, guid: b415669ca9284824ba690b7c9634cf7a, type: 2} - - {fileID: 2100000, guid: d17bf1e298c5a114d8d3855ad4d10966, type: 2} - - {fileID: 2100000, guid: 980747877dda8784ca8e9a1a4b6c9b6b, type: 2} - - {fileID: 2100000, guid: 626ae23d4377e5c4ba407587346c24a7, type: 2} - - {fileID: 2100000, guid: 1718233771b0c7547bdcb573e16a628e, type: 2} diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character.atlas.txt b/Assets/08.Spines/Characters/Players/Player02/02_character.atlas.txt deleted file mode 100644 index b895fabe2..000000000 --- a/Assets/08.Spines/Characters/Players/Player02/02_character.atlas.txt +++ /dev/null @@ -1,134 +0,0 @@ -02_character.png -size:993,916 -filter:Linear,Linear -scale:0.19 -Guest01/Arm_L -bounds:806,197,75,84 -Guest01/Arm_R -bounds:790,28,75,84 -rotate:90 -Guest01/Body -bounds:391,2,95,116 -Guest01/Eye -bounds:217,5,123,61 -Guest01/Face -bounds:649,580,165,160 -Guest01/Hair -bounds:488,6,112,39 -rotate:90 -Guest01/Leg_L -bounds:891,743,49,98 -rotate:90 -Guest01/Leg_R -bounds:705,228,48,99 -rotate:90 -Guest01/Mouse -bounds:573,411,76,60 -rotate:90 -Guest01/하의 -bounds:806,283,103,75 -rotate:90 -skin02-2/Back_hair -bounds:2,673,254,241 -skin02-2/Body -bounds:391,247,110,157 -skin02-2/Body_back -bounds:463,406,108,81 -skin02/Arm_L -bounds:900,333,81,91 -rotate:90 -skin02/Arm_R -bounds:883,196,81,91 -rotate:90 -skin02/Back_hair -bounds:2,430,254,241 -skin02/Body -bounds:816,582,109,158 -skin02/Body_back -bounds:723,278,108,81 -rotate:90 -skin02/Body_up -bounds:342,12,21,54 -skin02/Eye -bounds:503,270,134,92 -rotate:90 -skin02/Face -bounds:217,68,172,167 -skin02/Hair -bounds:2,2,213,193 -skin02/L -bounds:687,144,71,81 -skin02/Leg_L -bounds:883,279,52,106 -rotate:90 -skin02/Leg_R -bounds:529,27,52,106 -skin02/R -bounds:876,42,68,70 -skin03-1/Arm_L -bounds:855,487,83,93 -skin03-1/Arm_R -bounds:592,142,83,93 -rotate:90 -skin03-1/Body -bounds:597,281,105,124 -rotate:90 -skin03-1/Eye -bounds:508,135,133,82 -rotate:90 -skin03-1/Face -bounds:694,742,195,172 -skin03-1/Hair01 -bounds:2,197,199,231 -skin03-1/Hair02 -bounds:258,406,101,203 -rotate:90 -skin03-1/Hair03 -bounds:258,509,214,177 -skin03-1/Leg_L -bounds:927,630,53,111 -skin03-1/Leg_R -bounds:800,469,53,109 -skin03/Arm_L -bounds:624,49,81,91 -skin03/Arm_R -bounds:707,51,81,91 -skin03/Body -bounds:391,120,115,125 -skin03/Eye -bounds:635,388,132,79 -skin03/Face -bounds:203,237,186,167 -skin03/Hair -bounds:478,760,214,154 -skin03/L -bounds:639,469,109,159 -rotate:90 -skin03/Leg_L -bounds:597,227,52,106 -rotate:90 -skin03/Leg_R -bounds:597,227,52,106 -rotate:90 -skin03/R -bounds:474,489,102,163 -rotate:90 -skin04/Arm_L -bounds:790,105,80,90 -skin04/Arm_R -bounds:872,114,80,90 -rotate:90 -skin04/Body -bounds:891,794,100,120 -skin04/Eye -bounds:769,388,129,79 -skin04/Face -bounds:478,593,169,165 -skin04/Hair -bounds:258,688,218,226 -skin04/Leg_L -bounds:940,523,51,105 -skin04/Leg_R -bounds:940,416,51,105 -weapon/sword -bounds:583,40,39,93 diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character.atlas.txt.meta b/Assets/08.Spines/Characters/Players/Player02/02_character.atlas.txt.meta deleted file mode 100644 index 08b600b73..000000000 --- a/Assets/08.Spines/Characters/Players/Player02/02_character.atlas.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ef80d1eb0217c47468ceb785dcfd4fa3 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character.png b/Assets/08.Spines/Characters/Players/Player02/02_character.png deleted file mode 100644 index 744bfb8b8..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player02/02_character.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character.skel.bytes b/Assets/08.Spines/Characters/Players/Player02/02_character.skel.bytes deleted file mode 100644 index c8476ac83..000000000 Binary files a/Assets/08.Spines/Characters/Players/Player02/02_character.skel.bytes and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character.skel.bytes.meta b/Assets/08.Spines/Characters/Players/Player02/02_character.skel.bytes.meta deleted file mode 100644 index 08da3791a..000000000 --- a/Assets/08.Spines/Characters/Players/Player02/02_character.skel.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 62d29a8038dd28a43b81cf4cab3e7f92 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character_Atlas.asset.meta b/Assets/08.Spines/Characters/Players/Player02/02_character_Atlas.asset.meta deleted file mode 100644 index 42607d97a..000000000 --- a/Assets/08.Spines/Characters/Players/Player02/02_character_Atlas.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 30256e0cd4796a44e9f2c0b935f9f4e1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat b/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat deleted file mode 100644 index 74b5e7237..000000000 --- a/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat +++ /dev/null @@ -1,47 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 02_character_Material - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _RECEIVE_SHADOWS - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: b09ecc61b04987d40ad5d74761aa885f, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 1 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat.meta b/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat.meta deleted file mode 100644 index 9b470c0ec..000000000 --- a/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c5ff73efdfe597a488e245216fd5d707 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character_SkeletonData.asset.meta b/Assets/08.Spines/Characters/Players/Player02/02_character_SkeletonData.asset.meta deleted file mode 100644 index da2d13cba..000000000 --- a/Assets/08.Spines/Characters/Players/Player02/02_character_SkeletonData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad9bc316ced5375449444c992ee73cee -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew.meta b/Assets/08.Spines/Characters/Players/Tycoons/Crew.meta deleted file mode 100644 index 55213136e..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3da1fec4ab96be84d84c004c3621e1d7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.atlas.txt b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.atlas.txt deleted file mode 100644 index 1a9296a92..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.atlas.txt +++ /dev/null @@ -1,105 +0,0 @@ -Crew.png -size:2011,1786 -filter:Linear,Linear -Cook/JellyfishStew -bounds:983,533,512,512 -Cook/Stic -bounds:1497,533,512,512 -skin01/Down -bounds:262,1580,157,134 -skin01/Down_side1 -bounds:125,1604,127,135 -rotate:90 -skin01/Down_sideback -bounds:235,1733,51,118 -rotate:90 -skin01/EyeL -bounds:813,1707,77,91 -rotate:90 -skin01/EyeL_close -bounds:63,1758,84,26 -skin01/EyeR -bounds:906,1706,78,90 -rotate:90 -skin01/EyeR_close -bounds:149,1758,84,26 -skin01/Hair_back -bounds:421,1510,298,196 -skin01/Hair_front -bounds:721,1499,295,202 -skin01/Hair_miniL -bounds:1704,1684,100,142 -rotate:90 -skin01/Hair_miniR -bounds:1848,1683,101,142 -rotate:90 -skin01/Hair_sideL -bounds:998,1703,81,181 -rotate:90 -skin01/Hair_sideR -bounds:1377,1686,98,188 -rotate:90 -skin01/HandL -bounds:1181,1700,84,96 -rotate:90 -skin01/HandR -bounds:1279,1700,84,96 -rotate:90 -skin01/Hand_armL -bounds:649,1708,76,80 -rotate:90 -skin01/Hand_armR -bounds:731,1708,76,80 -rotate:90 -skin01/Head -bounds:1018,1480,226,218 -skin01/LegL -bounds:355,1716,68,145 -rotate:90 -skin01/LegR -bounds:502,1716,68,145 -rotate:90 -skin01/Mouse -bounds:2,1768,59,16 -skin01/Up -bounds:1567,1686,135,98 -skin01/Up_side -bounds:2,1655,121,101 -skin03-1/Arm_L -bounds:2,792,435,489 -rotate:90 -skin03-1/Arm_R -bounds:493,761,435,488 -rotate:90 -skin03-1/Body -bounds:2,206,553,653 -rotate:90 -skin03-1/Eye -bounds:1163,1047,700,429 -skin03-1/Hair02 -bounds:657,2,529,1070 -rotate:90 -skin03-1/Leg_L -bounds:2,1229,279,583 -rotate:90 -skin03-1/Leg_R -bounds:587,1198,280,574 -rotate:90 -weapon/sword -bounds:1246,1478,204,490 -rotate:90 - -Crew_2.png -size:1965,1132 -filter:Linear,Linear -skin03-1/Face -bounds:2,225,1028,905 -skin03-1/Hair03 -bounds:1032,2,1128,931 -rotate:90 - -Crew_3.png -size:1053,1222 -filter:Linear,Linear -skin03-1/Hair01 -bounds:2,2,1049,1218 diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.png b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.png deleted file mode 100644 index 22559df29..000000000 Binary files a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.skel.bytes b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.skel.bytes deleted file mode 100644 index f43d5c1b3..000000000 Binary files a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew.skel.bytes and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_2.png b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_2.png deleted file mode 100644 index 836108850..000000000 Binary files a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_2.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_2.png.meta b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_2.png.meta deleted file mode 100644 index a824f7009..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_2.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 6cf351ae98c614049a106a52c0664de5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_3.png b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_3.png deleted file mode 100644 index a6254308e..000000000 Binary files a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_3.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_3.png.meta b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_3.png.meta deleted file mode 100644 index 2c4c53db0..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_3.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 47e1c53a5a359274684a8ad95652220b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Controller.controller b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Controller.controller deleted file mode 100644 index c117bb17c..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Controller.controller +++ /dev/null @@ -1,1483 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &-9212819152714929998 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Tycoon/RunUpSide - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.6666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &-6024449542389761383 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Tycoon/ServingDown - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.6666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &-5705538134743938194 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ServingIdleDown - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.4000001 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.4000001 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &-2893625771242514247 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Tycoon/RunDown - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.6666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &-2446468792716499061 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Tycoon/ServingUpSide - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.6666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &-2036455532883212901 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Tycoon/CookingStew - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.6666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &-1288425025183675365 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.4000001 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.4000001 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &-755466035965601905 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Tycoon/Clean-up - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.6666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &-584365266530777417 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Combat/roll - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.36666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.36666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Crew_Controller - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 2480309483803352483} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!74 &710899044815014903 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ServingIdleUpside - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.4000001 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.4000001 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &1588534291017194413 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Combat/attack-01 - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.73333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.73333335 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!1107 &2480309483803352483 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: [] - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 0} ---- !u!74 &3143883405477659023 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: IdleSide - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.4000001 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.4000001 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &3181161509664182162 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Combat/attack-03 - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.5666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &6091464691901287448 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Tycoon/CookingGrill - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.6666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &8493324079549020383 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Tycoon/Cooking - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.6666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] ---- !u!74 &8983213044277910790 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Combat/attack-02 - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: dummy - path: - classID: 1 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1341452863 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.6666667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Controller.controller.meta b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Controller.controller.meta deleted file mode 100644 index baf63e3bf..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Controller.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2a72f32cda67179449dfd49462a207ce -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew.mat.meta b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew.mat.meta deleted file mode 100644 index 2e3357c4e..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 488f84473afeade458a0b9a9df28930f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_2.mat b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_2.mat deleted file mode 100644 index 092b3a622..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_2.mat +++ /dev/null @@ -1,47 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Crew_Crew_2 - m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _RECEIVE_SHADOWS - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 6cf351ae98c614049a106a52c0664de5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _DoubleSidedLighting: 0 - - _LightAffectsAdditive: 0 - - _ReceiveShadows: 1 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _TintBlack: 0 - - _ZWrite: 0 - m_Colors: - - _Black: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_2.mat.meta b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_2.mat.meta deleted file mode 100644 index f85fcec5a..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_2.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f98d7753b7653ba4186010abedb00ea8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_3.mat.meta b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_3.mat.meta deleted file mode 100644 index 4f3535f73..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Crew_3.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2203ef77ebb5b504291f3c336c72abcd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_SkeletonData.asset b/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_SkeletonData.asset deleted file mode 100644 index 390b86a02..000000000 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_SkeletonData.asset +++ /dev/null @@ -1,31 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: Crew_SkeletonData - m_EditorClassIdentifier: - atlasAssets: - - {fileID: 11400000, guid: b61ce9da2aa41fc41b118c7d6ab55723, type: 2} - scale: 0.002 - skeletonJSON: {fileID: 4900000, guid: 62fad1444cc3651429bf6489b5cceaf5, type: 3} - isUpgradingBlendModeMaterials: 0 - blendModeMaterials: - requiresBlendModeMaterials: 0 - applyAdditiveMaterial: 1 - additiveMaterials: [] - multiplyMaterials: [] - screenMaterials: [] - skeletonDataModifiers: [] - fromAnimation: [] - toAnimation: [] - duration: [] - defaultMix: 0.2 - controller: {fileID: 9100000, guid: 2a72f32cda67179449dfd49462a207ce, type: 2} diff --git a/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt new file mode 100644 index 000000000..7b01e61a7 --- /dev/null +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt @@ -0,0 +1,52 @@ +MainCharacter.png +size:1612,1040 +filter:Linear,Linear +Belt +bounds:200,7,223,102 +Body +bounds:1288,2,214,187 +Eye_left +bounds:851,35,172,240 +rotate:90 +Eye_right +bounds:898,209,195,246 +Face +bounds:583,457,581,520 +rotate:90 +Hair +bounds:1504,6,106,183 +HairMini_Left +bounds:2,132,175,379 +rotate:90 +HairMini_Right +bounds:1105,89,181,474 +Hair_back +bounds:2,485,579,553 +Hair_front +bounds:1105,565,473,312 +rotate:90 +Hair_left +bounds:488,90,151,361 +rotate:90 +Hair_right +bounds:502,243,170,394 +rotate:90 +Hand_left +bounds:1419,841,188,197 +Hand_right +bounds:1419,642,188,197 +Item/Cleaningbroom3 +bounds:2,309,174,498 +rotate:90 +Item/Shaker +bounds:1288,191,302,372 +Leg_left +bounds:383,111,103,196 +Leg_right +bounds:2,27,103,196 +rotate:90 +Mouse +bounds:502,415,68,33 +rotate:90 +Pant +bounds:1093,5,190,82 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer.atlas.txt.meta b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt.meta similarity index 75% rename from Assets/08.Spines/Characters/Npcs/Customers/Customer.atlas.txt.meta rename to Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt.meta index 85fb7ad3a..a61cf23b3 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer.atlas.txt.meta +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 35a3db6d5a669754ea79ba718e4a0c02 +guid: 5a5a3ee2c5040ac4fa5920bd2a68f19a TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png new file mode 100644 index 000000000..61f3d9b7f Binary files /dev/null and b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer.png.meta b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png.meta similarity index 97% rename from Assets/08.Spines/Characters/Npcs/Customers/Customer.png.meta rename to Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png.meta index 9d1a1d3c2..7fdd7bd71 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer.png.meta +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d49a506b374bf85428c0a5d6f3c0315b +guid: 204779ef72f790b418c77b89042f080b TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -133,6 +133,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes new file mode 100644 index 000000000..55d876ccb Binary files /dev/null and b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes differ diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character.atlas.txt.meta b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes.meta similarity index 75% rename from Assets/08.Spines/Characters/Players/Player01/02_character.atlas.txt.meta rename to Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes.meta index 1036b21a4..89bd0e5d6 100644 --- a/Assets/08.Spines/Characters/Players/Player01/02_character.atlas.txt.meta +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 098eed219e280c84bba0d2bcef3639e9 +guid: 6dad8784adba4844396c490cd4c635f4 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Atlas.asset b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Atlas.asset similarity index 59% rename from Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Atlas.asset rename to Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Atlas.asset index 8054c60da..500dffdb8 100644 --- a/Assets/08.Spines/Characters/Players/Tycoons/Crew/Crew_Atlas.asset +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Atlas.asset @@ -10,12 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: Crew_Atlas + m_Name: MainCharacter_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 4e9600c3699c5554aabdee5d4ff02ab4, type: 3} + atlasFile: {fileID: 4900000, guid: 5a5a3ee2c5040ac4fa5920bd2a68f19a, type: 3} materials: - - {fileID: 2100000, guid: 488f84473afeade458a0b9a9df28930f, type: 2} - - {fileID: 2100000, guid: f98d7753b7653ba4186010abedb00ea8, type: 2} - - {fileID: 2100000, guid: 2203ef77ebb5b504291f3c336c72abcd, type: 2} + - {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_Atlas.asset.meta b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Atlas.asset.meta similarity index 79% rename from Assets/08.Spines/Characters/Players/Player01/02_character_Atlas.asset.meta rename to Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Atlas.asset.meta index 639296571..4d86e390b 100644 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_Atlas.asset.meta +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ef6ed0f9e745c7a45b5096d72eedd411 +guid: cac8389b799f32345a01949727c6e2ef NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Customer_Material.mat b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Material.mat similarity index 90% rename from Assets/08.Spines/Characters/Npcs/Customers/Customer_Material.mat rename to Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Material.mat index 6aba5758c..44a95b05f 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Customer_Material.mat +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Customer_Material + m_Name: MainCharacter_Material m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -26,7 +26,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: d49a506b374bf85428c0a5d6f3c0315b, type: 3} + m_Texture: {fileID: 2800000, guid: 204779ef72f790b418c77b89042f080b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character.mat.meta b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Material.mat.meta similarity index 79% rename from Assets/08.Spines/Characters/Players/Player01/02_character_02_character.mat.meta rename to Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Material.mat.meta index 657584cad..feb9f28b9 100644 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_02_character.mat.meta +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d688bae725a72f0458ea605a4ab68620 +guid: 288333d9c9df2d84cadf3b48d918ebdb NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_SkeletonData.asset b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_SkeletonData.asset similarity index 78% rename from Assets/08.Spines/Characters/Players/Player01/02_character_SkeletonData.asset rename to Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_SkeletonData.asset index a9431827a..d931ef36c 100644 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_SkeletonData.asset +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_SkeletonData.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: 02_character_SkeletonData + m_Name: MainCharacter_SkeletonData m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: ef6ed0f9e745c7a45b5096d72eedd411, type: 2} - scale: 0.0005 - skeletonJSON: {fileID: 4900000, guid: 9b1a304d90516bd4aa2e716ace4f67be, type: 3} + - {fileID: 11400000, guid: cac8389b799f32345a01949727c6e2ef, type: 2} + scale: 0.001 + skeletonJSON: {fileID: 4900000, guid: 6dad8784adba4844396c490cd4c635f4, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/08.Spines/Characters/Players/Player01/02_character_SkeletonData.asset.meta b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_SkeletonData.asset.meta similarity index 79% rename from Assets/08.Spines/Characters/Players/Player01/02_character_SkeletonData.asset.meta rename to Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_SkeletonData.asset.meta index 707ec98cc..cee27f313 100644 --- a/Assets/08.Spines/Characters/Players/Player01/02_character_SkeletonData.asset.meta +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter_SkeletonData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 316e6364ce9c5ab43a25eca41a78db56 +guid: 57e95ec929c09d64c9f85a40f849786a NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Resources/Excel/LevelDataTable.xlsx b/Assets/Resources/Excel/LevelDataTable.xlsx index f6da0b57a..363cf4d42 100644 Binary files a/Assets/Resources/Excel/LevelDataTable.xlsx and b/Assets/Resources/Excel/LevelDataTable.xlsx differ diff --git a/Assets/Resources/JSON/LevelDataTable.json b/Assets/Resources/JSON/LevelDataTable.json index 681a75fa2..2f5600448 100644 --- a/Assets/Resources/JSON/LevelDataTable.json +++ b/Assets/Resources/JSON/LevelDataTable.json @@ -8,7 +8,7 @@ "WaitTime": 20, "HurryTime": 20, "EatingTime": 10, - "OpenUpgrade": "" + "OpenUpgrade": "Upgrade0" }, { "Idx": 2,