diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 32d23c4fa..e427d9636 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -118,6 +118,136 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &9151229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9151230} + - component: {fileID: 9151233} + - component: {fileID: 9151232} + - component: {fileID: 9151231} + m_Layer: 9 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9151230 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9151229} + 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: [] + m_Father: {fileID: 1288799788} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9151231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9151229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: ad9bc316ced5375449444c992ee73cee, type: 2} + initialSkinName: 02 + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: idle + loop: 1 + timeScale: 1 +--- !u!23 &9151232 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9151229} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c5ff73efdfe597a488e245216fd5d707, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &9151233 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9151229} + m_Mesh: {fileID: 0} --- !u!1 &20736009 GameObject: m_ObjectHideFlags: 0 @@ -237,81 +367,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f1852e60e7132046b79863fb1d23af0, type: 3} ---- !u!1 &114124395 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 114124396} - - component: {fileID: 114124398} - - component: {fileID: 114124397} - m_Layer: 5 - m_Name: FadeImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &114124396 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 114124395} - 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: [] - m_Father: {fileID: 1049919592} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &114124397 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 114124395} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &114124398 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 114124395} - m_CullTransparentMesh: 0 --- !u!1 &119395937 GameObject: m_ObjectHideFlags: 0 @@ -804,7 +859,7 @@ Transform: m_GameObject: {fileID: 211259724} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.57, y: 0, z: 0} + m_LocalPosition: {x: -2, y: 0, z: 0.14} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: @@ -904,6 +959,54 @@ MonoBehaviour: m_Calls: [] m_ActionId: 04886026-3576-4662-8c73-dab606c598ed m_ActionName: 'CombatUi/CloseItemInventory[/Keyboard/i]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 211259729} + m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp + m_MethodName: OnOpenRestaurantUpgrade + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: a0f02877-2c29-4c32-8898-f0074336c625 + m_ActionName: 'Tycoon/RestaurantUpgrade[/Keyboard/b]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 211259729} + m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp + m_MethodName: OnCloseRestaurantUpgrade + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 013e4058-f4a2-46fc-b3f7-a7f94a4d4644 + m_ActionName: 'TycoonUi/CloseRestaurantUpgrade[/Keyboard/b]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 211259729} + m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp + m_MethodName: OnCancel + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 43781cf6-335d-402e-957c-7a27f3e627b6 + m_ActionName: 'TycoonUi/Cancel[/Keyboard/escape]' m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: Tycoon @@ -938,7 +1041,6 @@ MonoBehaviour: k__BackingField: {fileID: 211259728} k__BackingField: {fileID: 988649516} k__BackingField: {fileID: 988649517} - k__BackingField: {fileID: 211259732} k__BackingField: {fileID: 211259729} k__BackingField: {fileID: 211259731} --- !u!114 &211259731 @@ -963,9 +1065,10 @@ MonoBehaviour: m_GameObject: {fileID: 211259724} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8130801e9ac84aa0874ac36c80383d9c, type: 3} + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} m_Name: m_EditorClassIdentifier: + _skeletonAnimation: {fileID: 988649517} _initialSkinName: 01 --- !u!1 &355668242 GameObject: @@ -1048,6 +1151,11 @@ Transform: - {fileID: 1178042445} m_Father: {fileID: 1253205195} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &488361953 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + m_PrefabInstance: {fileID: 1675364755} + m_PrefabAsset: {fileID: 0} --- !u!1 &545850347 GameObject: m_ObjectHideFlags: 0 @@ -1076,13 +1184,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 545850347} serializedVersion: 2 - m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} - m_LocalPosition: {x: 3.57, y: 10.260604, z: -28.190779} + m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} + m_LocalPosition: {x: -2, y: 20.000006, z: -34.501015} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1634548838} - m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} --- !u!114 &545850349 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1171,7 +1279,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 886251e9a18ece04ea8e61686c173e1b, type: 3} m_Name: m_EditorClassIdentifier: - CameraDistance: 30 + CameraDistance: 40 DeadZoneDepth: 0 Composition: ScreenPosition: {x: 0, y: 0} @@ -1233,6 +1341,156 @@ MonoBehaviour: BarrelClipping: 0.25 Anamorphism: 0 BlendHint: 0 +--- !u!1 &571612559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 571612560} + - component: {fileID: 571612562} + - component: {fileID: 571612561} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &571612560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571612559} + 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: [] + m_Father: {fileID: 1496452082} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &571612561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571612559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &571612562 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571612559} + m_CullTransparentMesh: 1 +--- !u!1 &850434286 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 850434287} + - component: {fileID: 850434289} + - component: {fileID: 850434288} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &850434287 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 850434286} + 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: [] + m_Father: {fileID: 1496452082} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &850434288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 850434286} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.5882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &850434289 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 850434286} + m_CullTransparentMesh: 1 --- !u!1 &852387591 GameObject: m_ObjectHideFlags: 0 @@ -1437,8 +1695,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873223985} serializedVersion: 2 - m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} - m_LocalPosition: {x: 3.57, y: 10.260604, z: -28.190779} + m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} + m_LocalPosition: {x: -2, y: 20.000006, z: -34.501015} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1623,7 +1881,7 @@ MonoBehaviour: physicsMovementRelativeTo: {fileID: 0} updateTiming: 1 unscaledTime: 0 - _animationName: + _animationName: idle loop: 1 timeScale: 1 --- !u!23 &988649518 @@ -1707,9 +1965,15 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1028043511} m_Father: {fileID: 923706278} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1028043511 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + m_PrefabInstance: {fileID: 1328652233} + m_PrefabAsset: {fileID: 0} --- !u!1 &1049919588 GameObject: m_ObjectHideFlags: 0 @@ -1722,6 +1986,7 @@ GameObject: - component: {fileID: 1049919591} - component: {fileID: 1049919590} - component: {fileID: 1049919589} + - component: {fileID: 1049919593} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -1804,7 +2069,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 114124396} + - {fileID: 1496452082} + - {fileID: 1849823320} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1812,6 +2078,20 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1049919593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1049919588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d9b8436bda385e42a42700d8993be80, type: 3} + m_Name: + m_EditorClassIdentifier: + _persistent: 0 + k__BackingField: {fileID: 1496452083} --- !u!1 &1178042444 GameObject: m_ObjectHideFlags: 0 @@ -1840,7 +2120,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 20, y: 20, z: 10} + m_LocalScale: {x: 10, y: 10, z: 5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 461791772} @@ -1894,7 +2174,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 2, y: 2} + m_Size: {x: 4, y: 4} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2074,6 +2354,327 @@ Transform: - {fileID: 923706278} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1288799782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1288799788} + - component: {fileID: 1288799787} + - component: {fileID: 1288799786} + - component: {fileID: 1288799785} + - component: {fileID: 1288799784} + - component: {fileID: 1288799783} + - component: {fileID: 1288799791} + - component: {fileID: 1288799790} + - component: {fileID: 1288799789} + m_Layer: 9 + m_Name: Customer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1288799783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288799782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 77f586f285b3847808d79083bd19ef1f, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + quality: 0 + splitAtEveryPortal: 0 + accountForGridPenalties: 0 +--- !u!114 &1288799784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288799782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + radius: 0.25 + height: 1 + canMove: 1 + maxSpeed: 3 + gravity: {x: NaN, y: NaN, z: NaN} + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + endReachedDistance: 0.1 + whenCloseToDestination: 0 + rvoDensityBehavior: + enabled: 1 + densityThreshold: 0.5 + returnAfterBeingPushedAway: 0 + progressAverage: 0 + lastJobDensityResult: 0 + centerOffsetCompatibility: NaN + repathRateCompatibility: NaN + canSearchCompability: 0 + orientation: 0 + enableRotation: 1 + autoRepath: + mode: 2 + period: 0.5 + sensitivity: 10 + maximumPeriod: 2 + visualizeSensitivity: 0 + targetCompatibility: {fileID: 0} + maxAcceleration: -2.5 + rotationSpeed: 360 + slowdownDistance: 0.3 + pickNextWaypointDist: 0.5 + alwaysDrawGizmos: 0 + slowWhenNotFacingTarget: 1 + preventMovingBackwards: 0 + constrainInsideGraph: 0 +--- !u!114 &1288799785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288799782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 373b52eb9bf8c40f785bb6947a1aee66, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + drawGizmos: 1 + detailedGizmos: 0 + startEndModifier: + addPoints: 0 + exactStartPoint: 3 + exactEndPoint: 3 + useRaycasting: 0 + mask: + serializedVersion: 2 + m_Bits: 4294967295 + useGraphRaycasting: 0 + traversableTags: -1 + tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + graphMask: + value: 1 +--- !u!136 &1288799786 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288799782} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.25 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0.5, z: 0} +--- !u!54 &1288799787 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288799782} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!4 &1288799788 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288799782} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.91, y: 0, z: -10} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 9151230} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1288799789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288799782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75b48aa4b99043cb9e665a892ec46c75, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1288799790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288799782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: + _skeletonAnimation: {fileID: 9151231} + _initialSkinName: 02 +--- !u!114 &1288799791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288799782} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3} + m_Name: + m_EditorClassIdentifier: + startWhenEnabled: 1 + asynchronousLoad: 0 + pauseWhenDisabled: 0 + restartWhenComplete: 0 + logTaskChanges: 0 + group: 0 + resetValuesOnRestart: 0 + externalBehavior: {fileID: 11400000, guid: c50cf2007f7d1f94387bc84bc9f7489a, type: 2} + mBehaviorSource: + behaviorName: Behavior + behaviorDescription: + mTaskData: + types: [] + parentIndex: + startIndex: + variableStartIndex: + JSONSerialization: '{"EntryTask":{"Type":"BehaviorDesigner.Runtime.Tasks.EntryTask","NodeData":{"Offset":"(548.5,30)"},"ID":0,"Name":"Entry","Instant":true},"RootTask":{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-301.5,250)"},"ID":1,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None"}}' + fieldSerializationData: + typeName: [] + fieldNameHash: + startIndex: + dataPosition: + unityObjects: [] + byteData: + byteDataArray: + Version: 1.7.9 + gizmoViewMode: 2 + showBehaviorDesignerGizmo: 0 +--- !u!1001 &1328652233 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1028035736} + m_Modifications: + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalPosition.y + value: 0.675 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4833254060163934334, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_Name + value: Table 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + insertIndex: -1 + addedObject: {fileID: 488361953} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bc2abb0d190003240b86437081f20536, type: 3} --- !u!1001 &1395162455 PrefabInstance: m_ObjectHideFlags: 0 @@ -2188,6 +2789,58 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4f3702d2bd51af41ac161d64cfc9ba5, type: 3} +--- !u!1 &1496452081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1496452082} + - component: {fileID: 1496452083} + m_Layer: 5 + m_Name: RestaurantUpgradeUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1496452082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1496452081} + 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: 850434287} + - {fileID: 571612560} + m_Father: {fileID: 1049919592} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1496452083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1496452081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce8b8bf51887c134abe0cc8e8ad942cc, type: 3} + m_Name: + m_EditorClassIdentifier: + SwitchMapsOpened: 2 + SwitchMapsClosed: 1 --- !u!1 &1572330888 GameObject: m_ObjectHideFlags: 0 @@ -2476,6 +3129,405 @@ Transform: - {fileID: 545850348} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1675364755 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1028043511} + m_Modifications: + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalScale.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalScale.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalPosition.x + value: -0.182 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalPosition.y + value: 0.186 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4833254060163934334, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} + propertyPath: m_Name + value: Food01 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 27de1acbc82209940bcb5b7f1deda77a, type: 3} +--- !u!1 &1746385716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1746385717} + - component: {fileID: 1746385718} + m_Layer: 0 + m_Name: A* + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1746385717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1746385716} + 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: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1746385718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1746385716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78396926cbbfc4ac3b48fc5fc34a87d1, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + data: + dataString: UEsDBBQAAAgIAABIIewe1u78wAIAAP0FAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI56UKhQLd2y7Qdg9tUemqh6UHJx6IhbEjfxRoxX/fGcdAoBJSwpt5M2++8sWkdhUU3th7K8WjEcB+thi9sx+tk/EBtnxp9Ex+wsHnTQpfkhOPPi/cS4N4h2jOrMFbWfzSS0XOGYJBy4Wx64lYwsg47xBecOUATdZ4YmuEvlpsmwi79PykZ2uPbwVoD/bk1e5dDfrD7qBzM5y0s0HitLOrzhkt6ELxdQWC5J/YvUOSXu2msbDkQfzCKCVdUsX8ropVj3jlAtaEDkJyrDLqIf8S5LL0+Oe6SX5eLBz4VInlu7G02Kw6Kvtt6g6uuVvVuj64CpSnO+xFTXXQx2/2fm1eWLN+OOTtZJTDl7JYvfBdwZ1vtLgJj8+FB73hasVzBW8l6Cdzb03QAo3eBqIGB9fjRqhjbaMSitXJr9Z6AYbq+1Ab09nH6rczD9Wxjuyqd0L/OnAzZWLzU0iyJOSWQoLFwf3BeuIOuZQIUdKI/Fe+bC5bMtxJ6zyakp6Eku8UJwQCdAGp721y0CQvN8FSLDaJWqkZwY+M1RDhJLACzZXfTTGiv1yBC1tD14XljtPdJXXJdjinC0qET/5ZdmGams1x2BaX18WNPrz9e6chuNJsHsGVz8ErqRvdJsMTNnhktK43t9nMA20W7IIXDZqHrQ8WxtzzmA3l4IKJJhV7GRk6KEW7HAuIirAA+r1Tf0uOeVWE2ZPR8fLOnlH+MkhxfiEs4wN+K/LFzXUn7w+GebubdyEvoJtnfQH92w6LJyQ1tpurad2vNCXcLn2qReO5UMQXcJ4Hy3WcvLB8cy8/16YxeakXZlZYAP1cRzgWCxaT4MdFTITEMmfgvdRxL9nXnClTrEDMj4HmsbGTrbd8fooyZ5X8MJ6QORvFb+GcEXy8SFzdDwkbSn4WDBSODsSrVLDmFZmyPdv/B1BLAwQUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAatWKkstKs7Mz1OyUjDVM9Qz1FFQSi9KLMgoBgqAOaWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7B7W7vzAAgAA/QUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJAAAAAAAAAAAAAAADQMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADDAwAAAAA= + file_cachedStartup: {fileID: 0} + cacheStartup: 0 + showNavGraphs: 1 + showUnwalkableNodes: 1 + debugMode: 0 + debugFloor: 0 + debugRoof: 1 + manualDebugFloorRoof: 0 + showSearchTree: 0 + unwalkableNodeDebugSize: 0.3 + logPathResults: 1 + maxNearestNodeDistance: 100 + scanOnStartup: 1 + fullGetNearestSearch: 0 + prioritizeGraphs: 0 + prioritizeGraphsLimit: 1 + colorSettings: + _SolidColor: {r: 0.11764706, g: 0.4, b: 0.7882353, a: 0.9} + _UnwalkableNode: {r: 1, g: 0, b: 0, a: 0.5} + _BoundsHandles: {r: 0.29, g: 0.454, b: 0.741, a: 0.9} + _ConnectionLowLerp: {r: 0, g: 1, b: 0, a: 0.5} + _ConnectionHighLerp: {r: 1, g: 0, b: 0, a: 0.5} + _MeshEdgeColor: {r: 0, g: 0, b: 0, a: 0.5} + _AreaColors: [] + tagNames: + - Basic Ground + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + - 8 + - 9 + - 10 + - 11 + - 12 + - 13 + - 14 + - 15 + - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 29 + - 30 + - 31 + heuristic: 2 + heuristicScale: 1 + threadCount: 1 + maxFrameTime: 1 + batchGraphUpdates: 0 + graphUpdateBatchingInterval: 0.2 + navmeshUpdates: + updateInterval: 0 + euclideanEmbedding: + mode: 0 + seed: 0 + pivotPointRoot: {fileID: 0} + spreadOutCount: 1 + showGraphs: 1 +--- !u!1 &1769137578 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1769137579} + - component: {fileID: 1769137581} + - component: {fileID: 1769137580} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1769137579 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1769137578} + 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: [] + m_Father: {fileID: 1849823320} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1769137580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1769137578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC5C5\uADF8\uB808\uC774\uB4DC : B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 30 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1769137581 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1769137578} + m_CullTransparentMesh: 1 +--- !u!1 &1849823319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1849823320} + - component: {fileID: 1849823322} + - component: {fileID: 1849823321} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1849823320 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1849823319} + 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: 1769137579} + m_Father: {fileID: 1049919592} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -30} + m_SizeDelta: {x: 200, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1849823321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1849823319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1849823322 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1849823319} + m_CullTransparentMesh: 1 --- !u!1 &1896021279 GameObject: m_ObjectHideFlags: 0 @@ -2519,6 +3571,7 @@ SceneRoots: - {fileID: 1222632321} - {fileID: 1231728096} - {fileID: 1619849090} + - {fileID: 1746385717} - {fileID: 119395941} - {fileID: 1049919592} - {fileID: 1896021280} @@ -2532,3 +3585,4 @@ SceneRoots: - {fileID: 1253205195} - {fileID: 20736010} - {fileID: 211259727} + - {fileID: 1288799788} diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index 813d9e7b8..cca9d94b3 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -229,6 +229,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 67330819} m_CullTransparentMesh: 0 +--- !u!1001 &72828948 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5357078582851212969, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9154244493302919714, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} + propertyPath: m_Name + value: TitanSlime + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} --- !u!1 &96992132 GameObject: m_ObjectHideFlags: 0 @@ -808,8 +865,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 191889754} serializedVersion: 2 - m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} - m_LocalPosition: {x: 0, y: 10.260604, z: -33.19078} + m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} + m_LocalPosition: {x: 0, y: 15.000004, z: -30.98076} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1088,13 +1145,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 285952512} serializedVersion: 2 - m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} - m_LocalPosition: {x: 0, y: 10.260604, z: -33.19078} + m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} + m_LocalPosition: {x: 0, y: 15.000004, z: -30.98076} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2043119555} - m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} --- !u!114 &285952516 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1970,13 +2027,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 481231814} serializedVersion: 2 - m_LocalRotation: {x: 0.3176291, y: -0.3212165, z: 0.12740777, w: 0.8830057} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 882036795} - m_LocalEulerAnglesHint: {x: 40, y: -39.41, z: 1.567} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &485942903 GameObject: m_ObjectHideFlags: 0 @@ -19101,6 +19158,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a61520d3b25b0244685023b48f19cdee, type: 3} m_Name: m_EditorClassIdentifier: + SwitchMapsOpened: 4 + SwitchMapsClosed: 3 SortingDropdown: {fileID: 5518631981308585485} CurrentWeight: {fileID: 5638844555988528261} InstantiateLocation: {fileID: 2478437734520413558} @@ -19682,3 +19741,4 @@ SceneRoots: - {fileID: 370354194} - {fileID: 1383322271} - {fileID: 582179850} + - {fileID: 72828948} diff --git a/Assets/02.Scripts/BehaviorTree/Action.meta b/Assets/02.Scripts/BehaviorTree/Action.meta new file mode 100644 index 000000000..e28002b7f --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Action.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d2cbbe89b1868d40a4a855db56f263b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/BehaviorTree/ReturnSuccess.cs b/Assets/02.Scripts/BehaviorTree/Action/ReturnSuccess.cs similarity index 84% rename from Assets/02.Scripts/BehaviorTree/ReturnSuccess.cs rename to Assets/02.Scripts/BehaviorTree/Action/ReturnSuccess.cs index dc5f6edf6..cbed9ee17 100644 --- a/Assets/02.Scripts/BehaviorTree/ReturnSuccess.cs +++ b/Assets/02.Scripts/BehaviorTree/Action/ReturnSuccess.cs @@ -1,6 +1,6 @@ using BehaviorDesigner.Runtime.Tasks; -namespace BlueWater.BehaviorTrees +namespace BlueWater.BehaviorTrees.Actions { [TaskCategory("Custom")] public class ReturnSuccess : Action diff --git a/Assets/02.Scripts/BehaviorTree/ReturnSuccess.cs.meta b/Assets/02.Scripts/BehaviorTree/Action/ReturnSuccess.cs.meta similarity index 100% rename from Assets/02.Scripts/BehaviorTree/ReturnSuccess.cs.meta rename to Assets/02.Scripts/BehaviorTree/Action/ReturnSuccess.cs.meta diff --git a/Assets/02.Scripts/Character/Enemy/AiMovement.cs b/Assets/02.Scripts/Character/AiMovement.cs similarity index 100% rename from Assets/02.Scripts/Character/Enemy/AiMovement.cs rename to Assets/02.Scripts/Character/AiMovement.cs diff --git a/Assets/02.Scripts/Character/Enemy/AiMovement.cs.meta b/Assets/02.Scripts/Character/AiMovement.cs.meta similarity index 100% rename from Assets/02.Scripts/Character/Enemy/AiMovement.cs.meta rename to Assets/02.Scripts/Character/AiMovement.cs.meta diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs b/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs index 0719d8cc4..ec110b4f0 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs @@ -86,8 +86,7 @@ namespace BlueWater.Players.Combat { if (context.performed) { - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.CombatUi); - CombatUiManager.Instance.CombatItemInventoryUi.Open(); + CombatUiManager.Instance.CombatItemInventoryUi.Open(CombatUiManager.Instance.PopupUiList); } } @@ -98,7 +97,6 @@ namespace BlueWater.Players.Combat if (!CombatUiManager.Instance.CombatItemInventoryUi.gameObject.activeSelf) return; CombatUiManager.Instance.CombatItemInventoryUi.Close(); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Combat); } } @@ -106,8 +104,7 @@ namespace BlueWater.Players.Combat { if (context.performed) { - CombatUiManager.Instance.CombatMenuPopupUi.Open(); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.CombatUi); + CombatUiManager.Instance.CombatMenuPopupUi.Open(CombatUiManager.Instance.PopupUiList); } } @@ -116,10 +113,6 @@ namespace BlueWater.Players.Combat if (context.performed) { CombatUiManager.Instance.CloseLastPopup(); - - if (!CombatUiManager.Instance.IsPopupListEmpty()) return; - - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Combat); } } diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs b/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs index b6ab3f1f9..7f4e89839 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs @@ -65,6 +65,11 @@ namespace BlueWater.Players.Combat private void Start() { + if (!GameManager.Instance.CurrentCombatPlayer) + { + GameManager.Instance.SetCurrentCombatPlayer(this); + } + SubscribeEvents(); } diff --git a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs index fbaf368d5..24193a9ea 100644 --- a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs +++ b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs @@ -113,7 +113,7 @@ namespace BlueWater.Players public void Die() { // TODO : 죽는걸 확실히 표현한 후 오브젝트 파괴하기 - CombatUiManager.Instance.GameOverPopupUi.Open(); + CombatUiManager.Instance.GameOverPopupUi.Open(CombatUiManager.Instance.PopupUiList); Destroy(gameObject); } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs index 3b30d2158..75721ba1a 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -46,6 +46,7 @@ namespace BlueWater.Players.Tycoons // Player input methods #region Player input methods + // Tycoon public void OnMove(InputAction.CallbackContext context) { var movementInput = context.ReadValue(); @@ -56,7 +57,34 @@ namespace BlueWater.Players.Tycoons { if (context.performed) { + // TODO : 상호작용 추가 + } + } + + public void OnOpenRestaurantUpgrade(InputAction.CallbackContext context) + { + if (context.performed) + { + TycoonUiManager.Instance.RestaurantUpgradeUi.Open(TycoonUiManager.Instance.PopupUiList); + } + } + + // TycoonUi + public void OnCloseRestaurantUpgrade(InputAction.CallbackContext context) + { + if (context.performed) + { + if (!TycoonUiManager.Instance.RestaurantUpgradeUi.gameObject.activeSelf) return; + TycoonUiManager.Instance.RestaurantUpgradeUi.Close(); + } + } + + public void OnCancel(InputAction.CallbackContext context) + { + if (context.performed) + { + CombatUiManager.Instance.CloseLastPopup(); } } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs index b62b4b7d3..dd257beab 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs @@ -11,7 +11,7 @@ namespace BlueWater.Players.Tycoons // Components public Rigidbody Rigidbody { get; private set; } private Transform _visualLook; - private TycoonSpineController _tycoonSpineController; + private SpineController _spineController; // Move [field: SerializeField, Range(1f, 10f), Tooltip("이동 속도")] @@ -28,9 +28,9 @@ namespace BlueWater.Players.Tycoons if (_isMoving == value) return; _isMoving = value; - _tycoonSpineController.PlayAnimation(_isMoving - ? TycoonSpineAnimationName.run.ToString() - : TycoonSpineAnimationName.idle.ToString(), true); + _spineController.PlayAnimation(_isMoving + ? TycoonPlayerSpineAnimation.run.ToString() + : TycoonPlayerSpineAnimation.idle.ToString(), true); } } @@ -54,7 +54,12 @@ namespace BlueWater.Players.Tycoons // Unity events #region Unity events - + + private void Awake() + { + _spineController = GetComponent(); + } + private void Update() { FlipVisualLook(); @@ -72,11 +77,10 @@ namespace BlueWater.Players.Tycoons // Initialize Methods #region Initialize Methods - public void InitializeComponents(Rigidbody rigidbody, Transform visualLook, TycoonSpineController tycoonSpineController) + public void InitializeComponents(Rigidbody rigidbody, Transform visualLook) { Rigidbody = rigidbody; _visualLook = visualLook; - _tycoonSpineController = tycoonSpineController; } #endregion diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 62fc31575..311fd6459 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -5,6 +5,12 @@ using UnityEngine.InputSystem; namespace BlueWater.Players.Tycoons { + public enum TycoonPlayerSpineAnimation + { + idle = 0, + run + } + public class TycoonPlayer : MonoBehaviour { // Variables @@ -26,9 +32,6 @@ namespace BlueWater.Players.Tycoons [field: SerializeField] public SkeletonAnimation SkeletonAnimation { get; private set; } - [field: SerializeField] - public TycoonSpineController TycoonSpineController { get; private set; } - [field: SerializeField] public TycoonInput TycoonInput { get; private set; } @@ -70,16 +73,14 @@ namespace BlueWater.Players.Tycoons VisualLook = transform.Find("VisualLook"); SkeletonAnimation = VisualLook.GetComponent(); - TycoonSpineController = GetComponent(); TycoonInput = GetComponent(); TycoonMovement = GetComponent(); } private void InitializeChileComponents() { - TycoonSpineController.InitializeComponents(SkeletonAnimation); TycoonInput.InitializeComponents(PlayerInput); - TycoonMovement.InitializeComponents(Rigidbody, VisualLook, TycoonSpineController); + TycoonMovement.InitializeComponents(Rigidbody, VisualLook); } #endregion diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonSpineController.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonSpineController.cs deleted file mode 100644 index 62c6ce9b0..000000000 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonSpineController.cs +++ /dev/null @@ -1,59 +0,0 @@ -using Spine; -using Spine.Unity; -using UnityEngine; - -namespace BlueWater.Players.Tycoons -{ - public enum TycoonSpineAnimationName - { - idle = 0, - run - } - - public class TycoonSpineController : SpineController - { - [SerializeField] - private string _initialSkinName = "01"; - - // Initialize methods - #region Initialize methods - - public override void InitializeComponents(SkeletonAnimation skeletonAnimation) - { - base.InitializeComponents(skeletonAnimation); - - SetSkin(_initialSkinName); - PlayAnimation(TycoonSpineAnimationName.idle.ToString(), true); - } - - #endregion - - protected override void OnAnimationStart(TrackEntry trackEntry) - { - var animationName = trackEntry.Animation.Name; - - if (animationName == TycoonSpineAnimationName.idle.ToString()) - { - } - else if (animationName == TycoonSpineAnimationName.run.ToString()) - { - - } - print($"{animationName} 애니메이션 완료"); - } - - protected override void OnAnimationComplete(TrackEntry trackEntry) - { - var animationName = trackEntry.Animation.Name; - - if (animationName == TycoonSpineAnimationName.idle.ToString()) - { - } - else if (animationName == TycoonSpineAnimationName.run.ToString()) - { - - } - print($"{animationName} 애니메이션 완료"); - } - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonSpineController.cs.meta b/Assets/02.Scripts/Character/Player/Tycoon/TycoonSpineController.cs.meta deleted file mode 100644 index 09f48d8cf..000000000 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonSpineController.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 8130801e9ac84aa0874ac36c80383d9c -timeCreated: 1717669631 \ No newline at end of file diff --git a/Assets/02.Scripts/Character/SpineController.cs b/Assets/02.Scripts/Character/SpineController.cs index 96f8b0e2a..2f343dcd7 100644 --- a/Assets/02.Scripts/Character/SpineController.cs +++ b/Assets/02.Scripts/Character/SpineController.cs @@ -1,32 +1,31 @@ -using System; -using Spine; +using Sirenix.OdinInspector; using Spine.Unity; using UnityEngine; using AnimationState = Spine.AnimationState; namespace BlueWater.Players { - public abstract class SpineController : MonoBehaviour + public class SpineController : MonoBehaviour { // Variables #region Variables - // Components - protected SkeletonAnimation SkeletonAnimation; - protected AnimationState AnimationState; + [SerializeField] + private SkeletonAnimation _skeletonAnimation; + private AnimationState _animationState; + + // Variables + [SerializeField] + private string _initialSkinName; #endregion // Unity events #region Unity events - private void OnDestroy() + private void Awake() { - if (AnimationState != null) - { - AnimationState.Start -= OnAnimationStart; - AnimationState.Complete -= OnAnimationComplete; - } + InitializeComponents(); } #endregion @@ -34,25 +33,12 @@ namespace BlueWater.Players // Initialize methods #region Initialize methods - public virtual void InitializeComponents(SkeletonAnimation skeletonAnimation) + [Button("셋팅 초기화")] + public virtual void InitializeComponents() { - if (skeletonAnimation == null) - { - Debug.LogError("SkeletonAnimation component is null."); - return; - } - - SkeletonAnimation = skeletonAnimation; - AnimationState = SkeletonAnimation.AnimationState; - - if (AnimationState != null) - { - AnimationState.Complete += OnAnimationComplete; - } - else - { - Debug.LogError("AnimationState is not initialized."); - } + _skeletonAnimation = transform.GetComponentInChildren(); + _animationState = _skeletonAnimation.AnimationState; + SetSkin(_initialSkinName); } #endregion @@ -62,7 +48,7 @@ namespace BlueWater.Players public void PlayAnimation(string animationName, bool isLoopActive, float speed = 1f) { - if (SkeletonAnimation == null && AnimationState == null) return; + if (!_skeletonAnimation && _animationState == null) return; if (string.IsNullOrEmpty(animationName)) { @@ -70,13 +56,13 @@ namespace BlueWater.Players return; } - AnimationState.TimeScale = speed; - AnimationState.SetAnimation(0, animationName, isLoopActive); + _animationState.TimeScale = speed; + _animationState.SetAnimation(0, animationName, isLoopActive); } public void SetSkin(string skinName) { - if (SkeletonAnimation == null && AnimationState == null) return; + if (_skeletonAnimation == null && _animationState == null) return; if (string.IsNullOrEmpty(skinName)) { @@ -84,14 +70,11 @@ namespace BlueWater.Players return; } - SkeletonAnimation.Skeleton.SetSkin(skinName); - SkeletonAnimation.Skeleton.SetSlotsToSetupPose(); - AnimationState.Apply(SkeletonAnimation.Skeleton); + _skeletonAnimation.Skeleton.SetSkin(skinName); + _skeletonAnimation.Skeleton.SetSlotsToSetupPose(); + _animationState.Apply(_skeletonAnimation.Skeleton); } - protected abstract void OnAnimationStart(TrackEntry trackEntry); - protected abstract void OnAnimationComplete(TrackEntry trackEntry); - #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/GameManager.cs b/Assets/02.Scripts/GameManager.cs index 92922fff7..f476d2323 100644 --- a/Assets/02.Scripts/GameManager.cs +++ b/Assets/02.Scripts/GameManager.cs @@ -9,6 +9,8 @@ namespace BlueWater // Combat [SerializeField] private GameObject _combatPlayerPrefab; + + [field: SerializeField] public CombatPlayer CurrentCombatPlayer { get; private set; } // Events @@ -20,5 +22,7 @@ namespace BlueWater CurrentCombatPlayer = instantiatePlayer; OnInstantiatePlayer?.Invoke(instantiatePlayer.transform); } + + public void SetCurrentCombatPlayer(CombatPlayer combatPlayer) => CurrentCombatPlayer = combatPlayer; } } \ No newline at end of file diff --git a/Assets/02.Scripts/InputSystem_Actions.inputactions b/Assets/02.Scripts/InputSystem_Actions.inputactions deleted file mode 100644 index f58f34b04..000000000 --- a/Assets/02.Scripts/InputSystem_Actions.inputactions +++ /dev/null @@ -1,1113 +0,0 @@ -{ - "name": "InputSystem_Actions", - "maps": [ - { - "name": "Player", - "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", - "actions": [ - { - "name": "Move", - "type": "Value", - "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Look", - "type": "Value", - "id": "6b444451-8a00-4d00-a97e-f47457f736a8", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Attack", - "type": "Button", - "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Interact", - "type": "Button", - "id": "852140f2-7766-474d-8707-702459ba45f3", - "expectedControlType": "Button", - "processors": "", - "interactions": "Hold", - "initialStateCheck": false - }, - { - "name": "Crouch", - "type": "Button", - "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Jump", - "type": "Button", - "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Previous", - "type": "Button", - "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Next", - "type": "Button", - "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Sprint", - "type": "Button", - "id": "641cd816-40e6-41b4-8c3d-04687c349290", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "WASD", - "id": "00ca640b-d935-4593-8157-c05846ea39b3", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", - "path": "/w", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", - "path": "/s", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", - "path": "/a", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", - "path": "/d", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3ea4d645-4504-4529-b061-ab81934c3752", - "path": "/stick", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", - "path": "/rightStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8c8e490b-c610-4785-884f-f04217b23ca4", - "path": "/delta", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse;Touch", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3e5f5442-8668-4b27-a940-df99bad7e831", - "path": "/{Hatswitch}", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", - "path": "/buttonWest", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", - "path": "/primaryTouch/tap", - "interactions": "", - "processors": "", - "groups": ";Touch", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8255d333-5683-4943-a58a-ccb207ff1dce", - "path": "/{PrimaryAction}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", - "path": "/enter", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", - "path": "/2", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", - "path": "/dpad/right", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "f2e9ba44-c423-42a7-ad56-f20975884794", - "path": "/leftShift", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", - "path": "/leftStickPress", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", - "path": "/buttonSouth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "603f3daf-40bd-4854-8724-93e8017f59e3", - "path": "/secondaryButton", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", - "path": "/1", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", - "path": "/dpad/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", - "path": "/e", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", - "path": "/buttonEast", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", - "path": "/c", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - } - ] - }, - { - "name": "UI", - "id": "272f6d14-89ba-496f-b7ff-215263d3219f", - "actions": [ - { - "name": "Navigate", - "type": "PassThrough", - "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Submit", - "type": "Button", - "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Cancel", - "type": "Button", - "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Point", - "type": "PassThrough", - "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Click", - "type": "PassThrough", - "id": "3c7022bf-7922-4f7c-a998-c437916075ad", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "RightClick", - "type": "PassThrough", - "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "MiddleClick", - "type": "PassThrough", - "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "ScrollWheel", - "type": "PassThrough", - "id": "0489e84a-4833-4c40-bfae-cea84b696689", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDevicePosition", - "type": "PassThrough", - "id": "24908448-c609-4bc3-a128-ea258674378a", - "expectedControlType": "Vector3", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDeviceOrientation", - "type": "PassThrough", - "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", - "expectedControlType": "Quaternion", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "Gamepad", - "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", - "path": "/leftStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", - "path": "/rightStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2db08d65-c5fb-421b-983f-c71163608d67", - "path": "/leftStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "58748904-2ea9-4a80-8579-b500e6a76df8", - "path": "/rightStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", - "path": "/leftStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", - "path": "/rightStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcd248ae-a788-4676-a12e-f4d81205600b", - "path": "/leftStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", - "path": "/rightStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", - "path": "/dpad", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "Joystick", - "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "3db53b26-6601-41be-9887-63ac74e79d19", - "path": "/stick/up", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", - "path": "/stick/down", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", - "path": "/stick/left", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", - "path": "/stick/right", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Keyboard", - "id": "ff527021-f211-4c02-933e-5976594c46ed", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", - "path": "/w", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", - "path": "/s", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "74214943-c580-44e4-98eb-ad7eebe17902", - "path": "/a", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "cea9b045-a000-445b-95b8-0c171af70a3b", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "8607c725-d935-4808-84b1-8354e29bab63", - "path": "/d", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", - "path": "*/{Submit}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Submit", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", - "path": "*/{Cancel}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Cancel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", - "path": "/touch*/position", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", - "path": "/tip", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", - "path": "/touch*/press", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "38c99815-14ea-4617-8627-164d27641299", - "path": "/scroll", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "ScrollWheel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4c191405-5738-4d4b-a523-c6a301dbf754", - "path": "/rightButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "RightClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", - "path": "/middleButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "MiddleClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", - "path": "/devicePosition", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDevicePosition", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", - "path": "/deviceRotation", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDeviceOrientation", - "isComposite": false, - "isPartOfComposite": false - } - ] - }, - { - "name": "Test", - "id": "ce769ac7-480d-41bc-b713-cf63a750c639", - "actions": [ - { - "name": "New action", - "type": "Button", - "id": "2236710f-e3a4-4d53-8403-9447e891ead4", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "", - "id": "6c2113e1-e56c-48ed-a189-a03606741fe1", - "path": "/a", - "interactions": "", - "processors": "", - "groups": "", - "action": "New action", - "isComposite": false, - "isPartOfComposite": false - } - ] - }, - { - "name": "Test2", - "id": "6eed48e7-aef6-4694-aa92-669d0d36afe5", - "actions": [ - { - "name": "S", - "type": "Button", - "id": "49cf2b64-d30e-41bb-a188-86cf2550f538", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "", - "id": "0264a222-b88d-459e-b67a-0ba6195f60c5", - "path": "/s", - "interactions": "", - "processors": "", - "groups": "", - "action": "S", - "isComposite": false, - "isPartOfComposite": false - } - ] - } - ], - "controlSchemes": [ - { - "name": "Keyboard&Mouse", - "bindingGroup": "Keyboard&Mouse", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - }, - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Gamepad", - "bindingGroup": "Gamepad", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Touch", - "bindingGroup": "Touch", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Joystick", - "bindingGroup": "Joystick", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "XR", - "bindingGroup": "XR", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - } - ] -} \ No newline at end of file diff --git a/Assets/02.Scripts/InputSystem_Actions.inputactions.meta b/Assets/02.Scripts/InputSystem_Actions.inputactions.meta deleted file mode 100644 index ffe4c9303..000000000 --- a/Assets/02.Scripts/InputSystem_Actions.inputactions.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 9f38006d23812da49ba6a33f9bc358b9 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} - generateWrapperCode: 0 - wrapperCodePath: - wrapperClassName: - wrapperCodeNamespace: diff --git a/Assets/02.Scripts/Map/BossMapController.cs b/Assets/02.Scripts/Map/BossMapController.cs index 3ab4037aa..5176536a2 100644 --- a/Assets/02.Scripts/Map/BossMapController.cs +++ b/Assets/02.Scripts/Map/BossMapController.cs @@ -55,7 +55,7 @@ namespace BlueWater.Maps yield return null; } - CombatUiManager.Instance.ClearPopupUi.Open(); + CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Map/RhinocerosMapController.cs b/Assets/02.Scripts/Map/RhinocerosMapController.cs index cc3f67ddf..30b343e14 100644 --- a/Assets/02.Scripts/Map/RhinocerosMapController.cs +++ b/Assets/02.Scripts/Map/RhinocerosMapController.cs @@ -38,7 +38,7 @@ namespace BlueWater.Maps yield return null; } - CombatUiManager.Instance.ClearPopupUi.Open(); + CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/NewBlueWater.inputactions b/Assets/02.Scripts/NewBlueWater.inputactions index aae7e8d6f..f76a0a464 100644 --- a/Assets/02.Scripts/NewBlueWater.inputactions +++ b/Assets/02.Scripts/NewBlueWater.inputactions @@ -22,6 +22,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "OpenRestaurantUpgrade", + "type": "Button", + "id": "a0f02877-2c29-4c32-8898-f0074336c625", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -90,14 +99,67 @@ "action": "Interaction", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "dd5f3d27-d927-487a-b704-1612e36734cd", + "path": "/b", + "interactions": "", + "processors": "", + "groups": "", + "action": "OpenRestaurantUpgrade", + "isComposite": false, + "isPartOfComposite": false } ] }, { "name": "TycoonUi", "id": "db82013e-4a4f-4ca3-9bce-d562f1186d92", - "actions": [], - "bindings": [] + "actions": [ + { + "name": "CloseRestaurantUpgrade", + "type": "Button", + "id": "013e4058-f4a2-46fc-b3f7-a7f94a4d4644", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "43781cf6-335d-402e-957c-7a27f3e627b6", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "12f16c66-7177-428e-bfdf-5c0dc59f2eef", + "path": "/b", + "interactions": "", + "processors": "", + "groups": "", + "action": "CloseRestaurantUpgrade", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "a4375f73-1732-4234-9b38-d093eceda9a6", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + } + ] }, { "name": "Combat", diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs b/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs index 36ee51aef..dbc6ae190 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs @@ -44,94 +44,13 @@ namespace BlueWater.Enemies.Bosses.TitanSlime.Skills Utils.StartUniqueCoroutine(this, ref SkillCoroutineInstance, SkillCoroutine(actions)); } - private IEnumerator SkillCoroutine(params Action[] actions) - { - EnableSkill = false; - _titanSlime.StopMove(); - _animationController.SetAnimationParameter("isJumpSlam", true); - _animationController.SetAnimationParameter("idleIndex", 0); - - var animationStarted = false; - yield return StartCoroutine(_animationController.WaitForAnimationToRun("JumpSlam", - success => animationStarted = success)); - - if (!animationStarted) - { - EndSkill(0, actions[0]); - yield break; - } - - _userRigidbody.useGravity = false; - _animationController.SetCurrentAnimationSpeed(_titanSlimeState.AnimationLength); - - var startPosition = SkillUser.transform.position; - var targetPosition = _targetCollider.transform.position; - var targetDistance = Vector3.Distance(targetPosition, startPosition); - var endPosition = targetDistance <= _titanSlimeState.ViewRange - ? CalculateRandomPosition(targetPosition, 1f) - : CalculateRandomPosition(startPosition, 3f); - - transform.position = endPosition + Vector3.up * _colliderRadius; - transform.localScale = Vector3.one * (_colliderRadius * 2f); - - if (_titanSlimeState.HasRabbit) - { - AudioManager.Instance.PlaySfx("JumpSlam"); - } - - var startIndicatorTime = 1 - SkillData.CastingTime; - var fill = 1 / startIndicatorTime; - var isShowingIndicator = false; - while (_animationController.IsComparingCurrentAnimation("JumpSlam") && - _animationController.GetCurrentAnimationNormalizedTime() <= 1f) - { - var normalizedTime = _animationController.GetCurrentAnimationNormalizedTime(); - if (IsUsingIndicator && Indicator) - { - if (startIndicatorTime <= normalizedTime) - { - if (!isShowingIndicator) - { - ShowIndicator(); - isShowingIndicator = true; - } - var fillValue = Indicator.material.GetFloat(_fillHash) + Time.deltaTime * fill; - Indicator.material.SetFloat(_fillHash, fillValue); - } - } - SkillUser.transform.position = Vector3.Lerp(startPosition, endPosition, normalizedTime); - - yield return null; - } - - HideIndicator(); - SkillUser.transform.position = endPosition; - var randomCooldown = Random.Range(_titanSlimeState.RandomCooldown.x, _titanSlimeState.RandomCooldown.y); - - DoAttack(endPosition); - EndSkill(randomCooldown, actions[0]); - } - - private void EndSkill(float cooldown, Action action) - { - Utils.EndUniqueCoroutine(this, ref SkillCoroutineInstance); - - var randomIdleIndex = Random.Range(1, 3); - _animationController.ResetAnimationSpeed(); - _animationController.SetAnimationParameter("idleIndex", randomIdleIndex); - _animationController.SetAnimationParameter("isJumpSlam", false); - _userRigidbody.useGravity = true; - action?.Invoke(); - - Utils.StartUniqueCoroutine(this, ref CooldownCoroutineInstance,Utils.CoolDownCoroutine(cooldown, EndCooldown)); - } - + // 유니티 애니메이션 버전 // private IEnumerator SkillCoroutine(params Action[] actions) // { // EnableSkill = false; - // // _titanSlime.StopMove(); // _animationController.SetAnimationParameter("isJumpSlam", true); + // _animationController.SetAnimationParameter("idleIndex", 0); // // var animationStarted = false; // yield return StartCoroutine(_animationController.WaitForAnimationToRun("JumpSlam", @@ -155,26 +74,33 @@ namespace BlueWater.Enemies.Bosses.TitanSlime.Skills // // transform.position = endPosition + Vector3.up * _colliderRadius; // transform.localScale = Vector3.one * (_colliderRadius * 2f); - // ShowIndicator(); // // if (_titanSlimeState.HasRabbit) // { // AudioManager.Instance.PlaySfx("JumpSlam"); // } // - // var fill = 1 / _titanSlimeState.AnimationLength; + // var startIndicatorTime = 1 - SkillData.CastingTime; + // var fill = 1 / startIndicatorTime; + // var isShowingIndicator = false; // while (_animationController.IsComparingCurrentAnimation("JumpSlam") && // _animationController.GetCurrentAnimationNormalizedTime() <= 1f) // { + // var normalizedTime = _animationController.GetCurrentAnimationNormalizedTime(); // if (IsUsingIndicator && Indicator) // { - // var fillValue = Indicator.material.GetFloat(_fillHash) + Time.deltaTime * fill; - // Indicator.material.SetFloat(_fillHash, fillValue); + // if (startIndicatorTime <= normalizedTime) + // { + // if (!isShowingIndicator) + // { + // ShowIndicator(); + // isShowingIndicator = true; + // } + // var fillValue = Indicator.material.GetFloat(_fillHash) + Time.deltaTime * fill; + // Indicator.material.SetFloat(_fillHash, fillValue); + // } // } - // var normalizedTime = _animationController.GetCurrentAnimationNormalizedTime(); - // var horizontalPosition = Vector3.Lerp(startPosition, endPosition, normalizedTime); - // var heightFactor = Mathf.Sin(Mathf.PI * normalizedTime); - // SkillUser.transform.position = new Vector3(horizontalPosition.x, startPosition.y + heightFactor * _jumpSlamData.JumpHeight, horizontalPosition.z); + // SkillUser.transform.position = Vector3.Lerp(startPosition, endPosition, normalizedTime); // // yield return null; // } @@ -190,14 +116,91 @@ namespace BlueWater.Enemies.Bosses.TitanSlime.Skills // private void EndSkill(float cooldown, Action action) // { // Utils.EndUniqueCoroutine(this, ref SkillCoroutineInstance); - // + // + // var randomIdleIndex = Random.Range(1, 3); // _animationController.ResetAnimationSpeed(); + // _animationController.SetAnimationParameter("idleIndex", randomIdleIndex); // _animationController.SetAnimationParameter("isJumpSlam", false); // _userRigidbody.useGravity = true; // action?.Invoke(); // // Utils.StartUniqueCoroutine(this, ref CooldownCoroutineInstance,Utils.CoolDownCoroutine(cooldown, EndCooldown)); // } + + private IEnumerator SkillCoroutine(params Action[] actions) + { + EnableSkill = false; + + _titanSlime.StopMove(); + _animationController.SetAnimationParameter("isJumpSlam", true); + + var animationStarted = false; + yield return StartCoroutine(_animationController.WaitForAnimationToRun("JumpSlam", + success => animationStarted = success)); + + if (!animationStarted) + { + EndSkill(0, actions[0]); + yield break; + } + + _userRigidbody.useGravity = false; + _animationController.SetCurrentAnimationSpeed(_titanSlimeState.AnimationLength); + + var startPosition = SkillUser.transform.position; + var targetPosition = _targetCollider.transform.position; + var targetDistance = Vector3.Distance(targetPosition, startPosition); + var endPosition = targetDistance <= _titanSlimeState.ViewRange + ? CalculateRandomPosition(targetPosition, 1f) + : CalculateRandomPosition(startPosition, 3f); + + transform.position = endPosition + Vector3.up * _colliderRadius; + transform.localScale = Vector3.one * (_colliderRadius * 2f); + ShowIndicator(); + + if (_titanSlimeState.HasRabbit) + { + AudioManager.Instance.PlaySfx("JumpSlam"); + } + + var fill = 1 / _titanSlimeState.AnimationLength; + while (_animationController.IsComparingCurrentAnimation("JumpSlam") && + _animationController.GetCurrentAnimationNormalizedTime() <= 1f) + { + if (IsUsingIndicator && Indicator) + { + var fillValue = Indicator.material.GetFloat(_fillHash) + Time.deltaTime * fill; + Indicator.material.SetFloat(_fillHash, fillValue); + } + var normalizedTime = _animationController.GetCurrentAnimationNormalizedTime(); + var horizontalPosition = Vector3.Lerp(startPosition, endPosition, normalizedTime); + var heightFactor = Mathf.Sin(Mathf.PI * normalizedTime); + SkillUser.transform.position = new Vector3(horizontalPosition.x, startPosition.y + heightFactor * _jumpSlamData.JumpHeight, horizontalPosition.z); + + yield return null; + } + + HideIndicator(); + SkillUser.transform.position = endPosition; + var randomCooldown = Random.Range(_titanSlimeState.RandomCooldown.x, _titanSlimeState.RandomCooldown.y); + + DoAttack(endPosition); + EndSkill(randomCooldown, actions[0]); + } + + private void EndSkill(float cooldown, Action action) + { + Utils.EndUniqueCoroutine(this, ref SkillCoroutineInstance); + + var randomIdleIndex = Random.Range(1, 3); + _animationController.ResetAnimationSpeed(); + _animationController.SetAnimationParameter("isJumpSlam", false); + _animationController.SetAnimationParameter("idleIndex", randomIdleIndex); + _userRigidbody.useGravity = true; + action?.Invoke(); + + Utils.StartUniqueCoroutine(this, ref CooldownCoroutineInstance,Utils.CoolDownCoroutine(cooldown, EndCooldown)); + } private Vector3 CalculateRandomPosition(Vector3 startPosition, float range, int iterationCount = 100) { diff --git a/Assets/02.Scripts/Ui/Combat.meta b/Assets/02.Scripts/Ui/Combat.meta new file mode 100644 index 000000000..cbf9af323 --- /dev/null +++ b/Assets/02.Scripts/Ui/Combat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15143ab5457ee574b9f47662ef9c065b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Ui/ClearPopupUi.cs b/Assets/02.Scripts/Ui/Combat/ClearPopupUi.cs similarity index 88% rename from Assets/02.Scripts/Ui/ClearPopupUi.cs rename to Assets/02.Scripts/Ui/Combat/ClearPopupUi.cs index 4ec7126ed..f0893e8a1 100644 --- a/Assets/02.Scripts/Ui/ClearPopupUi.cs +++ b/Assets/02.Scripts/Ui/Combat/ClearPopupUi.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.UI; @@ -16,20 +17,19 @@ namespace BlueWater.Uis _moveNextStageButton = transform.Find("ClearPanel/Popup Base - Concave/Bottom/Background/Border/MoveNextStageButton").GetComponent