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 000000000..4b73c9afd Binary files /dev/null and b/Assets/03.Images/Ui/Balloon/BartenderBalloonEmpty.png differ diff --git a/Assets/03.Images/Ui/Balloon/BartenderBalloonEmpty.png.meta b/Assets/03.Images/Ui/Balloon/BartenderBalloonEmpty.png.meta new file mode 100644 index 000000000..df1416d28 --- /dev/null +++ b/Assets/03.Images/Ui/Balloon/BartenderBalloonEmpty.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: b555c8bc93f2c744f96dc4b1dc18544e +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/BartenderBalloonFilled.png b/Assets/03.Images/Ui/Balloon/BartenderBalloonFilled.png new file mode 100644 index 000000000..260f1bfeb Binary files /dev/null and b/Assets/03.Images/Ui/Balloon/BartenderBalloonFilled.png differ 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 000000000..19e4865c3 Binary files /dev/null and b/Assets/03.Images/Ui/Balloon/CenterBalloon02.png differ 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 000000000..8c74b9c6c Binary files /dev/null and b/Assets/03.Images/Ui/Balloon/PlayerBalloon02.png differ 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 000000000..01056492d Binary files /dev/null and b/Assets/03.Images/Ui/Balloon/PlayerBalloonDouble.png differ 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}