From e4a06b8475eaf127985506951319537dbf0ea321 Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Thu, 19 Dec 2024 01:00:39 +0900 Subject: [PATCH] 0.3.5.20 --- Assets/01.Scenes/00.TycoonTitle.unity | 157 ++++----- Assets/01.Scenes/01.Tycoon.unity | 258 +++++--------- Assets/02.Scripts/Tycoon/LiquidController.cs | 8 +- Assets/02.Scripts/Ui/Popup.meta | 8 + .../02.Scripts/Ui/{ => Popup}/MenuPopupUi.cs | 0 .../Ui/{ => Popup}/MenuPopupUi.cs.meta | 0 Assets/02.Scripts/Ui/Popup/PausePopupUi.cs | 47 +++ .../02.Scripts/Ui/Popup/PausePopupUi.cs.meta | 2 + Assets/02.Scripts/Ui/{ => Popup}/PopupUi.cs | 5 +- .../02.Scripts/Ui/{ => Popup}/PopupUi.cs.meta | 0 .../Ui/{ => Popup}/PopupUiController.cs | 15 + .../Ui/{ => Popup}/PopupUiController.cs.meta | 0 .../Ui/{ => Popup}/SwitchActionPopupUi.cs | 0 .../{ => Popup}/SwitchActionPopupUi.cs.meta | 0 .../Ui/{ => Popup}/TutorialPopupUi.cs | 0 .../Ui/{ => Popup}/TutorialPopupUi.cs.meta | 0 Assets/02.Scripts/Ui/Title/TitleOptions.cs | 6 +- Assets/02.Scripts/Ui/Title/TitleQuitUi.cs | 18 +- Assets/02.Scripts/Ui/Title/TycoonTitle.cs | 68 ++-- Assets/02.Scripts/Ui/Tycoon/ManualBook.cs | 25 +- .../Ui/Tycoon/TutorialPageToggle.cs | 5 + .../Ui/Tycoon/TycoonRareRewardBoxUi.cs | 25 +- Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs | 7 +- .../02.Scripts/Ui/Tycoon/TycoonSelectCard.cs | 25 +- .../02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs | 22 +- Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs | 89 +++-- .../Ui/Tycoon/TycoonTutorialPopupUi.cs | 57 ++- Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs | 12 +- Assets/02.Scripts/Ui/UiEventsController.cs | 2 +- .../Ui/Balloon/BartenderBalloonEmpty.png | Bin 0 -> 15024 bytes .../Ui/Balloon/BartenderBalloonEmpty.png.meta | 169 +++++++++ .../Ui/Balloon/BartenderBalloonFilled.png | Bin 0 -> 5087 bytes .../Balloon/BartenderBalloonFilled.png.meta | 169 +++++++++ .../CenterBalloon01.png} | Bin .../CenterBalloon01.png.meta} | 0 .../03.Images/Ui/Balloon/CenterBalloon02.png | Bin 0 -> 44853 bytes .../Ui/Balloon/CenterBalloon02.png.meta | 192 ++++++++++ ...{PlayerBalloon.png => PlayerBalloon01.png} | Bin ...loon.png.meta => PlayerBalloon01.png.meta} | 0 .../03.Images/Ui/Balloon/PlayerBalloon02.png | Bin 0 -> 13759 bytes .../Ui/Balloon/PlayerBalloon02.png.meta | 169 +++++++++ .../Ui/Balloon/PlayerBalloonDouble.png | Bin 0 -> 4208 bytes .../Ui/Balloon/PlayerBalloonDouble.png.meta | 169 +++++++++ .../Npcs/Crews/BartenderCrew.prefab | 51 ++- .../Characters/Players/TycoonPlayer.prefab | 39 ++- .../Maps/Tycoon/NewTycoonMap.prefab | 330 +++++++++++++++++- .../Props/Environment/Tycoon/Barrel.prefab | 4 +- .../Props/Environment/Tycoon/Barrel01.prefab | 4 +- .../Interactions/BartenderTable.prefab | 7 +- .../BaseInteractionFurniture.prefab | 4 +- .../Interactions/LimeTreeGarnish.prefab | 2 +- .../Interactions/LiquidStatue.prefab | 2 +- .../Uis/Tycoons/TycoonGameMenuCanvas.prefab | 100 ++---- .../Uis/Tycoons/TycoonTitleMenuCanvas.prefab | 82 ++--- .../Uis/Tycoons/TycoonTutorialPopupUi.prefab | 244 +++++++++++++ .../AddressableAssetSettings.asset | 2 +- .../google-services-desktop.json.meta | 2 +- ProjectSettings/ProjectSettings.asset | 2 +- 58 files changed, 2020 insertions(+), 584 deletions(-) create mode 100644 Assets/02.Scripts/Ui/Popup.meta rename Assets/02.Scripts/Ui/{ => Popup}/MenuPopupUi.cs (100%) rename Assets/02.Scripts/Ui/{ => Popup}/MenuPopupUi.cs.meta (100%) create mode 100644 Assets/02.Scripts/Ui/Popup/PausePopupUi.cs create mode 100644 Assets/02.Scripts/Ui/Popup/PausePopupUi.cs.meta rename Assets/02.Scripts/Ui/{ => Popup}/PopupUi.cs (76%) rename Assets/02.Scripts/Ui/{ => Popup}/PopupUi.cs.meta (100%) rename Assets/02.Scripts/Ui/{ => Popup}/PopupUiController.cs (80%) rename Assets/02.Scripts/Ui/{ => Popup}/PopupUiController.cs.meta (100%) rename Assets/02.Scripts/Ui/{ => Popup}/SwitchActionPopupUi.cs (100%) rename Assets/02.Scripts/Ui/{ => Popup}/SwitchActionPopupUi.cs.meta (100%) rename Assets/02.Scripts/Ui/{ => Popup}/TutorialPopupUi.cs (100%) rename Assets/02.Scripts/Ui/{ => Popup}/TutorialPopupUi.cs.meta (100%) create mode 100644 Assets/03.Images/Ui/Balloon/BartenderBalloonEmpty.png create mode 100644 Assets/03.Images/Ui/Balloon/BartenderBalloonEmpty.png.meta create mode 100644 Assets/03.Images/Ui/Balloon/BartenderBalloonFilled.png create mode 100644 Assets/03.Images/Ui/Balloon/BartenderBalloonFilled.png.meta rename Assets/03.Images/Ui/{Tycoon/CenterBalloon.png => Balloon/CenterBalloon01.png} (100%) rename Assets/03.Images/Ui/{Tycoon/CenterBalloon.png.meta => Balloon/CenterBalloon01.png.meta} (100%) create mode 100644 Assets/03.Images/Ui/Balloon/CenterBalloon02.png create mode 100644 Assets/03.Images/Ui/Balloon/CenterBalloon02.png.meta rename Assets/03.Images/Ui/Balloon/{PlayerBalloon.png => PlayerBalloon01.png} (100%) rename Assets/03.Images/Ui/Balloon/{PlayerBalloon.png.meta => PlayerBalloon01.png.meta} (100%) create mode 100644 Assets/03.Images/Ui/Balloon/PlayerBalloon02.png create mode 100644 Assets/03.Images/Ui/Balloon/PlayerBalloon02.png.meta create mode 100644 Assets/03.Images/Ui/Balloon/PlayerBalloonDouble.png create mode 100644 Assets/03.Images/Ui/Balloon/PlayerBalloonDouble.png.meta diff --git a/Assets/01.Scenes/00.TycoonTitle.unity b/Assets/01.Scenes/00.TycoonTitle.unity index db271ef8d..125f758e2 100644 --- a/Assets/01.Scenes/00.TycoonTitle.unity +++ b/Assets/01.Scenes/00.TycoonTitle.unity @@ -193,11 +193,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} m_PrefabInstance: {fileID: 380257611} m_PrefabAsset: {fileID: 0} ---- !u!1 &70018140 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8454452712375467706, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - m_PrefabInstance: {fileID: 8401317452346303361} - m_PrefabAsset: {fileID: 0} --- !u!1001 &82041030 PrefabInstance: m_ObjectHideFlags: 0 @@ -286,6 +281,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2961986041977982893, guid: b692f61d994a0b94cb92cf0f2d47cfb2, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2961986041977982893, guid: b692f61d994a0b94cb92cf0f2d47cfb2, type: 3} propertyPath: _animationName value: ServingIdle @@ -787,6 +786,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2961986041977982893, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2961986041977982893, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: _animationName value: Idle @@ -1540,6 +1543,10 @@ PrefabInstance: propertyPath: showBehaviorDesignerGizmo value: 0 objectReference: {fileID: 0} + - target: {fileID: 2961986041977982893, guid: b692f61d994a0b94cb92cf0f2d47cfb2, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2961986041977982893, guid: b692f61d994a0b94cb92cf0f2d47cfb2, type: 3} propertyPath: _animationName value: ServingIdle @@ -1872,6 +1879,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2961986041977982893, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2961986041977982893, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: _animationName value: BeerMaker @@ -2063,6 +2074,10 @@ PrefabInstance: propertyPath: showBehaviorDesignerGizmo value: 0 objectReference: {fileID: 0} + - target: {fileID: 2961986041977982893, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2961986041977982893, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: _animationName value: CleaningFloor @@ -2156,7 +2171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 70018140} + m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 --- !u!4 &1196361500 @@ -2483,6 +2498,10 @@ PrefabInstance: propertyPath: showBehaviorDesignerGizmo value: 0 objectReference: {fileID: 0} + - target: {fileID: 2961986041977982893, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2961986041977982893, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: _animationName value: CleaningFloor @@ -3413,6 +3432,10 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: -7.738 objectReference: {fileID: 0} + - target: {fileID: 6676830407805896126, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6679305863409353257, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Mesh value: @@ -4031,6 +4054,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2961986041977982893, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2961986041977982893, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: _animationName value: CleaningFloor @@ -4137,6 +4164,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2961986041977982893, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2961986041977982893, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: _animationName value: CleaningTable @@ -4313,6 +4344,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2961986041977982893, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} + propertyPath: unscaledTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2961986041977982893, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: _animationName value: BeerMaker @@ -4465,6 +4500,14 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: 0 @@ -4497,34 +4540,14 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x - value: 172.95 - objectReference: {fileID: 0} - - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 263.525 - objectReference: {fileID: 0} - - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -220 - objectReference: {fileID: 0} - target: {fileID: 1378315412234784032, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -4765,34 +4788,14 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x - value: 81.9 - 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: 309.05 - objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -440 - objectReference: {fileID: 0} - target: {fileID: 3888891624253089110, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -5005,34 +5008,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x - value: 81 - 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: 309.5 - objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -330 - objectReference: {fileID: 0} - target: {fileID: 5720963034508307960, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -5077,6 +5060,14 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: 0 @@ -5165,6 +5156,14 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: 0 @@ -5305,6 +5304,14 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7292443971921784066, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7292443971921784066, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7292443971921784066, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: 0 @@ -5469,17 +5476,9 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x - value: 172.95 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_LocalPosition.x @@ -5489,14 +5488,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 263.525 - objectReference: {fileID: 0} - - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -110 - objectReference: {fileID: 0} - target: {fileID: 8821734039056801808, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 13bf7b560..048cce8ac 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -202,7 +202,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 3.45 + m_fontSize: 4 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -480,11 +480,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -195 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -3938,11 +3938,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -95 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -6079,6 +6079,7 @@ MonoBehaviour: _openSfxName: OpenRareRewardBox _cardOpenSfxName: RareCardOpen _cardOpenAllSfxName: SelectCard + _uiEventsController: {fileID: 392193688} --- !u!114 &392193688 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8827,11 +8828,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -9094,14 +9095,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_SizeDelta.x value: 83.71 @@ -9114,14 +9107,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 308.145 - objectReference: {fileID: 0} - - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: -550 - objectReference: {fileID: 0} - target: {fileID: 2274939110991519697, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -9178,21 +9163,17 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 3452187879713479394, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3452187879713479394, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y value: -30 objectReference: {fileID: 0} - - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_SizeDelta.x - value: 172.95 + value: 210 objectReference: {fileID: 0} - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x @@ -9202,14 +9183,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 263.525 - objectReference: {fileID: 0} - - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: -220 - objectReference: {fileID: 0} - target: {fileID: 4974788024565528179, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_Name value: TycoonGameMenuCanvas @@ -9223,36 +9196,12 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 5585061895982209044, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: -30 - objectReference: {fileID: 0} - - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_SizeDelta.x - value: 179.24 - objectReference: {fileID: 0} - - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 260.38 - objectReference: {fileID: 0} - - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 5585061895982209044, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: -110 + value: -30 objectReference: {fileID: 0} - target: {fileID: 6023463152304223989, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -9302,14 +9251,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -720 objectReference: {fileID: 0} - - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_SizeDelta.x value: 83.71 @@ -9322,22 +9263,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 308.145 - objectReference: {fileID: 0} - - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: -330 - objectReference: {fileID: 0} - - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_SizeDelta.x value: 81 @@ -9350,14 +9275,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 309.5 - objectReference: {fileID: 0} - - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: -440 - objectReference: {fileID: 0} - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -9366,18 +9283,14 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y value: -30 objectReference: {fileID: 0} - - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_SizeDelta.x value: 172.95 @@ -9390,14 +9303,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 263.525 - objectReference: {fileID: 0} - - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: -110 - objectReference: {fileID: 0} - target: {fileID: 8446992353823355261, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -9406,6 +9311,10 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 8446992353823355261, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8446992353823355261, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y value: -30 @@ -9498,6 +9407,10 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y value: -30 @@ -9829,11 +9742,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 105 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -10383,7 +10296,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 30, y: 20} - m_SizeDelta: {x: 107.83, y: 30} + m_SizeDelta: {x: 107.82, y: 30} m_Pivot: {x: 0, y: 0} --- !u!114 &587565436 MonoBehaviour: @@ -11514,8 +11427,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 53.915, y: -15} - m_SizeDelta: {x: 107.83, y: 30} + m_AnchoredPosition: {x: 53.91, y: -15} + m_SizeDelta: {x: 107.82, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &669977907 MonoBehaviour: @@ -12259,7 +12172,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 110 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y @@ -12323,11 +12236,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -79.025 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x @@ -12351,11 +12264,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -44.025 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x @@ -12375,7 +12288,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7479254977802555519, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -5 objectReference: {fileID: 0} - target: {fileID: 8430066422040837593, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_IsActive @@ -12980,11 +12893,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -95 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -13112,6 +13025,7 @@ MonoBehaviour: _duration: 0.3 _punchPosition: {x: 10, y: 0, z: 0} _endGold: 0 + _uiEventsController: {fileID: 784951364} --- !u!114 &784951364 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15017,11 +14931,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -15780,7 +15694,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 11.5} + m_AnchoredPosition: {x: 0, y: 13} m_SizeDelta: {x: 0, y: 10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &963867004 @@ -16034,11 +15948,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 205 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -16414,17 +16328,17 @@ MonoBehaviour: _liquidsPerSecond: 100 _colorLerpSpeed: 0.5 _colorIntensity: 2 - _reachedLerpPosition: {x: -10.5, y: 4} + _reachedLerpPosition: {x: -7.5, y: 7} _objectPoolCount: 1000 - _centerBalloonImage: {fileID: 21300000, guid: 140fdbe02cd90bf47994129e6be6bafe, type: 3} - _playerBalloonImage: {fileID: 21300000, guid: e7b746bc5bff9d64fb1129b9aa8ccf3e, type: 3} + _centerBalloonImage: {fileID: 214549948, guid: a4ceb21a4bb164243942d27a07ddb8f7, type: 3} + _playerBalloonImage: {fileID: 21300000, guid: 02b5b12337a382b4696d9caf082621f4, type: 3} _moveToPlayerDuration: 0.2 _moveToCenterDuration: 0.15 _centerPosition: {x: -340, y: 0, z: 0} _endPositionOffset: {x: 0, y: 0.1, z: 0} _endScale: {x: 0.3, y: 0.3, z: 0.3} - _cameraDistance: {x: 5, y: 15} - _offsetY: {x: 20, y: 15} + _cameraDistance: {x: 1, y: 15} + _offsetY: {x: 35, y: 5} --- !u!1001 &1008526203 PrefabInstance: m_ObjectHideFlags: 0 @@ -16635,6 +16549,7 @@ MonoBehaviour: _panel: {fileID: 1232014580} _contents: {fileID: 1920312147} _openSfxName: OpenNormalRewardBox + _uiEventsController: {fileID: 1024788554} --- !u!1 &1030267970 GameObject: m_ObjectHideFlags: 0 @@ -18558,11 +18473,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -18755,8 +18670,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 140fdbe02cd90bf47994129e6be6bafe, type: 3} - m_Type: 1 + m_Sprite: {fileID: 214549948, guid: a4ceb21a4bb164243942d27a07ddb8f7, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -18923,11 +18838,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1177229261} m_CullTransparentMesh: 1 ---- !u!1 &1184003924 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6766070068783270828, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - m_PrefabInstance: {fileID: 532586499} - m_PrefabAsset: {fileID: 0} --- !u!1 &1185670928 GameObject: m_ObjectHideFlags: 0 @@ -20497,11 +20407,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -95 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -20591,7 +20501,7 @@ Transform: m_GameObject: {fileID: 1321215892} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 2, z: 0} + m_LocalPosition: {x: 0, y: 5, z: 0} m_LocalScale: {x: 25, y: 25, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -24426,8 +24336,8 @@ RectTransform: 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: -5} - m_SizeDelta: {x: 10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1427017261 MonoBehaviour: @@ -24469,7 +24379,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5a6a33286645736499caef60e479872d, type: 3} + m_Sprite: {fileID: 1050489585, guid: a48f54066af47d5458b6ab505dd412b2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -26526,11 +26436,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 205 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -27110,7 +27020,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 1184003924} + m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 --- !u!4 &1619849090 @@ -28974,7 +28884,7 @@ MonoBehaviour: _craftingIngredients: [] _openManualSfxName: OpenManualBook _closeManualSfxName: CloseManualBook - uiEventsController: {fileID: 1701833862} + _uiEventsController: {fileID: 1701833862} _cocktailRecipeButtons: [] --- !u!114 &1701833862 MonoBehaviour: @@ -29418,11 +29328,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 105 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -31405,11 +31315,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -195 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -31621,7 +31531,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -23} + m_AnchoredPosition: {x: 0, y: -20} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1821459832 @@ -34418,11 +34328,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -95 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -34873,11 +34783,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -195 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -35558,7 +35468,7 @@ Transform: m_GameObject: {fileID: 2070548847} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -10.5, z: 0} + m_LocalPosition: {x: 0, y: -7.5, z: 0} m_LocalScale: {x: 20, y: 6, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -36492,11 +36402,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -195 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -36690,7 +36600,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -110 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y @@ -36754,11 +36664,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -60.46 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x @@ -36782,11 +36692,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -25.46 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x @@ -36806,7 +36716,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7479254977802555519, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -5 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/02.Scripts/Tycoon/LiquidController.cs b/Assets/02.Scripts/Tycoon/LiquidController.cs index aeafee57c..51f40ca5e 100644 --- a/Assets/02.Scripts/Tycoon/LiquidController.cs +++ b/Assets/02.Scripts/Tycoon/LiquidController.cs @@ -368,6 +368,10 @@ namespace BlueWater _reachedCollider.transform.position = _originalReachedPosition; EventManager.InvokeCocktailStarted(); } + else if (_instanceLiquidCount >= _maxLiquidCount) + { + return; + } _elapsedTime = 0f; _isPouring = true; @@ -582,7 +586,7 @@ namespace BlueWater float offsetY = Mathf.Lerp(_offsetY.x, _offsetY.y, t); var playerViewportPoint = mainCamera.WorldToViewportPoint(playerPosition); var panelWorldPosition = _overlayCamera.ViewportToWorldPoint(new Vector3(playerViewportPoint.x, - playerViewportPoint.y, _overlayCamera.nearClipPlane)); + playerViewportPoint.y, playerViewportPoint.z)); panelWorldPosition.y += offsetY; var lerpTime = elapsedTime / _moveToPlayerDuration; @@ -606,7 +610,7 @@ namespace BlueWater float offsetY = Mathf.Lerp(_offsetY.x, _offsetY.y, t); var playerViewportPoint = mainCamera.WorldToViewportPoint(playerPosition); var panelWorldPosition = _overlayCamera.ViewportToWorldPoint(new Vector3(playerViewportPoint.x, - playerViewportPoint.y, _overlayCamera.nearClipPlane)); + playerViewportPoint.y, playerViewportPoint.z)); panelWorldPosition.y += offsetY; _liquidPanel.transform.position = panelWorldPosition; diff --git a/Assets/02.Scripts/Ui/Popup.meta b/Assets/02.Scripts/Ui/Popup.meta new file mode 100644 index 000000000..9a9145f19 --- /dev/null +++ b/Assets/02.Scripts/Ui/Popup.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b8f7337f907cdc4e893f2d0a5bc9b80 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Ui/MenuPopupUi.cs b/Assets/02.Scripts/Ui/Popup/MenuPopupUi.cs similarity index 100% rename from Assets/02.Scripts/Ui/MenuPopupUi.cs rename to Assets/02.Scripts/Ui/Popup/MenuPopupUi.cs diff --git a/Assets/02.Scripts/Ui/MenuPopupUi.cs.meta b/Assets/02.Scripts/Ui/Popup/MenuPopupUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/MenuPopupUi.cs.meta rename to Assets/02.Scripts/Ui/Popup/MenuPopupUi.cs.meta diff --git a/Assets/02.Scripts/Ui/Popup/PausePopupUi.cs b/Assets/02.Scripts/Ui/Popup/PausePopupUi.cs new file mode 100644 index 000000000..b3084cb28 --- /dev/null +++ b/Assets/02.Scripts/Ui/Popup/PausePopupUi.cs @@ -0,0 +1,47 @@ +namespace BlueWater.Uis +{ + public class PausePopupUi : PopupUi + { + public override void Open() + { + VisualFeedbackManager.Instance.SetBaseTimeScale(0f); + PopupUiController.RegisterPopup(this); + IsOpened = true; + IsPaused = true; + } + + public override void Close() + { + PopupUiController.UnregisterPopup(this); + IsOpened = false; + IsPaused = false; + + if (PopupUiController.IsPopupListEmpty() || !PopupUiController.IsPausedPopupList()) + { + VisualFeedbackManager.Instance.ResetTimeScale(); + } + } + + public void OpenSwitch(InputActionMaps inputActionMaps) + { + VisualFeedbackManager.Instance.SetBaseTimeScale(0f); + PopupUiController.RegisterPopup(this); + IsOpened = true; + IsPaused = true; + PlayerInputKeyManager.Instance.SwitchCurrentActionMap(inputActionMaps); + } + + public void CloseSwitch(InputActionMaps inputActionMaps) + { + PopupUiController.UnregisterPopup(this); + IsOpened = false; + IsPaused = false; + + if (PopupUiController.IsPopupListEmpty() || !PopupUiController.IsPausedPopupList()) + { + VisualFeedbackManager.Instance.ResetTimeScale(); + PlayerInputKeyManager.Instance.SwitchCurrentActionMap(inputActionMaps); + } + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Popup/PausePopupUi.cs.meta b/Assets/02.Scripts/Ui/Popup/PausePopupUi.cs.meta new file mode 100644 index 000000000..d952c4217 --- /dev/null +++ b/Assets/02.Scripts/Ui/Popup/PausePopupUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a32c3115487d6204a82e2a52229e19e7 diff --git a/Assets/02.Scripts/Ui/PopupUi.cs b/Assets/02.Scripts/Ui/Popup/PopupUi.cs similarity index 76% rename from Assets/02.Scripts/Ui/PopupUi.cs rename to Assets/02.Scripts/Ui/Popup/PopupUi.cs index 9d62f5665..3a49b6cc7 100644 --- a/Assets/02.Scripts/Ui/PopupUi.cs +++ b/Assets/02.Scripts/Ui/Popup/PopupUi.cs @@ -5,19 +5,16 @@ namespace BlueWater.Uis public class PopupUi : MonoBehaviour { public bool IsOpened { get; protected set; } + public bool IsPaused { get; protected set; } public virtual void Open() { - // 화면의 가장 앞으로 가져오기 - // transform.SetAsLastSibling(); - gameObject.SetActive(true); PopupUiController.RegisterPopup(this); IsOpened = true; } public virtual void Close() { - gameObject.SetActive(false); PopupUiController.UnregisterPopup(this); IsOpened = false; } diff --git a/Assets/02.Scripts/Ui/PopupUi.cs.meta b/Assets/02.Scripts/Ui/Popup/PopupUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/PopupUi.cs.meta rename to Assets/02.Scripts/Ui/Popup/PopupUi.cs.meta diff --git a/Assets/02.Scripts/Ui/PopupUiController.cs b/Assets/02.Scripts/Ui/Popup/PopupUiController.cs similarity index 80% rename from Assets/02.Scripts/Ui/PopupUiController.cs rename to Assets/02.Scripts/Ui/Popup/PopupUiController.cs index cd7300eda..95ec21080 100644 --- a/Assets/02.Scripts/Ui/PopupUiController.cs +++ b/Assets/02.Scripts/Ui/Popup/PopupUiController.cs @@ -56,6 +56,21 @@ namespace BlueWater } } + /// + /// 현재 열려있는 팝업 리스트 중에 시간을 멈춘 팝업이 있는지 없는지 확인 + /// + public static bool IsPausedPopupList() + { + foreach (var element in PopupUis) + { + if (!element.IsPaused) continue; + + return true; + } + + return false; + } + // Popup 목록이 비어 있는지 확인 public static bool IsPopupListEmpty() => PopupUis.Count == 0; diff --git a/Assets/02.Scripts/Ui/PopupUiController.cs.meta b/Assets/02.Scripts/Ui/Popup/PopupUiController.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/PopupUiController.cs.meta rename to Assets/02.Scripts/Ui/Popup/PopupUiController.cs.meta diff --git a/Assets/02.Scripts/Ui/SwitchActionPopupUi.cs b/Assets/02.Scripts/Ui/Popup/SwitchActionPopupUi.cs similarity index 100% rename from Assets/02.Scripts/Ui/SwitchActionPopupUi.cs rename to Assets/02.Scripts/Ui/Popup/SwitchActionPopupUi.cs diff --git a/Assets/02.Scripts/Ui/SwitchActionPopupUi.cs.meta b/Assets/02.Scripts/Ui/Popup/SwitchActionPopupUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/SwitchActionPopupUi.cs.meta rename to Assets/02.Scripts/Ui/Popup/SwitchActionPopupUi.cs.meta diff --git a/Assets/02.Scripts/Ui/TutorialPopupUi.cs b/Assets/02.Scripts/Ui/Popup/TutorialPopupUi.cs similarity index 100% rename from Assets/02.Scripts/Ui/TutorialPopupUi.cs rename to Assets/02.Scripts/Ui/Popup/TutorialPopupUi.cs diff --git a/Assets/02.Scripts/Ui/TutorialPopupUi.cs.meta b/Assets/02.Scripts/Ui/Popup/TutorialPopupUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/TutorialPopupUi.cs.meta rename to Assets/02.Scripts/Ui/Popup/TutorialPopupUi.cs.meta diff --git a/Assets/02.Scripts/Ui/Title/TitleOptions.cs b/Assets/02.Scripts/Ui/Title/TitleOptions.cs index 1530565d6..2b2d05558 100644 --- a/Assets/02.Scripts/Ui/Title/TitleOptions.cs +++ b/Assets/02.Scripts/Ui/Title/TitleOptions.cs @@ -125,16 +125,14 @@ public class TitleOptions : PopupUi public override void Open() { - PopupUiController.RegisterPopup(this); + base.Open(); _panel.SetActive(true); - IsOpened = true; } public override void Close() { _panel.SetActive(false); - PopupUiController.UnregisterPopup(this); - IsOpened = false; + base.Close(); } public override void EnableInput() diff --git a/Assets/02.Scripts/Ui/Title/TitleQuitUi.cs b/Assets/02.Scripts/Ui/Title/TitleQuitUi.cs index 030b6e66a..f9e816ed6 100644 --- a/Assets/02.Scripts/Ui/Title/TitleQuitUi.cs +++ b/Assets/02.Scripts/Ui/Title/TitleQuitUi.cs @@ -3,7 +3,6 @@ using BlueWater.Uis; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.InputSystem; -using UnityEngine.Serialization; using UnityEngine.UI; namespace BlueWater @@ -19,8 +18,8 @@ namespace BlueWater [SerializeField] private Button _cancelButton; - [FormerlySerializedAs("_uiNavigationController")] [SerializeField] - private UiEventsController uiEventsController; + [SerializeField] + private UiEventsController _uiEventsController; private InputAction _interactionEAction; private InputAction _closeOptionsAction; @@ -49,17 +48,16 @@ namespace BlueWater public override void Open() { - PopupUiController.RegisterPopup(this); + base.Open(); _panel.SetActive(true); - IsOpened = true; - EventSystem.current.SetSelectedGameObject(_cancelButton.gameObject); + // EventSystem.current.SetSelectedGameObject(_cancelButton.gameObject); } public override void Close() { _panel.SetActive(false); - PopupUiController.UnregisterPopup(this); - IsOpened = false; + base.Close(); + EventSystem.current.SetSelectedGameObject(null); } public override void EnableInput() @@ -67,7 +65,7 @@ namespace BlueWater _interactionEAction.performed += OnInteractionE; _closeOptionsAction.performed += OnCloseOptions; - uiEventsController.EnableAutoNavigate(_cancelButton.gameObject); + _uiEventsController.EnableAutoNavigate(_cancelButton.gameObject); } public override void DisableInput() @@ -75,7 +73,7 @@ namespace BlueWater _interactionEAction.performed -= OnInteractionE; _closeOptionsAction.performed -= OnCloseOptions; - uiEventsController.DisableAutoNavigate(); + _uiEventsController.DisableAutoNavigate(); } public void OnInteractionE(InputAction.CallbackContext context) diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index 422ed1e07..d99a79042 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -12,7 +12,7 @@ using UnityEngine.UI; namespace BlueWater.Titles { - public class TycoonTitle : PopupUi + public class TycoonTitle : PausePopupUi { [SerializeField] private GameObject _panel; @@ -91,7 +91,7 @@ namespace BlueWater.Titles AudioManager.Instance.PlayBgm(_dailyBgm); Open(); - EventSystem.current.SetSelectedGameObject(_startGameButton.gameObject); + // EventSystem.current.SetSelectedGameObject(_startGameButton.gameObject); } else { @@ -143,21 +143,19 @@ namespace BlueWater.Titles public override void Open() { - PopupUiController.RegisterPopup(this); + OpenSwitch(InputActionMaps.TycoonUi); _panel.SetActive(true); - if (_isTitleScene) - { - - } - else - { - VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); - _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi); - EventSystem.current.SetSelectedGameObject(_resumeGameButton.gameObject); - } - - IsOpened = true; + // if (_isTitleScene) + // { + // + // } + // else + // { + // VisualFeedbackManager.Instance.SetBaseTimeScale(0f); + // _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi); + // // EventSystem.current.SetSelectedGameObject(_resumeGameButton.gameObject); + // } } public void OnClose(InputAction.CallbackContext context) @@ -167,19 +165,22 @@ namespace BlueWater.Titles public override void Close() { + // base.Close(); + // + // if (_isTitleScene) + // { + // + // } + // else + // { + // if (PopupUiController.IsPopupListEmpty() || !PopupUiController.IsPausedPopupList()) + // { + // VisualFeedbackManager.Instance.ResetTimeScale(); + // _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.Tycoon); + // } + // } _panel.SetActive(false); - PopupUiController.UnregisterPopup(this); - IsOpened = false; - - if (_isTitleScene) - { - - } - else - { - _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.Tycoon); - VisualFeedbackManager.Instance.ResetTimeScale(); - } + CloseSwitch(InputActionMaps.Tycoon); } public override void EnableInput() @@ -243,19 +244,21 @@ namespace BlueWater.Titles { _titleMenuUiPanel.SetActive(false); titleOptions.Open(); + EventSystem.current.SetSelectedGameObject(null); } public void HideSettingUi() { titleOptions.Close(); _titleMenuUiPanel.SetActive(true); - EventSystem.current.SetSelectedGameObject(_optionsButton.gameObject); + // EventSystem.current.SetSelectedGameObject(_optionsButton.gameObject); } public void ShowQuitUi() { _titleMenuUiPanel.SetActive(false); titleQuitUi.Open(); + EventSystem.current.SetSelectedGameObject(null); Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(1f)); } @@ -264,7 +267,7 @@ namespace BlueWater.Titles { titleQuitUi.Close(); _titleMenuUiPanel.SetActive(true); - EventSystem.current.SetSelectedGameObject(_quitGameButton.gameObject); + // EventSystem.current.SetSelectedGameObject(_quitGameButton.gameObject); Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(0.4f)); } @@ -273,6 +276,7 @@ namespace BlueWater.Titles { _titleMenuUiPanel.SetActive(false); _tycoonTutorial.ShowUi(true); + EventSystem.current.SetSelectedGameObject(null); Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(1f)); } @@ -282,20 +286,16 @@ namespace BlueWater.Titles if (!isMenu) { _panel.SetActive(false); - _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.Tycoon); - VisualFeedbackManager.Instance.ResetTimeScale(); } _titleMenuUiPanel.SetActive(true); - EventSystem.current.SetSelectedGameObject(_tutorialButton.gameObject); + // EventSystem.current.SetSelectedGameObject(_tutorialButton.gameObject); Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(0.4f)); } public void ShowTutorialUiByName(string tutorialName) { - VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); - _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi); _titleMenuUiPanel.SetActive(false); _tycoonTutorial.ShowUiByName(tutorialName); _panel.SetActive(true); diff --git a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs index b9e186f64..793e64f5f 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs @@ -18,7 +18,7 @@ using UnityEngine.UI; namespace BlueWater.Uis { - public class ManualBook : PopupUi + public class ManualBook : PausePopupUi { [SerializeField] private GameObject _panel; @@ -55,7 +55,7 @@ namespace BlueWater.Uis [Title("참조")] [SerializeField] - private UiEventsController uiEventsController; + private UiEventsController _uiEventsController; [Title("실시간 데이터")] [SerializeField] @@ -99,8 +99,7 @@ namespace BlueWater.Uis _openManualBookAction.performed += OnOpen; - uiEventsController.SetSelectObject(_cocktailRecipeButtons[0].gameObject); - EventSystem.current.SetSelectedGameObject(uiEventsController.SelectObject); + _uiEventsController.SetSelectObject(_cocktailRecipeButtons[0].gameObject); } private void OnDestroy() @@ -145,13 +144,10 @@ namespace BlueWater.Uis { if (!PopupUiController.IsPopupListEmpty()) return; - VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); - PopupUiController.RegisterPopup(this); + OpenSwitch(InputActionMaps.TycoonUi); _panel.SetActive(true); - IsOpened = true; AudioManager.Instance.PlaySfx(_openManualSfxName, ignoreTimeScale: true); - EventSystem.current.SetSelectedGameObject(uiEventsController.SelectObject); + EventSystem.current.SetSelectedGameObject(_uiEventsController.SelectObject); } public void OnClose(InputAction.CallbackContext context) @@ -163,22 +159,19 @@ namespace BlueWater.Uis { AudioManager.Instance.PlaySfx(_closeManualSfxName, ignoreTimeScale: true); _panel.SetActive(false); - PopupUiController.UnregisterPopup(this); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); - IsOpened = false; - VisualFeedbackManager.Instance.ResetTimeScale(); + CloseSwitch(InputActionMaps.Tycoon); } public override void EnableInput() { _pressQAction.performed += OnClose; _cancelAction.performed += OnClose; - uiEventsController.EnableAutoNavigate(); + _uiEventsController.EnableAutoNavigate(); } public override void DisableInput() { - uiEventsController.DisableAutoNavigate(); + _uiEventsController.DisableAutoNavigate(); _pressQAction.performed -= OnClose; _cancelAction.performed -= OnClose; } @@ -229,7 +222,7 @@ namespace BlueWater.Uis public void SelectItem(CocktailRecipeButton cocktailRecipeButton) { _selectedCocktailRecipeButton = cocktailRecipeButton; - uiEventsController.SetSelectObject(_selectedCocktailRecipeButton.gameObject); + _uiEventsController.SetSelectObject(_selectedCocktailRecipeButton.gameObject); _selectedCocktailName.text = Utils.GetLocalizedString(_selectedCocktailRecipeButton.CocktailData.Idx); _selectedCocktailImage.sprite = _selectedCocktailRecipeButton.CocktailData.Sprite; diff --git a/Assets/02.Scripts/Ui/Tycoon/TutorialPageToggle.cs b/Assets/02.Scripts/Ui/Tycoon/TutorialPageToggle.cs index 7501e4d17..6b2f8d18b 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TutorialPageToggle.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TutorialPageToggle.cs @@ -53,6 +53,11 @@ namespace BlueWater { LocalizationSettings.SelectedLocaleChanged += OnChangedLocale; } + + private void OnEnable() + { + _buttonText.text = Utils.GetLocalizedString(_tutorialInfo.TitleTextIdx); + } private void OnDestroy() { diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs index b146fcfd6..7ade27d18 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs @@ -10,7 +10,7 @@ using Random = UnityEngine.Random; namespace BlueWater.Uis { - public class TycoonRareRewardBoxUi : PopupUi + public class TycoonRareRewardBoxUi : PausePopupUi { [SerializeField] private GameObject _panel; @@ -39,6 +39,10 @@ namespace BlueWater.Uis [SerializeField] private string _cardOpenAllSfxName = "SelectCard"; + [Title("참조")] + [SerializeField] + private UiEventsController _uiEventsController; + private List _tycoonCards = new(5); private int viewCardCount = 0; @@ -68,37 +72,30 @@ namespace BlueWater.Uis public override void Open() { + OpenSwitch(InputActionMaps.TycoonUi); AudioManager.Instance.PlaySfx(_openSfxName, ignoreTimeScale: true); - VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); - PopupUiController.RegisterPopup(this); - _panel.SetActive(true); - IsOpened = true; - allOpenCardButton.gameObject.SetActive(true); closeButton.gameObject.SetActive(false); + _panel.SetActive(true); } public override void Close() { AudioManager.Instance.PlaySfx(_cardOpenAllSfxName, ignoreTimeScale: true); + CloseSwitch(InputActionMaps.Tycoon); _panel.SetActive(false); - PopupUiController.UnregisterPopup(this); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); - IsOpened = false; - VisualFeedbackManager.Instance.ResetTimeScale(); } public override void EnableInput() { _interactionEAction.performed += OnInteractionE; - this.GetComponent().EnableAutoNavigate(); + _uiEventsController.EnableAutoNavigate(); } public override void DisableInput() { _interactionEAction.performed -= OnInteractionE; - this.GetComponent().DisableAutoNavigate(); + _uiEventsController.DisableAutoNavigate(); } @@ -157,7 +154,7 @@ namespace BlueWater.Uis _tycoonCardController.SelectCard(element); } - GetComponent().SetSelectObject(_tycoonCards[(int)(_tycoonCards.Count/2)].CardArea.gameObject); + _uiEventsController.SetSelectObject(_tycoonCards[(int)(_tycoonCards.Count/2)].CardArea.gameObject); } private void OpenCard(TycoonCard tycoonCard) diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs index 6684b5ea1..d79c86e5a 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs @@ -14,7 +14,7 @@ using UnityEngine.UI; namespace BlueWater.Uis { - public class TycoonResultUi : PopupUi + public class TycoonResultUi : PausePopupUi { [Title("결과 카드")] [SerializeField] @@ -298,12 +298,9 @@ namespace BlueWater.Uis [Button("결과 연출 테스트")] public override void Open() { + OpenSwitch(InputActionMaps.TycoonUi); AudioManager.Instance.StopSfx("TycoonGameOver"); AudioManager.Instance.PlayBgm(_bgmName); - VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); - PopupUiController.RegisterPopup(this); - IsOpened = true; Utils.StartUniqueCoroutine(this, ref _showResultInstance, ShowResultCoroutine()); } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index beffa9ef6..7db3e3c95 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Collections.Generic; -using System.Runtime.InteropServices; using BlueWater.Audios; using BlueWater.Tycoons; using Sirenix.OdinInspector; @@ -8,11 +7,10 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.UI; -using Random = UnityEngine.Random; namespace BlueWater.Uis { - public class TycoonSelectCard : PopupUi + public class TycoonSelectCard : PausePopupUi { [SerializeField] private GameObject _panel; @@ -22,6 +20,10 @@ namespace BlueWater.Uis [SerializeField] private string _openSfxName = "OpenNormalRewardBox"; + + [Title("참조")] + [SerializeField] + private UiEventsController _uiEventsController; private List _tycoonCards = new(3); @@ -55,34 +57,27 @@ namespace BlueWater.Uis public override void Open() { + OpenSwitch(InputActionMaps.TycoonUi); AudioManager.Instance.PlaySfx(_openSfxName, ignoreTimeScale: true); - VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); - PopupUiController.RegisterPopup(this); _panel.SetActive(true); - IsOpened = true; } public override void Close() { + CloseSwitch(InputActionMaps.Tycoon); _panel.SetActive(false); - PopupUiController.UnregisterPopup(this); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); - IsOpened = false; - VisualFeedbackManager.Instance.ResetTimeScale(); } - public override void EnableInput() { _interactionEAction.performed += OnInteractionE; - this.GetComponent().EnableAutoNavigate(); + _uiEventsController.EnableAutoNavigate(); } public override void DisableInput() { _interactionEAction.performed -= OnInteractionE; - this.GetComponent().DisableAutoNavigate(); + _uiEventsController.DisableAutoNavigate(); } public void OnInteractionE(InputAction.CallbackContext context) @@ -139,7 +134,7 @@ namespace BlueWater.Uis StartCoroutine(FadeInPanel()); } - this.GetComponent().SetSelectObject(_tycoonCards[0].CardArea.gameObject); + _uiEventsController.SetSelectObject(_tycoonCards[0].CardArea.gameObject); } private IEnumerator FadeInPanel() diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs index 9fed35d0f..cbe50068e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs @@ -14,7 +14,7 @@ using UnityEngine.UI; namespace BlueWater.Uis { - public class TycoonStartShopUi : PopupUi + public class TycoonStartShopUi : PausePopupUi { [SerializeField] private GameObject _soldOutPrefab; @@ -58,6 +58,10 @@ namespace BlueWater.Uis [SerializeField] private int _endGold; + [Title("참조")] + [SerializeField] + private UiEventsController _uiEventsController; + private List _tycoonCards = new(5); private TycoonManager _tycoonManager; @@ -126,20 +130,14 @@ namespace BlueWater.Uis public override void Open() { - VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); - PopupUiController.RegisterPopup(this); + OpenSwitch(InputActionMaps.TycoonUi); _panel.SetActive(true); - IsOpened = true; } public override async void Close() { _panel.SetActive(false); - PopupUiController.UnregisterPopup(this); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); - IsOpened = false; - VisualFeedbackManager.Instance.ResetTimeScale(); + CloseSwitch(InputActionMaps.Tycoon); while (!PlayerInputKeyManager.Instance.IsInitialized) { @@ -152,13 +150,13 @@ namespace BlueWater.Uis public override void EnableInput() { _interactionEAction.performed += OnInteractionE; - this.GetComponent().EnableAutoNavigate(); + _uiEventsController.EnableAutoNavigate(); } public override void DisableInput() { _interactionEAction.performed -= OnInteractionE; - this.GetComponent().DisableAutoNavigate(); + _uiEventsController.DisableAutoNavigate(); } @@ -202,7 +200,7 @@ namespace BlueWater.Uis element.Rotation_Start(); } - this.GetComponent().SetSelectObject(_tycoonCards[0].CardArea.gameObject); + _uiEventsController.SetSelectObject(_tycoonCards[0].CardArea.gameObject); } private void SelectedCard(TycoonCard currentTycoonCard) diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs index dd692885b..4f6172cb0 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using BlueWater.Uis; using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.InputSystem; @@ -21,7 +22,7 @@ namespace BlueWater public const string TutorialJ = "TutorialJ"; } - public class TycoonTutorial : MonoBehaviour + public class TycoonTutorial : PausePopupUi { [SerializeField, Required] private GameObject _tutorialPanel; @@ -146,6 +147,11 @@ namespace BlueWater _isUpdatingToggle = false; } }; + + foreach (var element in tutorialLink.TycoonTutorialPopupUis) + { + element.SetupButtons(tutorialLink, OnMovePreviousPageButton, OnMoveNextPageButton); + } _tutorialLinks.Add(tutorialLink); } @@ -162,6 +168,45 @@ namespace BlueWater _interactionEAction = null; _closeAction = null; } + + public override void Open() + { + OpenSwitch(InputActionMaps.TycoonUi); + + if (_isInMenu) + { + SetCurrentTutorialLink(); + _togglePanel.SetActive(true); + UpdateKeyPanels(); + + _pressQAction.performed += OnMovePreviousToggle; + _pressRAction.performed += OnMovNextToggle; + _closeAction.performed += OnClose; + } + + _pressAAction.performed += OnMovePreviousPage; + _pressDAction.performed += OnMoveNextPage; + } + + public override void Close() + { + _pressQAction.performed -= OnMovePreviousToggle; + _pressRAction.performed -= OnMovNextToggle; + _pressAAction.performed -= OnMovePreviousPage; + _pressDAction.performed -= OnMoveNextPage; + _interactionEAction.performed -= OnClose; + _closeAction.performed -= OnClose; + + _togglePanel.SetActive(false); + _tutorialPanel.SetActive(false); + _currentTutorialLink?.OnToggle(false); + CloseKeyPanels(); + + CloseAction?.Invoke(_isInMenu); + _isInMenu = false; + + CloseSwitch(InputActionMaps.Tycoon); + } public void SetCurrentTutorialLink(string tutorialName = null) { @@ -181,19 +226,7 @@ namespace BlueWater { _isInMenu = isInMenu; - if (_isInMenu) - { - SetCurrentTutorialLink(); - _togglePanel.SetActive(true); - UpdateKeyPanels(); - - _pressQAction.performed += OnMovePreviousToggle; - _pressRAction.performed += OnMovNextToggle; - _closeAction.performed += OnClose; - } - - _pressAAction.performed += OnMovePreviousPage; - _pressDAction.performed += OnMoveNextPage; + Open(); } public void ShowUiByName(string tutorialName = null) @@ -207,19 +240,7 @@ namespace BlueWater public void HideUi() { - _pressQAction.performed -= OnMovePreviousToggle; - _pressRAction.performed -= OnMovNextToggle; - _pressAAction.performed -= OnMovePreviousPage; - _pressDAction.performed -= OnMoveNextPage; - _interactionEAction.performed -= OnClose; - _closeAction.performed -= OnClose; - - _togglePanel.SetActive(false); - _tutorialPanel.SetActive(false); - _currentTutorialLink?.OnToggle(false); - CloseKeyPanels(); - - CloseAction?.Invoke(_isInMenu); + Close(); _isInMenu = false; } @@ -285,6 +306,20 @@ namespace BlueWater UpdateKeyPanels(); } + + public void OnMovePreviousPageButton(TutorialLink tutorialLink) + { + _currentTutorialLink = tutorialLink; + + MovePage(false); + } + + public void OnMoveNextPageButton(TutorialLink tutorialLink) + { + _currentTutorialLink = tutorialLink; + + MovePage(true); + } private void CloseKeyPanels() { diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorialPopupUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorialPopupUi.cs index e96bcba84..f662f736e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorialPopupUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorialPopupUi.cs @@ -12,7 +12,7 @@ using UnityEngine.UI; namespace BlueWater { - public class TycoonTutorialPopupUi : TutorialPopupUi + public class TycoonTutorialPopupUi : PopupUi { [SerializeField] private Image _popupImage; @@ -32,10 +32,15 @@ namespace BlueWater [SerializeField] private Image _descriptionImage; - [SerializeField] private TMP_Text _pageText; + [SerializeField] + private Button _previousButton; + + [SerializeField] + private Button _nextButton; + [Title("연출")] [SerializeField] private Vector3 _descriptionTextAnchorPositionInFirst = new(0f, -37f, 0f); @@ -53,12 +58,21 @@ namespace BlueWater private TutorialPage _tutorialPage; private Coroutine _changedLocaleInstance; private int _pageIndex; + + public Action OnPreviousPage; + public Action OnNextPage; - private void Start() + private void Awake() { LocalizationSettings.SelectedLocaleChanged += OnChangedLocale; } + private void OnEnable() + { + _titleText.text = Utils.GetLocalizedString(_tutorialInfo.TitleTextIdx); + _descriptionText.text = Utils.GetLocalizedString(_tutorialPage.DescriptionIdx); + } + private void OnDestroy() { LocalizationSettings.SelectedLocaleChanged -= OnChangedLocale; @@ -83,6 +97,18 @@ namespace BlueWater _descriptionText.text = Utils.GetLocalizedString(_tutorialPage.DescriptionIdx); } } + + public override void Open() + { + base.Open(); + gameObject.SetActive(true); + } + + public override void Close() + { + gameObject.SetActive(false); + base.Close(); + } public void Initialize(TutorialInfo tutorialInfo, int pageindex, Sprite popupSprite) { @@ -114,5 +140,30 @@ namespace BlueWater _pageText.text = $"{_tutorialPage.PageIndex}/{_tutorialInfo.GetPages()}"; } + + public void SetupButtons(TutorialLink tutorialLink, Action onMovePreviousPage, Action onMoveNextPage) + { + _previousButton.onClick.RemoveAllListeners(); + _nextButton.onClick.RemoveAllListeners(); + + switch (_tutorialPage.TutorialPageType) + { + case TutorialPageType.First: + _nextButton.onClick.AddListener(() => onMoveNextPage?.Invoke(tutorialLink)); + break; + + case TutorialPageType.Middle: + _previousButton.onClick.AddListener(() => onMovePreviousPage?.Invoke(tutorialLink)); + _nextButton.onClick.AddListener(() => onMoveNextPage?.Invoke(tutorialLink)); + break; + + case TutorialPageType.Last: + _previousButton.onClick.AddListener(() => onMovePreviousPage?.Invoke(tutorialLink)); + break; + + case TutorialPageType.Solo: + break; + } + } } } diff --git a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs index 701f07b12..d3816c638 100644 --- a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs @@ -8,7 +8,7 @@ using UnityEngine.InputSystem; namespace BlueWater.Uis { - public class UpgradePopupUi : PopupUi + public class UpgradePopupUi : PausePopupUi { [SerializeField] private GameObject _panel; @@ -50,20 +50,14 @@ namespace BlueWater.Uis public override void Open() { - VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); - PopupUiController.RegisterPopup(this); + OpenSwitch(InputActionMaps.TycoonUi); _panel.SetActive(true); - IsOpened = true; } public override void Close() { _panel.SetActive(false); - PopupUiController.UnregisterPopup(this); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); - IsOpened = false; - VisualFeedbackManager.Instance.ResetTimeScale(); + CloseSwitch(InputActionMaps.Tycoon); } public override void DisableInput() diff --git a/Assets/02.Scripts/Ui/UiEventsController.cs b/Assets/02.Scripts/Ui/UiEventsController.cs index b6f93f5b3..39602156f 100644 --- a/Assets/02.Scripts/Ui/UiEventsController.cs +++ b/Assets/02.Scripts/Ui/UiEventsController.cs @@ -5,7 +5,7 @@ using UnityEngine.InputSystem.UI; namespace BlueWater { - public class UiEventsController: MonoBehaviour + public class UiEventsController : MonoBehaviour { [field: SerializeField] public GameObject SelectObject { get; private set; } diff --git a/Assets/03.Images/Ui/Balloon/BartenderBalloonEmpty.png b/Assets/03.Images/Ui/Balloon/BartenderBalloonEmpty.png new file mode 100644 index 0000000000000000000000000000000000000000..4b73c9afd0eee365db4bf1f3b3426ccb1750d97d GIT binary patch literal 15024 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 literal 0 HcmV?d00001 diff --git a/Assets/03.Images/Ui/Balloon/BartenderBalloonFilled.png.meta b/Assets/03.Images/Ui/Balloon/BartenderBalloonFilled.png.meta new file mode 100644 index 000000000..5ca9ebeb6 --- /dev/null +++ b/Assets/03.Images/Ui/Balloon/BartenderBalloonFilled.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 63cfa14d021d92c40830b21b6394d3c4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Win64 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/CenterBalloon.png b/Assets/03.Images/Ui/Balloon/CenterBalloon01.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/CenterBalloon.png rename to Assets/03.Images/Ui/Balloon/CenterBalloon01.png diff --git a/Assets/03.Images/Ui/Tycoon/CenterBalloon.png.meta b/Assets/03.Images/Ui/Balloon/CenterBalloon01.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/CenterBalloon.png.meta rename to Assets/03.Images/Ui/Balloon/CenterBalloon01.png.meta diff --git a/Assets/03.Images/Ui/Balloon/CenterBalloon02.png b/Assets/03.Images/Ui/Balloon/CenterBalloon02.png new file mode 100644 index 0000000000000000000000000000000000000000..19e4865c3752c6fb0c1dd7c086db5a714469c4cc GIT binary patch literal 44853 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 J5RF|U{|9&gkjMZ4 literal 0 HcmV?d00001 diff --git a/Assets/03.Images/Ui/Balloon/CenterBalloon02.png.meta b/Assets/03.Images/Ui/Balloon/CenterBalloon02.png.meta new file mode 100644 index 000000000..d5f6603d9 --- /dev/null +++ b/Assets/03.Images/Ui/Balloon/CenterBalloon02.png.meta @@ -0,0 +1,192 @@ +fileFormatVersion: 2 +guid: a4ceb21a4bb164243942d27a07ddb8f7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Win64 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: CenterBalloon02_0 + rect: + serializedVersion: 2 + x: 65 + y: 97 + width: 383 + height: 380 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ce1d147f6cf2e6b49b64e0c43f503d6d + internalID: 214549948 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + CenterBalloon02_0: 214549948 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Balloon/PlayerBalloon.png b/Assets/03.Images/Ui/Balloon/PlayerBalloon01.png similarity index 100% rename from Assets/03.Images/Ui/Balloon/PlayerBalloon.png rename to Assets/03.Images/Ui/Balloon/PlayerBalloon01.png diff --git a/Assets/03.Images/Ui/Balloon/PlayerBalloon.png.meta b/Assets/03.Images/Ui/Balloon/PlayerBalloon01.png.meta similarity index 100% rename from Assets/03.Images/Ui/Balloon/PlayerBalloon.png.meta rename to Assets/03.Images/Ui/Balloon/PlayerBalloon01.png.meta diff --git a/Assets/03.Images/Ui/Balloon/PlayerBalloon02.png b/Assets/03.Images/Ui/Balloon/PlayerBalloon02.png new file mode 100644 index 0000000000000000000000000000000000000000..8c74b9c6ca6e5d728b43f816a7b03789cbcdd397 GIT binary patch literal 13759 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 Q4S)syL+T(1>Q*oQKZjd$Q~&?~ literal 0 HcmV?d00001 diff --git a/Assets/03.Images/Ui/Balloon/PlayerBalloon02.png.meta b/Assets/03.Images/Ui/Balloon/PlayerBalloon02.png.meta new file mode 100644 index 000000000..41b397ca3 --- /dev/null +++ b/Assets/03.Images/Ui/Balloon/PlayerBalloon02.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 02b5b12337a382b4696d9caf082621f4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Win64 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Balloon/PlayerBalloonDouble.png b/Assets/03.Images/Ui/Balloon/PlayerBalloonDouble.png new file mode 100644 index 0000000000000000000000000000000000000000..01056492d41ce27b9d47f57825f6da2b01408ec1 GIT binary patch literal 4208 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 literal 0 HcmV?d00001 diff --git a/Assets/03.Images/Ui/Balloon/PlayerBalloonDouble.png.meta b/Assets/03.Images/Ui/Balloon/PlayerBalloonDouble.png.meta new file mode 100644 index 000000000..4cde8cfa4 --- /dev/null +++ b/Assets/03.Images/Ui/Balloon/PlayerBalloonDouble.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 0749df7d13733f640b531747696beff2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Win64 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab index 114eea329..03cb3a58d 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab @@ -684,7 +684,6 @@ MonoBehaviour: returnAfterBeingPushedAway: 0 progressAverage: 0 lastJobDensityResult: 0 - centerOffsetCompatibility: NaN repathRateCompatibility: NaN canSearchCompability: 0 orientation: 0 @@ -695,7 +694,6 @@ MonoBehaviour: sensitivity: 10 maximumPeriod: 2 visualizeSensitivity: 0 - targetCompatibility: {fileID: 0} maxAcceleration: -2.5 rotationSpeed: 360 slowdownDistance: 1 @@ -819,6 +817,7 @@ MonoBehaviour: k__BackingField: {fileID: 1469338590548789471} k__BackingField: {fileID: 5279376384905517670} k__BackingField: {fileID: 17978457728262906} + _createCrewSfxName: CreateCrew _makingCocktailTime: 15 --- !u!1 &7812544424410854405 GameObject: @@ -888,8 +887,8 @@ MonoBehaviour: m_Calls: [] m_text: "\uBB50\uAC00 \uC88B\uC744\uAE4C.." m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -977,25 +976,25 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2397117528733804567} m_Modifications: + - target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a327d1fc80d90bd438cfcd1ad2b219c7, type: 3} + objectReference: {fileID: 21300000, guid: 63cfa14d021d92c40830b21b6394d3c4, type: 3} - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_Color.b value: 1 objectReference: {fileID: 0} - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_Color.g - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_Color.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_FillAmount - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_FillMethod @@ -1005,14 +1004,38 @@ PrefabInstance: propertyPath: m_FillOrigin value: 2 objectReference: {fileID: 0} + - target: {fileID: 2289935194962299514, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 2289935194962299514, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 2289935194962299514, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 2289935194962299514, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2971245722111912602, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3} + objectReference: {fileID: 21300000, guid: b555c8bc93f2c744f96dc4b1dc18544e, type: 3} - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 550 + objectReference: {fileID: 0} + - target: {fileID: 3740792823824215978, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} - target: {fileID: 4119792729305172665, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_IsActive value: 0 @@ -1047,11 +1070,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_SizeDelta.x - value: -180 + value: -140 objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_SizeDelta.y - value: -180 + value: -140 objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.x diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index d82a52522..44c516200 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -338,10 +338,10 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.25 - m_Height: 0.5 - m_Direction: 1 - m_Center: {x: 0, y: 0.25, z: 0} + m_Radius: 0.05 + m_Height: 0.05 + m_Direction: 0 + m_Center: {x: 0, y: 0.05, z: 0.05} --- !u!114 &1063431021331126030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -438,6 +438,7 @@ MonoBehaviour: k__BackingField: 5 _dashParticle: {fileID: 6534074633252588839} _walkingSfxName: TycoonPlayerWalking + _dashSfxName: TycoonPlayerDashing --- !u!114 &909302231676134912 MonoBehaviour: m_ObjectHideFlags: 0 @@ -584,10 +585,30 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2289935194962299514, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 2289935194962299514, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 2289935194962299514, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 2289935194962299514, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2971245722111912602, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e7b746bc5bff9d64fb1129b9aa8ccf3e, type: 3} + objectReference: {fileID: 21300000, guid: 02b5b12337a382b4696d9caf082621f4, type: 3} + - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 550 + objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -618,11 +639,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_SizeDelta.x - value: -100 + value: -140 objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_SizeDelta.y - value: -100 + value: -140 objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.x @@ -632,6 +653,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 20 objectReference: {fileID: 0} + - target: {fileID: 8141102490971775899, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_PresetInfoIsWorld value: 1 diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index fab757e0c..35f270921 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -5106,11 +5106,15 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3139401203256771042} + - {fileID: 4126727061748138605} - {fileID: 5128199735897506476} - {fileID: 11141612720054821} + - {fileID: 6350869843684206570} - {fileID: 1376671198123935973} + - {fileID: 1684497584069272204} - {fileID: 512977381636670004} - {fileID: 4715404908742687508} + - {fileID: 1662155398496833110} - {fileID: 869534564193479129} - {fileID: 4307167678708421440} - {fileID: 3159839880246234267} @@ -7066,7 +7070,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.z - value: -5.131 + value: -5.315 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalRotation.w @@ -7513,7 +7517,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.z - value: -4.715 + value: -4.864 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalRotation.w @@ -8283,6 +8287,162 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} m_PrefabInstance: {fileID: 1727320142537761310} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1849518973110697089 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3500050107750040134} + m_Modifications: + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.x + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.y + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.z + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.x + value: -0.706 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.z + value: -3.006 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_Name + value: Box (12) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} +--- !u!4 &1662155398496833110 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + m_PrefabInstance: {fileID: 1849518973110697089} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1863205548100325467 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3500050107750040134} + m_Modifications: + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.x + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.y + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.z + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.x + value: 4.025 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.z + value: -4.351 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_Name + value: Box (11) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} +--- !u!4 &1684497584069272204 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + m_PrefabInstance: {fileID: 1863205548100325467} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1899295290247730077 PrefabInstance: m_ObjectHideFlags: 0 @@ -8491,7 +8651,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -11.14 + value: -11.179 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -8697,7 +8857,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.z - value: -4.715 + value: -4.792 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalRotation.w @@ -10739,7 +10899,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: -1.95 + value: -1.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y @@ -10958,7 +11118,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.z - value: -5.169 + value: -5.318 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalRotation.w @@ -11146,6 +11306,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} m_PrefabInstance: {fileID: 4008788609714014428} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4034928768509292730 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3500050107750040134} + m_Modifications: + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.x + value: 3.044 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.z + value: -2.971 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_Name + value: Box (13) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} +--- !u!4 &4126727061748138605 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + m_PrefabInstance: {fileID: 4034928768509292730} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4045544168394043247 PrefabInstance: m_ObjectHideFlags: 0 @@ -12095,7 +12333,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: 4.05 + value: 4 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y @@ -14060,6 +14298,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 6152160942751711859} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6240076254535800125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3500050107750040134} + m_Modifications: + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.x + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.y + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.z + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.x + value: -1.858 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.z + value: -4.392 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_Name + value: Box (10) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} +--- !u!4 &6350869843684206570 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + m_PrefabInstance: {fileID: 6240076254535800125} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6250849215571901904 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab index cea0110e2..7594ca29f 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab @@ -129,7 +129,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.2 + m_Radius: 0.1 m_Height: 0.8 m_Direction: 0 - m_Center: {x: 0, y: 0.2, z: 0.2} + m_Center: {x: 0, y: 0, z: 0.1} diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab index 5a47b9535..11d4b2189 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab @@ -133,7 +133,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.2 + m_Radius: 0.15 m_Height: 0.8 m_Direction: 0 - m_Center: {x: 0, y: 0.2, z: 0.2} + m_Center: {x: 0, y: 0, z: 0.15} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab index 3d394d399..ece6c17b3 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab @@ -234,10 +234,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_Height - value: 0.9 - objectReference: {fileID: 0} - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x value: -180 @@ -284,7 +280,7 @@ PrefabInstance: objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Name - value: BartenderTable02 + value: BartenderTable objectReference: {fileID: 0} - target: {fileID: 5703157694525971125, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x @@ -423,6 +419,7 @@ MonoBehaviour: k__BackingField: IsOpened: 0 CocktailGlassImage: {fileID: 535721072425912087} + _putDownSfxName: PutDownCocktail _activeSprite: {fileID: 21300000, guid: e9275315ca60c1f479efa8f9393c7627, type: 3} _inactiveSprite: {fileID: 21300000, guid: 09c41279e539f704aa177e0278528d69, type: 3} --- !u!114 &3330559944751018385 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab index cc477379d..6b35d6cde 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab @@ -55,10 +55,10 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.15 + m_Radius: 0.1 m_Height: 1 m_Direction: 0 - m_Center: {x: 0, y: 0.15, z: 0.15} + m_Center: {x: 0, y: 0, z: 0.1} --- !u!210 &5891094220003351037 SortingGroup: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab index 427b5739a..e5e9758b6 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab @@ -185,7 +185,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Height - value: 0.2 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab index 72e029337..a6787a5dc 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab @@ -272,7 +272,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Height - value: 0.6 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab index 8b76e43de..69c01b2af 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab @@ -16,6 +16,10 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 529583648781627380, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 529583648781627380, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: 0 @@ -40,14 +44,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -30 objectReference: {fileID: 0} - - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -60,14 +56,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 263.525 - objectReference: {fileID: 0} - - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -220 - objectReference: {fileID: 0} - target: {fileID: 1868574217747462661, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_IsActive value: 0 @@ -88,14 +76,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -108,10 +88,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 308.145 - objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: -550 @@ -120,14 +96,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -140,26 +108,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 309.5 - objectReference: {fileID: 0} - - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -440 - objectReference: {fileID: 0} - target: {fileID: 5500819087084403754, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_Navigation.m_SelectOnUp value: objectReference: {fileID: 5137543705323593814} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -172,14 +124,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 308.145 - objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -330 - objectReference: {fileID: 0} - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -196,6 +140,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 65.17 objectReference: {fileID: 0} + - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: 0 @@ -208,30 +156,10 @@ PrefabInstance: propertyPath: m_text value: "\uAC8C\uC784 \uC7AC\uAC1C" objectReference: {fileID: 0} - - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 263.525 - objectReference: {fileID: 0} - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: -110 @@ -252,6 +180,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 65.17 objectReference: {fileID: 0} + - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: 0 @@ -296,6 +228,10 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6739753225006875755, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6739753225006875755, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: 0 @@ -404,6 +340,10 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7292443971921784066, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7292443971921784066, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: 0 diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab index e2d83854d..a7577cf1d 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab @@ -1994,11 +1994,11 @@ RectTransform: - {fileID: 5989632971468279782} m_Father: {fileID: 1403243596108480373} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 309.05, y: -440} - m_SizeDelta: {x: 81.9, y: 60} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -440} + m_SizeDelta: {x: 0, y: 60} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5205768152149774126 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7915,11 +7915,11 @@ RectTransform: - {fileID: 529583648781627380} m_Father: {fileID: 1403243596108480373} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 263.525, y: -220} - m_SizeDelta: {x: 172.95, y: 60} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: -220} + m_SizeDelta: {x: 172.95001, y: 60} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &468380910157357877 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10067,11 +10067,11 @@ RectTransform: - {fileID: 7292443971921784066} m_Father: {fileID: 1403243596108480373} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 263.525, y: -220} - m_SizeDelta: {x: 172.95, y: 60} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -220} + m_SizeDelta: {x: 0, y: 60} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9180586790238432773 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12107,7 +12107,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 172.95, y: 60} + m_SizeDelta: {x: 210, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6179325732956045293 CanvasRenderer: @@ -12944,9 +12944,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -410} + m_AnchoredPosition: {x: 450.00006, y: -709.99994} m_SizeDelta: {x: 700, y: 600} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6344500107423022425 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12954,7 +12954,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6864905995217350444} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: @@ -13795,11 +13795,11 @@ RectTransform: - {fileID: 6739753225006875755} m_Father: {fileID: 1403243596108480373} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 309.5, y: -440} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -440} m_SizeDelta: {x: 81, y: 60} - m_Pivot: {x: 0, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &248545092022887931 CanvasRenderer: m_ObjectHideFlags: 0 @@ -13851,19 +13851,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 668604389507884601} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3484035362484606752} - m_TargetAssemblyTypeName: BlueWater.Titles.TycoonTitle, Assembly-CSharp - m_MethodName: ShowSettingUi - m_Mode: 1 - 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_Calls: [] --- !u!114 &3468127658355324792 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15090,7 +15078,7 @@ MonoBehaviour: _panel: {fileID: 146274224066469419} _confirmButton: {fileID: 3216032435282479604} _cancelButton: {fileID: 6216237321367475084} - uiEventsController: {fileID: 2548041128191055270} + _uiEventsController: {fileID: 2548041128191055270} --- !u!114 &2548041128191055270 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15170,11 +15158,11 @@ RectTransform: - {fileID: 6552600526867753564} m_Father: {fileID: 1403243596108480373} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 309.5, y: -330} - m_SizeDelta: {x: 81, y: 60} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -330} + m_SizeDelta: {x: 0, y: 60} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1470126346877250000 CanvasRenderer: m_ObjectHideFlags: 0 @@ -15910,11 +15898,11 @@ RectTransform: - {fileID: 949839561363117171} m_Father: {fileID: 1403243596108480373} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 263.525, y: -110} - m_SizeDelta: {x: 172.95, y: 60} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: -110} + m_SizeDelta: {x: 0, y: 60} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &80049197063144741 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonTutorialPopupUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonTutorialPopupUi.prefab index af97fad1c..37a665430 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTutorialPopupUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTutorialPopupUi.prefab @@ -136,6 +136,126 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2723173385454787647 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2497920916766595016} + - component: {fileID: 2909465646098824128} + - component: {fileID: 7039780473959651817} + - component: {fileID: 3714380236608908975} + m_Layer: 5 + m_Name: PreviousButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2497920916766595016 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2723173385454787647} + 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: 773946372628879913} + 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: -225, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2909465646098824128 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2723173385454787647} + m_CullTransparentMesh: 1 +--- !u!114 &7039780473959651817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2723173385454787647} + 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: 1, g: 1, b: 1, a: 0} + 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!114 &3714380236608908975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2723173385454787647} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3492547346428269225 GameObject: m_ObjectHideFlags: 0 @@ -307,6 +427,8 @@ RectTransform: - {fileID: 8058949667021111035} - {fileID: 1278368319364570773} - {fileID: 7967536409115615016} + - {fileID: 2497920916766595016} + - {fileID: 6633534363251468355} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -371,10 +493,132 @@ MonoBehaviour: _descriptionTImageRect: {fileID: 1278368319364570773} _descriptionImage: {fileID: 1623653273502312062} _pageText: {fileID: 6555518522208864136} + _previousButton: {fileID: 3714380236608908975} + _nextButton: {fileID: 7887415417971504661} _descriptionTextAnchorPositionInFirst: {x: 0, y: -37, z: 0} _descriptionTextAnchorPositionExceptFirst: {x: 0, y: -280, z: 0} _descriptionImageAnchorPositionInFirst: {x: 0, y: -210, z: 0} _descriptionImageAnchorPositionExceptFirst: {x: 0, y: -150, z: 0} +--- !u!1 &4722797040062535316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6633534363251468355} + - component: {fileID: 7645622130540550704} + - component: {fileID: 1407687793749698924} + - component: {fileID: 7887415417971504661} + m_Layer: 5 + m_Name: NextButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6633534363251468355 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4722797040062535316} + 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: 773946372628879913} + 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: 225, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7645622130540550704 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4722797040062535316} + m_CullTransparentMesh: 1 +--- !u!114 &1407687793749698924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4722797040062535316} + 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: 1, g: 1, b: 1, a: 0} + 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!114 &7887415417971504661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4722797040062535316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &6641577588875726565 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index cf78280fc..a0da37ad1 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 8e0a3b4ef79b6b240a41c854861466bc m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: 752e2ffa415f639560376d023f23f4fe m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/StreamingAssets/google-services-desktop.json.meta b/Assets/StreamingAssets/google-services-desktop.json.meta index be6f0c8fa..75281813d 100644 --- a/Assets/StreamingAssets/google-services-desktop.json.meta +++ b/Assets/StreamingAssets/google-services-desktop.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d2662f94c98933845b25bbc92ec4d21c +guid: aaf01484b5aa6294da2dd889757423db DefaultImporter: externalObjects: {} userData: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 17842d51d..919595329 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.5.19 + bundleVersion: 0.3.5.20 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}