diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_change.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_change.prefab index 3608b56c..9f3152e0 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_change.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_change.prefab @@ -30,11 +30,11 @@ RectTransform: m_LocalScale: {x: 0.45, y: 0.45, z: 0.45} m_Children: [] m_Father: {fileID: 3910593344630799909} - m_RootOrder: 3 + m_RootOrder: 4 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: 41.3, y: 17.50005} + m_AnchoredPosition: {x: 41.3, y: 17.5} m_SizeDelta: {x: 170, y: 404} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5411650623436018722 @@ -104,11 +104,11 @@ RectTransform: m_LocalScale: {x: 0.45, y: 0.45, z: 0.45} m_Children: [] m_Father: {fileID: 3910593344630799909} - m_RootOrder: 1 + 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} - m_AnchoredPosition: {x: 41.3, y: 17.50005} + m_AnchoredPosition: {x: 41.3, y: 17.5} m_SizeDelta: {x: 170, y: 404} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &497755294262526009 @@ -179,7 +179,7 @@ RectTransform: m_Children: - {fileID: 3910593342547943750} m_Father: {fileID: 3910593344630799909} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -387,7 +387,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3910593344630799909} - m_RootOrder: 0 + 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} @@ -454,10 +454,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3910593344630799910} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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_Children: + - {fileID: 7320877948714771483} - {fileID: 3910593343680838032} - {fileID: 4409112968089360317} - {fileID: 199668613266706433} @@ -471,6 +472,80 @@ RectTransform: m_AnchoredPosition: {x: -160, y: 41} m_SizeDelta: {x: 200, y: 220} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5208769480954757392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7320877948714771483} + - component: {fileID: 7730610960078161165} + - component: {fileID: 1032536407935869193} + m_Layer: 5 + m_Name: soil_frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7320877948714771483 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5208769480954757392} + 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_Children: [] + m_Father: {fileID: 3910593344630799909} + 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} + m_AnchoredPosition: {x: 0, y: -77.13} + m_SizeDelta: {x: 200, y: 65.744385} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7730610960078161165 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5208769480954757392} + m_CullTransparentMesh: 0 +--- !u!114 &1032536407935869193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5208769480954757392} + 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: 0.4627451, g: 0.32156864, b: 0.20784314, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2e124af6eaea54b0ab5378b97039ad76, type: 3} + 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!1 &8792014694231266041 GameObject: m_ObjectHideFlags: 0 @@ -501,7 +576,7 @@ RectTransform: m_LocalScale: {x: 0.45, y: 0.45, z: 0.45} m_Children: [] m_Father: {fileID: 3910593344630799909} - m_RootOrder: 2 + 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} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index c87b3617..f37ae3f2 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -2659,7 +2659,7 @@ PrefabInstance: - target: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6 objectReference: {fileID: 0} - target: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3} @@ -2799,7 +2799,7 @@ PrefabInstance: - target: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6 objectReference: {fileID: 0} - target: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3}