From 7848033d4ecac327337f149b04b7a61ca9268eb7 Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Mon, 2 Dec 2024 10:48:44 +0900 Subject: [PATCH] 0.3.5.3 --- Assets/01.Scenes/00.TycoonTitle.unity | 388 ------------------ Assets/01.Scenes/01.Tycoon.unity | 61 +-- .../Player/Tycoon/State/WalkingState.cs | 5 +- .../Character/Player/Tycoon/TycoonPlayer.cs | 4 - Assets/02.Scripts/Ui/Title/TitleMenuButton.cs | 2 - Assets/02.Scripts/Ui/Tycoon/ManualBook.cs | 52 ++- .../Ui/Tycoon/ManualCocktailButton.cs | 29 +- .../02.Scripts/Ui/UiNavigationController.cs | 20 +- .../Uis/Tycoons/ManualCocktailButton.prefab | 2 +- .../Uis/Tycoons/TycoonGameMenuCanvas.prefab | 350 +--------------- .../Uis/Tycoons/TycoonTitleMenuCanvas.prefab | 15 +- .../08.Spines/Props/Barrel/Barrel.skel.bytes | Bin 10845 -> 10845 bytes ProjectSettings/ProjectSettings.asset | 2 +- 13 files changed, 128 insertions(+), 802 deletions(-) diff --git a/Assets/01.Scenes/00.TycoonTitle.unity b/Assets/01.Scenes/00.TycoonTitle.unity index 71e8115f7..5faf09066 100644 --- a/Assets/01.Scenes/00.TycoonTitle.unity +++ b/Assets/01.Scenes/00.TycoonTitle.unity @@ -947,38 +947,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 414015556802972880, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 414015556802972880, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 414015556802972880, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 414015556802972880, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 619693787478732481, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 619693787478732481, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 619693787478732481, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 619693787478732481, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -999,42 +967,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1062717157444337255, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1062717157444337255, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403243596108480373, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2905220476270864484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2905220476270864484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2905220476270864484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3190523722978597758, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3190523722978597758, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3190523722978597758, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1047,94 +979,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 83.71 objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: -350 objectReference: {fileID: 0} - - target: {fileID: 3949558785420068140, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3976132546625396958, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3976132546625396958, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4377787824645787692, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 0} - - target: {fileID: 4377787824645787692, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 2100000, guid: 70c1574509f3bc04bb6f811623df1337, type: 2} - - target: {fileID: 4635808483248703528, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4635808483248703528, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4635808483248703528, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalRotation.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4635808483248703528, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 4984930952009746258, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984930952009746258, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984930952009746258, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984930952009746258, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984930952009746258, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984930952009746258, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984930952009746258, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5158912342465005183, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5158912342465005183, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1147,38 +995,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 83.71 objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: -230 objectReference: {fileID: 0} - - target: {fileID: 5833474583663148126, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5833474583663148126, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5833474583663148126, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5833474583663148126, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1199,34 +1019,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6309230753613603339, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6309230753613603339, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6309230753613603339, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 69.93 - objectReference: {fileID: 0} - - target: {fileID: 6309230753613603339, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6309230753613603339, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6309230753613603339, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 139.965 - objectReference: {fileID: 0} - - target: {fileID: 6309230753613603339, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -35 - objectReference: {fileID: 0} - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1247,22 +1039,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6624411944421273614, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6624411944421273614, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6624411944421273614, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6624411944421273614, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6831127385420350041, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_Pivot.x value: 0 @@ -1343,134 +1119,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7085575044169867593, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7085575044169867593, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7085575044169867593, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7085575044169867593, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7087117506530896820, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7087117506530896820, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7087117506530896820, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7087117506530896820, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7328279461098451069, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: -1150 - objectReference: {fileID: 0} - - target: {fileID: 7328279461098451069, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 475 - objectReference: {fileID: 0} - - target: {fileID: 7388583262446243055, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7388583262446243055, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7388583262446243055, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7388583262446243055, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7906113444432610149, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_Name value: TycoonTitleMenuCanvas objectReference: {fileID: 0} - - target: {fileID: 7963781726362109484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7963781726362109484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7963781726362109484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7963781726362109484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8213377428064630546, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8213377428064630546, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8219080425603903001, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8219080425603903001, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8295424553003569527, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8295424553003569527, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8295424553003569527, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8295424553003569527, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1483,50 +1135,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 179.24 objectReference: {fileID: 0} - - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: -110 objectReference: {fileID: 0} - - target: {fileID: 8855145811590553786, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8855145811590553786, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 96818d1cf..125a0e104 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -1912,7 +1912,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 128638924} - - component: {fileID: 128638925} m_Layer: 5 m_Name: Bills m_TagString: Untagged @@ -1939,20 +1938,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &128638925 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 128638923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: {x: 0, y: 0, z: 0, w: 0} - m_Softness: {x: 0, y: 0} --- !u!1 &130732687 GameObject: m_ObjectHideFlags: 0 @@ -6617,7 +6602,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: -440 + value: -470 objectReference: {fileID: 0} - target: {fileID: 2274939110991519697, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -6805,7 +6790,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: -80 + value: -110 objectReference: {fileID: 0} - target: {fileID: 6023463152304223989, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -6817,7 +6802,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6023463152304223989, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_SizeDelta.x - value: 83.71 + value: 179.24 objectReference: {fileID: 0} - target: {fileID: 6023463152304223989, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x @@ -6829,7 +6814,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6023463152304223989, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: -320 + value: -350 objectReference: {fileID: 0} - target: {fileID: 6433972966224036356, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -6863,10 +6848,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6969078092465568847, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_ScreenMatchMode - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -6889,7 +6870,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: -200 + value: -230 objectReference: {fileID: 0} - target: {fileID: 7899277849006502468, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -13484,7 +13465,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -17967,7 +17948,6 @@ GameObject: - component: {fileID: 1434161267} - component: {fileID: 1434161269} - component: {fileID: 1434161268} - - component: {fileID: 1434161270} m_Layer: 0 m_Name: Chain m_TagString: Untagged @@ -18067,20 +18047,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1434161266} m_CullTransparentMesh: 0 ---- !u!114 &1434161270 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1434161266} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: {x: -180, y: 0, z: 60, w: 70} - m_Softness: {x: 0, y: 0} --- !u!1 &1434358734 GameObject: m_ObjectHideFlags: 0 @@ -21870,6 +21836,7 @@ GameObject: m_Component: - component: {fileID: 1701833860} - component: {fileID: 1701833861} + - component: {fileID: 1701833862} m_Layer: 5 m_Name: ManualBook m_TagString: Untagged @@ -21921,6 +21888,20 @@ MonoBehaviour: slot03: {fileID: 1644662220} ratioRange: {fileID: 1599866060} _manualSfxName: ManualBook + _uiNavigationController: {fileID: 1701833862} +--- !u!114 &1701833862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1701833859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44fd527766f4ac945ad8aaa085cb1932, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 0} --- !u!1 &1702222116 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Character/Player/Tycoon/State/WalkingState.cs b/Assets/02.Scripts/Character/Player/Tycoon/State/WalkingState.cs index 2bed0d1f8..0528c42af 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/State/WalkingState.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/State/WalkingState.cs @@ -9,7 +9,10 @@ namespace BlueWater.Players.Tycoons public void EnterState(TycoonPlayer character) { _previousIsPickedUpAnything = character.TycoonPickupHandler.IsPickedUpAnything(); - character.SpineController.PlayAnimation(_previousIsPickedUpAnything ? TycoonPlayerSpineAnimation.Serving : TycoonPlayerSpineAnimation.Walking, true); + float animationSpeed = character.TycoonMovement.MoveSpeed / 3f; + character.SpineController.PlayAnimation(_previousIsPickedUpAnything ? + TycoonPlayerSpineAnimation.Serving : TycoonPlayerSpineAnimation.Walking, + true, speed:animationSpeed); } public void UpdateState(TycoonPlayer character) diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index d6fc067b2..9ca8204cd 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -37,9 +37,6 @@ namespace BlueWater.Players.Tycoons [field: SerializeField] public CapsuleCollider CharacterCollider { get; private set; } - [field: SerializeField] - public PlayerInput PlayerInput { get; private set; } - [field: SerializeField] public Transform VisualLook { get; private set; } @@ -148,7 +145,6 @@ namespace BlueWater.Players.Tycoons { Rigidbody = GetComponent(); CharacterCollider = GetComponent(); - PlayerInput = GetComponent(); VisualLook = transform.Find("VisualLook"); SkeletonAnimation = VisualLook.GetComponent(); InteractionCanvas = transform.GetComponentInChildren(); diff --git a/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs b/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs index 07d585da0..7ba7bff26 100644 --- a/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs +++ b/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs @@ -1,5 +1,3 @@ -using System; -using BlueWater.Tycoons; using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.EventSystems; diff --git a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs index 9f6822253..c53f1aae7 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs @@ -7,6 +7,7 @@ using BlueWater.Tycoons; using BlueWater.Utility; using TMPro; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.Localization; using UnityEngine.Localization.Settings; @@ -50,6 +51,9 @@ namespace BlueWater.Uis [SerializeField] private string _manualSfxName = "ManualBook"; + [SerializeField] + private UiNavigationController _uiNavigationController; + private List _button; private Coroutine _changedLocaleInstance; private ManualCocktailButton _selectedManualCocktailButton; @@ -77,7 +81,7 @@ namespace BlueWater.Uis if (element.Idx.Equals("Cocktail000")) continue; //쓰레기는 메뉴얼에 표시하지 않기 var cocktail = Instantiate(manualCocktailsPrefabs, _cocktailButtons); - cocktail.Initialize(this); + cocktail.AddSelectedAction(SelectedItem); cocktail.name = element.Idx; cocktail.SetImage(element.Sprite); _button.Add(cocktail); @@ -136,6 +140,9 @@ namespace BlueWater.Uis } _button = _button.OrderBy(c => c.transform.localScale.z).ToList(); + SetNavigation(); + _uiNavigationController.SetSelectObject(_button[0].gameObject); + EventSystem.current.SetSelectedGameObject(_uiNavigationController.SelectObject); for (int i = 0; i < _button.Count; i++) { @@ -144,7 +151,6 @@ namespace BlueWater.Uis } Update_Cocktails(); - SelectedItem(_button[0]); EventManager.OnLevelUp += UpdateManualBook; LocalizationSettings.SelectedLocaleChanged += OnChangedLocale; @@ -191,6 +197,7 @@ namespace BlueWater.Uis _panel.SetActive(true); IsOpened = true; AudioManager.Instance.PlaySfx(_manualSfxName, ignoreTimeScale: true); + EventSystem.current.SetSelectedGameObject(_uiNavigationController.SelectObject); } public void OnClose(InputAction.CallbackContext context) @@ -212,10 +219,12 @@ namespace BlueWater.Uis { _pressQAction.performed += OnClose; _cancelAction.performed += OnClose; + _uiNavigationController.Enable(); } public override void DisableInput() { + _uiNavigationController.Disable(); _pressQAction.performed -= OnClose; _cancelAction.performed -= OnClose; } @@ -225,6 +234,44 @@ namespace BlueWater.Uis _openManualKeyText.text = bindingKey; } + private void SetNavigation() + { + int maxRow = 4; + + for (int i = 0; i < _button.Count; i++) + { + Navigation navigation = _button[i].Button.navigation; + navigation.mode = Navigation.Mode.Explicit; + + // 좌측 네비게이션 설정 + if (i % maxRow != 0) + { + navigation.selectOnLeft = _button[i - 1].Button; + } + + // 우측 네비게이션 설정 + if ((i + 1) % maxRow != 0 && (i + 1) < _button.Count) + { + navigation.selectOnRight = _button[i + 1].Button; + } + + // 위쪽 네비게이션 설정 + if (i - maxRow >= 0) + { + navigation.selectOnUp = _button[i - maxRow].Button; + } + + // 아래쪽 네비게이션 설정 + if (i + maxRow < _button.Count) + { + navigation.selectOnDown = _button[i + maxRow].Button; + } + + // 설정된 네비게이션을 버튼에 적용 + _button[i].Button.navigation = navigation; + } + } + private void Update_Cocktails() //해금된 칵테일의 활성 표시 유무 { int playerLv = TycoonManager.Instance.TycoonStatus.CurrentLevel; @@ -294,6 +341,7 @@ namespace BlueWater.Uis public void SelectedItem(ManualCocktailButton clickedButton) { _selectedManualCocktailButton = clickedButton; + _uiNavigationController.SetSelectObject(_selectedManualCocktailButton.gameObject); //if (clickedButton.GetComponent().material == null) //활성화 된 음료만 클릭이 되도록 한다. if (true) // 테스트용 { diff --git a/Assets/02.Scripts/Ui/Tycoon/ManualCocktailButton.cs b/Assets/02.Scripts/Ui/Tycoon/ManualCocktailButton.cs index 970baf045..42955500b 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ManualCocktailButton.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ManualCocktailButton.cs @@ -1,33 +1,36 @@ +using System; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.UI; namespace BlueWater.Uis { - public class ManualCocktailButton : MonoBehaviour + public class ManualCocktailButton : MonoBehaviour, ISelectHandler { [field: SerializeField] public Image Image { get; private set; } - - public ManualBook manual; // 다른 스크립트가 붙은 오브젝트를 참조 (에디터에서 설정 가능) - private Button button; + + [field: SerializeField] + public Button Button { get; private set; } - void Start() + private Action _onSelectedAction; + private ManualBook _manual; // 다른 스크립트가 붙은 오브젝트를 참조 (에디터에서 설정 가능) + + private void OnDestroy() { - button = GetComponent