diff --git a/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab b/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab index 3220bcc7..bc1039a1 100644 --- a/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab +++ b/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 592905858299255810} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -85,7 +85,7 @@ GameObject: - component: {fileID: 592905858299255810} - component: {fileID: 592905858299255809} m_Layer: 5 - m_Name: rare + m_Name: rare_Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -102,10 +102,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 592905859906714104} - {fileID: 592905858270211530} - {fileID: 592905858709072378} - {fileID: 592905859427273352} + - {fileID: 592905859906714104} - {fileID: 592905858453892995} m_Father: {fileID: 0} m_RootOrder: 0 @@ -237,7 +237,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 592905858299255810} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -311,7 +311,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 592905858299255810} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -367,7 +367,7 @@ GameObject: - component: {fileID: 592905859906714054} - component: {fileID: 592905859906714055} m_Layer: 5 - m_Name: rare_yellow + m_Name: rare_purple m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -385,7 +385,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 592905858299255810} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -419,7 +419,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e8cfd4afcd59ebe4a9a500ec4f1a7ec4, type: 3} + m_Sprite: {fileID: 21300000, guid: 0f8b056c4d31eb840a4f89267e8122b3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index fb029f11..85a6ecad 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -2052,6 +2052,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3658417434568161581} m_Modifications: + - target: {fileID: 592905858299255809, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: goldObject + value: + objectReference: {fileID: 5676996119271212837} + - target: {fileID: 592905858299255809, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: copperObject + value: + objectReference: {fileID: 5676996118073317159} + - target: {fileID: 592905858299255809, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: silverObject + value: + objectReference: {fileID: 5676996118944887893} + - target: {fileID: 592905858299255809, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: yellowObject + value: + objectReference: {fileID: 5676996117785711383} - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, type: 3} propertyPath: m_Pivot.x @@ -2197,3 +2217,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01738374a494495b82539c6ff39c1a3a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &5676996117785711383 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 592905858270211531, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + m_PrefabInstance: {fileID: 5112378705130438364} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5676996118073317159 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 592905858709072379, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + m_PrefabInstance: {fileID: 5112378705130438364} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5676996118944887893 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 592905859427273353, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + m_PrefabInstance: {fileID: 5112378705130438364} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5676996119271212837 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 592905859906714105, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + m_PrefabInstance: {fileID: 5112378705130438364} + m_PrefabAsset: {fileID: 0}