diff --git a/Assets/01.Scenes/00.TycoonTitle.unity b/Assets/01.Scenes/00.TycoonTitle.unity index 106d50ea9..6a5fcd96e 100644 --- a/Assets/01.Scenes/00.TycoonTitle.unity +++ b/Assets/01.Scenes/00.TycoonTitle.unity @@ -7514,11 +7514,7 @@ PrefabInstance: value: 82.81 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 + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} @@ -7538,11 +7534,7 @@ PrefabInstance: value: 82.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 + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} @@ -7686,11 +7678,7 @@ PrefabInstance: value: 175.73 objectReference: {fileID: 0} - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 1996c895b..f3d809a63 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -11035,7 +11035,6 @@ GameObject: - component: {fileID: 1049919590} - component: {fileID: 1049919589} - component: {fileID: 1049919593} - - component: {fileID: 1049919594} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -11153,21 +11152,6 @@ MonoBehaviour: k__BackingField: {fileID: 1049919591} k__BackingField: {fileID: 410235869} _fadeImage: {fileID: 2055805162} ---- !u!114 &1049919594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1049919588} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e393933351b7da9489595d2aeb25135d, type: 3} - m_Name: - m_EditorClassIdentifier: - _uiIndicator: {fileID: 5148248962339400161, guid: 9c308e38b5681564fbdbad324594baee, type: 3} - _widthPadding: {x: 70, y: 70} - _heightPadding: {x: 70, y: 70} --- !u!1 &1054626872 GameObject: m_ObjectHideFlags: 0 @@ -12467,6 +12451,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1176872992} 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 @@ -13687,6 +13676,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 192967474504919650, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 206150334458064667, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 271976367226201846, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -13823,6 +13820,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 854623182969124375, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 906431724544234919, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13875,6 +13876,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1123204253135645794, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1200502737992636705, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -14135,6 +14140,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2378963517708785758, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410038165437406503, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2505930409410496090, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14255,6 +14268,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2914518436451484715, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2936459360025051519, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Mesh value: @@ -14295,6 +14312,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3186336333613178462, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3277011480977519073, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -14663,6 +14684,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4966564567404332244, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4987975325252724506, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14719,6 +14744,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 5140175868285499029, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5227324930555586236, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14971,6 +15000,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6097027034377089568, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6198619660343708688, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Mesh value: @@ -15131,6 +15164,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7276650302940742825, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7304138290650449805, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -15159,6 +15196,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7440650799058384616, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7456244596060221628, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -15355,6 +15396,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8589127114732290076, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8742177585021775170, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -18909,7 +18954,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} + m_FirstSelected: {fileID: 1184003924} m_sendNavigationEvents: 1 m_DragThreshold: 10 --- !u!4 &1619849090 diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index 5c0cf7868..81870b204 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -505,7 +505,7 @@ namespace BlueWater.Npcs.Customers IsOrderedCorrected = false; OrderedCocktailData = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData(); var hurryTime = CurrentLevelData.HurryTime + TycoonManager.Instance.TycoonStatus.CustomerHurryTimeIncrease; - CurrentTableSeat.MenuBalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, true, _startColor, _endColor); + CurrentTableSeat.MenuBalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, startColor: _startColor, endColor: _endColor); _customerInteractionType = CustomerInteractionType.ServedCocktail; RegisterPlayerInteraction(); diff --git a/Assets/02.Scripts/SceneController.cs b/Assets/02.Scripts/SceneController.cs index 011574978..8a93fbf14 100644 --- a/Assets/02.Scripts/SceneController.cs +++ b/Assets/02.Scripts/SceneController.cs @@ -17,8 +17,8 @@ namespace BlueWater protected override void OnAwake() { - _fadeIn = _fadeImage.DOFade(1f, 2f).From(0f).SetUpdate(true).SetAutoKill(false).Pause().OnComplete(MoveCombatScene); - _fadeOut = _fadeImage.DOFade(0f, 2f).From(1f).SetUpdate(true).SetAutoKill(false).Pause().SetDelay(3f).OnComplete(EventManager.InvokeInitializedPlayerInput); + _fadeIn = _fadeImage.DOFade(1f, 1f).From(0f).SetUpdate(true).SetAutoKill(false).Pause().OnComplete(MoveCombatScene); + _fadeOut = _fadeImage.DOFade(0f, 0.5f).From(1f).SetUpdate(true).SetAutoKill(false).Pause().SetDelay(3f).OnComplete(EventManager.InvokeInitializedPlayerInput); _fadeImage.color = new Color(0, 0, 0, 0); } @@ -34,7 +34,7 @@ namespace BlueWater SceneManager.sceneLoaded -= OnSceneLoaded; _fadeIn.Kill(); - _fadeIn.Kill(); + _fadeOut.Kill(); } public void FadeIn() diff --git a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset index 2bf3e8acf..d4d78cac4 100644 --- a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset @@ -20,8 +20,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: Upgrade0 k__BackingField: 0 @@ -33,8 +33,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 200 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: k__BackingField: 0 @@ -46,8 +46,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 200 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: k__BackingField: 0 @@ -59,8 +59,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 200 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: k__BackingField: 0 @@ -72,8 +72,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 200 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: Upgrade1 k__BackingField: 1 @@ -85,8 +85,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: k__BackingField: 0 @@ -98,8 +98,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: k__BackingField: 0 @@ -111,8 +111,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: k__BackingField: 0 @@ -124,8 +124,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: k__BackingField: 0 @@ -137,8 +137,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: Upgrade2 k__BackingField: 1 @@ -150,8 +150,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: k__BackingField: 0 @@ -163,8 +163,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: k__BackingField: 0 @@ -176,8 +176,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: k__BackingField: 0 @@ -189,8 +189,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: k__BackingField: 0 @@ -202,8 +202,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: Upgrade3 k__BackingField: 1 @@ -215,8 +215,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: k__BackingField: 0 @@ -228,8 +228,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: k__BackingField: 0 @@ -241,8 +241,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: k__BackingField: 0 @@ -254,8 +254,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: k__BackingField: 0 @@ -267,8 +267,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: Upgrade4 k__BackingField: 1 @@ -280,8 +280,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -293,8 +293,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -306,8 +306,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -319,8 +319,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -332,8 +332,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: Upgrade5 k__BackingField: 1 @@ -345,8 +345,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -358,8 +358,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -371,8 +371,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -384,8 +384,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -397,8 +397,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 4 k__BackingField: Upgrade6 k__BackingField: 1 @@ -410,8 +410,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -423,8 +423,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -436,8 +436,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -449,8 +449,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -462,8 +462,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 1 @@ -475,8 +475,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -488,8 +488,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -501,8 +501,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -514,8 +514,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -527,8 +527,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 1 @@ -540,8 +540,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -553,8 +553,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -566,8 +566,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -579,8 +579,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -592,8 +592,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 1 @@ -605,8 +605,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 - k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 12 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -618,8 +618,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 - k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 12 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -631,8 +631,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 - k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 12 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -644,8 +644,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 - k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 12 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -657,7 +657,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 + k__BackingField: 0 k__BackingField: 6 k__BackingField: 4 k__BackingField: diff --git a/Assets/02.Scripts/Ui/Title/TitleOptions.cs b/Assets/02.Scripts/Ui/Title/TitleOptions.cs index 2ae94cf9c..379b20d43 100644 --- a/Assets/02.Scripts/Ui/Title/TitleOptions.cs +++ b/Assets/02.Scripts/Ui/Title/TitleOptions.cs @@ -1,64 +1,109 @@ +using System; using System.Collections; using BlueWater; using BlueWater.Audios; +using BlueWater.Uis; using TMPro; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.UI; -public class TitleOptions : MonoBehaviour +public class TitleOptions : PopupUi { [SerializeField] private GameObject _panel; - + [SerializeField] private Slider _masterVolume; - + [SerializeField] private Slider _bgmVolume; - + [SerializeField] private Slider _sfxVolume; [SerializeField] private TMP_Dropdown _languageDropdown; - + private AudioManager _audioManager; - - public InputAction CancelAction { get; private set; } - + + private InputAction _interactionEAction; + private InputAction _closeOptionsAction; + public Action CloseOptions; + private void Start() { - CancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); - + _interactionEAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE); + _closeOptionsAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); + _audioManager = AudioManager.Instance; var masterVolume = ES3.Load("MasterVolume", 1f); SetMasterVolume(masterVolume); - + var bgmVolume = ES3.Load("BgmVolume", 1f); SetBgmVolume(bgmVolume); - + var sfxVolume = ES3.Load("SfxVolume", 1f); SetSfxVolume(sfxVolume); StartCoroutine(nameof(InitializeLanguage)); } + private void OnDestroy() + { + if (_interactionEAction != null) + { + _interactionEAction.performed -= OnInteractionE; + } + + if (_closeOptionsAction != null) + { + _closeOptionsAction.performed -= OnCloseOptions; + } + } + + public override void Open() + { + PopupUiController.RegisterPopup(this); + _panel.SetActive(true); + IsOpened = true; + } + + public override void Close() + { + _panel.SetActive(false); + PopupUiController.UnregisterPopup(this); + IsOpened = false; + } + + public override void EnableInput() + { + _interactionEAction.performed += OnInteractionE; + _closeOptionsAction.performed += OnCloseOptions; + } + + public override void DisableInput() + { + _interactionEAction.performed -= OnInteractionE; + _closeOptionsAction.performed -= OnCloseOptions; + } + public void SetMasterVolume(float value) { _audioManager.SetMasterVolume(value); _masterVolume.value = value; ES3.Save("MasterVolume", value); } - + public void SetBgmVolume(float value) { _audioManager.SetBgmVolume(value); _bgmVolume.value = value; ES3.Save("BgmVolume", value); } - + public void SetSfxVolume(float value) { _audioManager.SetSfxVolume(value); @@ -69,7 +114,7 @@ public class TitleOptions : MonoBehaviour private IEnumerator InitializeLanguage() { yield return new WaitUntil(() => LocalizationManager.Instance.IsInitialized); - + var languageIndex = LocalizationManager.Instance.GetCurrentLocaleIndex(); _languageDropdown.value = languageIndex; } @@ -79,14 +124,18 @@ public class TitleOptions : MonoBehaviour _languageDropdown.value = localeType; LocalizationManager.Instance.ChangeLocale((LocaleType)localeType); } - - public void ShowUi() + + public void OnInteractionE(InputAction.CallbackContext context) { - _panel.SetActive(true); + var current = EventSystem.current.currentSelectedGameObject; + if (!current) return; + + var currenButton = current.GetComponent