diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/EmploymentList/ui_Main_EmploymentList_text_LevelRelease_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/EmploymentList/ui_Main_EmploymentList_text_LevelRelease_en.png index 6fa0a470..da3afa0a 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_en/Main/EmploymentList/ui_Main_EmploymentList_text_LevelRelease_en.png and b/popcorn/Assets/MyGame/Resources/Material_en/Main/EmploymentList/ui_Main_EmploymentList_text_LevelRelease_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/EmploymentList/ui_Main_EmploymentList_text_explanation_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/EmploymentList/ui_Main_EmploymentList_text_explanation_en.png index afa8926a..5afd1aa3 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_en/Main/EmploymentList/ui_Main_EmploymentList_text_explanation_en.png and b/popcorn/Assets/MyGame/Resources/Material_en/Main/EmploymentList/ui_Main_EmploymentList_text_explanation_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/WorldMap/ui_Main_WorldMap_investment_text_CannotInvest_en.png b/popcorn/Assets/MyGame/Resources/Material_en/WorldMap/ui_Main_WorldMap_investment_text_CannotInvest_en.png index 02210ebc..71dea2ab 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_en/WorldMap/ui_Main_WorldMap_investment_text_CannotInvest_en.png and b/popcorn/Assets/MyGame/Resources/Material_en/WorldMap/ui_Main_WorldMap_investment_text_CannotInvest_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab b/popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab index 8b5e3822..eb0b92f6 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab @@ -308,7 +308,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &145155683095498776 Transform: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/EarningsReport.unity b/popcorn/Assets/MyGame/Scenes/Main/EarningsReport.unity index 2e92cd65..a4526bab 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/EarningsReport.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/EarningsReport.unity @@ -754,7 +754,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 134, y: 1} - m_SizeDelta: {x: 80, y: 46} + m_SizeDelta: {x: 194, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3565416525690615127 MonoBehaviour: @@ -776,7 +776,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 41f1bdc1aa30f634780ceb49befa643e, type: 3} + m_Sprite: {fileID: 21300000, guid: ca685f840e211244dbdd6eab31d7266a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1034,7 +1034,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 447da0c0cf209fd4aa137a848d6bd938, type: 3} + m_Sprite: {fileID: 21300000, guid: adfd1c6c37d63694c818d8033eb718e9, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1208,7 +1208,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -243} - m_SizeDelta: {x: 410, y: 90} + m_SizeDelta: {x: 474, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3565416526189995022 MonoBehaviour: @@ -1230,9 +1230,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 02c5f1f0dbe0d144582619ea68b7c248, type: 3} + m_Sprite: {fileID: 21300000, guid: fa832138e2b441b4ba135133b4fd2aeb, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2189,7 +2189,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2ff6b9659d0588642a455ec5c4f3b53c, type: 3} + m_Sprite: {fileID: 21300000, guid: 737708b053612744db00faa49331592b, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity b/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity index 9289ee90..ad755fa9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity @@ -182,7 +182,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f58add5cd41545b438b7539bbf5bfd1e, type: 3} + m_Sprite: {fileID: 21300000, guid: f8278233c28e52246bc8a19a9321cdcf, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1364,9 +1364,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd985449102e7a6459fc210b9ded3ef5, type: 3} + m_Sprite: {fileID: 21300000, guid: 61bad48cda3738144bc77835c225ca58, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1696,7 +1696,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d6870a8d39741744881bbd351d08ee14, type: 3} + m_Sprite: {fileID: 21300000, guid: 976615354aeed6447b10d0b8af38290c, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3345,7 +3345,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3400,7 +3400,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -185} - m_SizeDelta: {x: 410, y: 74} + m_SizeDelta: {x: 496, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1532983741 MonoBehaviour: @@ -3422,9 +3422,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 15d0c0f203406f844b2c0a9c2c3d8316, type: 3} + m_Sprite: {fileID: 21300000, guid: e55dbacac069ad442a2e255978169b1f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/Country_investment.prefab b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/Country_investment.prefab index 2c4a12fc..5cb371d1 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/Country_investment.prefab +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/Country_investment.prefab @@ -484,7 +484,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 120, y: 40} + m_SizeDelta: {x: 148, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8294734856787260178 CanvasRenderer: @@ -514,9 +514,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05ba7520dc4dc8c4aaf6a934f155ddaa, type: 3} + m_Sprite: {fileID: 21300000, guid: ad45679f49e629141a7432cd089125f2, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_Earnings.prefab b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_Earnings.prefab index 5a409d9d..4aa64981 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_Earnings.prefab +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_Earnings.prefab @@ -756,9 +756,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9aa1e63b5cdc65b4181212480ca2024f, type: 3} + m_Sprite: {fileID: 21300000, guid: ba2f2fa37c605404cb6e3a9fdc7f1a44, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1378,9 +1378,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 79164a74194a5f142844139159398bf9, type: 3} + m_Sprite: {fileID: 21300000, guid: f0463ba7116397d43a06c4e925eb8b52, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_investment.prefab b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_investment.prefab index defaa521..038b9f82 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_investment.prefab +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_investment.prefab @@ -157,7 +157,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 206} - m_SizeDelta: {x: 398, y: 50} + m_SizeDelta: {x: 784, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7712180188788133480 CanvasRenderer: @@ -187,9 +187,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9464bead3d8ed1d42afeb5bd31235bf2, type: 3} + m_Sprite: {fileID: 21300000, guid: 0235c5bd767444c4d9ff6ac71b7bccb7, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -544,6 +544,12 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6826624183458236136, guid: 2868d1e47b6fed74a97c25434435e03a, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ad45679f49e629141a7432cd089125f2, + type: 3} - target: {fileID: 9075001671066873881, guid: 2868d1e47b6fed74a97c25434435e03a, type: 3} propertyPath: m_Name @@ -691,6 +697,12 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6826624183458236136, guid: 2868d1e47b6fed74a97c25434435e03a, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ad45679f49e629141a7432cd089125f2, + type: 3} - target: {fileID: 9075001671066873881, guid: 2868d1e47b6fed74a97c25434435e03a, type: 3} propertyPath: m_Name @@ -838,6 +850,12 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6826624183458236136, guid: 2868d1e47b6fed74a97c25434435e03a, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ad45679f49e629141a7432cd089125f2, + type: 3} - target: {fileID: 9075001671066873881, guid: 2868d1e47b6fed74a97c25434435e03a, type: 3} propertyPath: m_Name diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap.unity index 411daea8..e719e83c 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap.unity @@ -2551,7 +2551,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3220,7 +3220,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 160941bed35792f48ad51714771b93d9, type: 3} + m_Sprite: {fileID: 21300000, guid: 6e8df96adcd85c84682c84ca72deeedf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3690,19 +3690,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1834691514} m_CullTransparentMesh: 1 ---- !u!114 &1837516015 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 6623300115527934461} --- !u!1 &1841869822 GameObject: m_ObjectHideFlags: 0 @@ -4771,6 +4758,12 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6623300116599430673, guid: e3969194f788d4488be24bb1534e0aa8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ba2f2fa37c605404cb6e3a9fdc7f1a44, + type: 3} - target: {fileID: 6623300116637565168, guid: e3969194f788d4488be24bb1534e0aa8, type: 3} propertyPath: m_Name @@ -4886,6 +4879,12 @@ PrefabInstance: propertyPath: mLocalizeTarget value: objectReference: {fileID: 425304213} + - target: {fileID: 6623300117438917479, guid: e3969194f788d4488be24bb1534e0aa8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f0463ba7116397d43a06c4e925eb8b52, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3969194f788d4488be24bb1534e0aa8, type: 3} --- !u!114 &6623300115527934460 stripped @@ -4900,18 +4899,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6623300115527934461 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6623300116599430673, guid: e3969194f788d4488be24bb1534e0aa8, - type: 3} - m_PrefabInstance: {fileID: 6623300115527934459} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &6623300115527934462 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6623300117438917479, guid: e3969194f788d4488be24bb1534e0aa8, diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity index 87565f4f..839ae45a 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity @@ -395,7 +395,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 65} - m_SizeDelta: {x: 334, y: 44} + m_SizeDelta: {x: 552, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &155864997 MonoBehaviour: @@ -417,9 +417,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d886945c6b600664398d63aa0bb0cf1a, type: 3} + m_Sprite: {fileID: 21300000, guid: 3debe076b55bc1f4a97588578f208bd8, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -865,7 +865,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} + m_Sprite: {fileID: 21300000, guid: 31f5a049028df4d4a8df7222be280a77, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1715,7 +1715,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 16, y: 47} - m_SizeDelta: {x: 110, y: 44} + m_SizeDelta: {x: 164, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &875533062 MonoBehaviour: @@ -1737,9 +1737,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4581f87e85b04a64487c80c31780b98d, type: 3} + m_Sprite: {fileID: 21300000, guid: 6594943fa543cb44abc544ad688e73cc, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2064,7 +2064,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -313, y: 7.9} - m_SizeDelta: {x: 76, y: 44} + m_SizeDelta: {x: 190, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1165530389 MonoBehaviour: @@ -2086,9 +2086,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7a8435e514cf2514591f0bcf7a604ccb, type: 3} + m_Sprite: {fileID: 21300000, guid: d48f466a7fb0d8d49a5adeea18e25613, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2318,7 +2318,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8a99c193f6fae11438ad949fa1bb941d, type: 3} + m_Sprite: {fileID: 21300000, guid: ec2a09c5fab3dc44488a50a9c1415e5c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2552,7 +2552,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 120, y: 40} + m_SizeDelta: {x: 148, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1373024627 MonoBehaviour: @@ -2574,9 +2574,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 537db4d685e71934aac751eb57333cf3, type: 3} + m_Sprite: {fileID: 21300000, guid: 7b4e12a6d874b35458cd3b08307052e4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3485,7 +3485,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 120, y: 40} + m_SizeDelta: {x: 148, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1902803494 MonoBehaviour: @@ -3507,9 +3507,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05ba7520dc4dc8c4aaf6a934f155ddaa, type: 3} + m_Sprite: {fileID: 21300000, guid: ad45679f49e629141a7432cd089125f2, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity index 1f48bd56..b749b585 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity @@ -129,6 +129,19 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1002606733} m_PrefabAsset: {fileID: 0} +--- !u!114 &157854121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1984307938} --- !u!1001 &176446250 PrefabInstance: m_ObjectHideFlags: 0 @@ -972,19 +985,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7265478335887242399} m_PrefabAsset: {fileID: 0} ---- !u!114 &505161160 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1984307938} --- !u!1001 &551351683 PrefabInstance: m_ObjectHideFlags: 0 @@ -7080,6 +7080,12 @@ PrefabInstance: propertyPath: m_MaskInteraction value: 1 objectReference: {fileID: 0} + - target: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d34a42fae8361314fbe36511c05a1b18, + type: 3} - target: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_MaskInteraction @@ -9474,7 +9480,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 27850bcf9ca66f14bb113c68540873f6, type: 3} + m_Sprite: {fileID: 21300000, guid: 056fc7472857bab4088ba8097db6e216, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -11068,7 +11074,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab index e680791f..76ddf314 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab @@ -811,6 +811,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 145155683095498777, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, type: 3} --- !u!4 &6725113440112460167 stripped