diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap.unity index 5142a548..1754ec8c 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap.unity @@ -793,7 +793,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1647324203} + mTarget: {fileID: 6623300115527934460} --- !u!1 &515787033 GameObject: m_ObjectHideFlags: 0 @@ -2077,7 +2077,7 @@ MonoBehaviour: mGUI_ShowReferences: 1 mGUI_ShowTems: 1 mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 0} + mLocalizeTarget: {fileID: 1628284967} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!114 &1216538835 MonoBehaviour: @@ -2492,6 +2492,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1560787479} m_CullTransparentMesh: 1 +--- !u!114 &1628284967 +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: 1216538835} --- !u!1 &1635865851 GameObject: m_ObjectHideFlags: 0 @@ -2586,18 +2599,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1635865851} m_CullTransparentMesh: 1 ---- !u!114 &1647324203 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7712180188729185430, guid: f76f2a61006784d39ab3f1e1b9baa1d2, - type: 3} - m_PrefabInstance: {fileID: 7712180188229023933} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1652587521 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8583778246870746332, guid: 572bc07a061f76c43a8f59298be43cbe, @@ -3784,6 +3785,18 @@ PrefabInstance: objectReference: {fileID: 425304213} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3969194f788d4488be24bb1534e0aa8, type: 3} +--- !u!114 &6623300115527934460 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6623300116970052218, 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: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7712180188229023933 PrefabInstance: m_ObjectHideFlags: 0 @@ -3950,6 +3963,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: near clip plane + value: -1 + objectReference: {fileID: 0} - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} propertyPath: m_RootOrder @@ -4010,5 +4028,10 @@ PrefabInstance: propertyPath: m_Name value: UICamera objectReference: {fileID: 0} + - target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity index 8a9f293e..9bbd15ca 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity @@ -129,19 +129,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1002606733} m_PrefabAsset: {fileID: 0} ---- !u!114 &124714251 -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: 1757378144} --- !u!1001 &176446250 PrefabInstance: m_ObjectHideFlags: 0 @@ -6335,6 +6322,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_Depth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: far clip plane + value: 0.3 + objectReference: {fileID: 0} - target: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} propertyPath: m_CullingMask.m_Bits @@ -6358,7 +6355,7 @@ PrefabInstance: - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -8.73 objectReference: {fileID: 0} - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} @@ -6400,6 +6397,11 @@ PrefabInstance: propertyPath: m_Name value: UICamera objectReference: {fileID: 0} + - target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} --- !u!20 &952870154 stripped @@ -6602,6 +6604,11 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 1643197593358678244, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1644028914564080632, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_Layer @@ -6922,6 +6929,11 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 2604554618883511459, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2627627282437205265, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_Layer @@ -7292,6 +7304,11 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 3772962303616501398, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3957144827480980542, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_Layer @@ -9019,19 +9036,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5bfa266420af43d6acc01f297b04ba13, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1182246439 -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: 1755278145} --- !u!1001 &1202825163 PrefabInstance: m_ObjectHideFlags: 0 @@ -9931,18 +9935,25 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1589328371} m_PrefabAsset: {fileID: 0} +--- !u!114 &1628284967 +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: 1755278145} --- !u!212 &1755278145 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} m_PrefabInstance: {fileID: 1002606733} m_PrefabAsset: {fileID: 0} ---- !u!212 &1757378144 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 5124423628195254865, guid: 343971e948dfe44ddab5ab4f736c3f06, - type: 3} - m_PrefabInstance: {fileID: 1002606733} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1812389906 PrefabInstance: m_ObjectHideFlags: 0