From 8ac96a85fe979d8d10540c7993021b803e4ecccb Mon Sep 17 00:00:00 2001 From: koya_15 Date: Thu, 9 Sep 2021 09:55:55 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E4=B8=80=E9=83=A8?= =?UTF-8?q?=E9=9D=9E=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/CornField/CornField.unity | 18 +- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 29 +- .../MyGame/Scenes/Main/Prefabs/Canvas.prefab | 280 ++++++++++++---- .../Scenes/marketing/ProductManagement.unity | 12 +- .../MyGame/Scenes/marketing/marketing.unity | 303 +----------------- .../MyGame/Scenes/shopping/shopping.unity | 108 ++++--- 6 files changed, 323 insertions(+), 427 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 2a7605bc..d7cd279d 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -705,8 +705,12 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 320398124, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.y - value: 473 + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 320398124, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 1453424322, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite @@ -746,6 +750,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 54277269..925e04d6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -1689,6 +1689,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 664519285002385818, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x @@ -1936,13 +1941,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: -339.2998 + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.69922 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916833780733955, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1951,13 +1956,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3664916833805477842, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: -698.0996 + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916833805477842, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.69922 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1966,13 +1971,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: -519.2002 + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.69922 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 746b8cba..c6373459 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -285,7 +285,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 43, y: 286} + m_AnchoredPosition: {x: 43, y: 473} m_SizeDelta: {x: 300, y: 202} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &320398127 @@ -888,6 +888,200 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &566248750470715636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 655651630893765691} + - component: {fileID: 7031342967731239570} + - component: {fileID: 3380000601969954953} + - component: {fileID: 8545829044125670743} + m_Layer: 5 + m_Name: Button_publicity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &655651630893765691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 566248750470715636} + 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: 4146400484972392966} + - {fileID: 2609057251471961254} + m_Father: {fileID: 3664916832844628215} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 43, y: 473} + m_SizeDelta: {x: 300, y: 202} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7031342967731239570 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 566248750470715636} + m_CullTransparentMesh: 0 +--- !u!114 &3380000601969954953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 566248750470715636} + 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: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 07b37f98942beee44ad83b3152265db4, type: 3} + m_Type: 1 + 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 &8545829044125670743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 566248750470715636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + 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: 3380000601969954953} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &698401032965878637 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4146400484972392966} + - component: {fileID: 4843747900394199324} + - component: {fileID: 3901458240154979865} + m_Layer: 5 + m_Name: icon_publicity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4146400484972392966 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698401032965878637} + 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: 655651630893765691} + 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: 52, y: 55} + m_SizeDelta: {x: 126, y: 118} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4843747900394199324 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698401032965878637} + m_CullTransparentMesh: 0 +--- !u!114 &3901458240154979865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698401032965878637} + 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: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 432fc61df22246a4bae187c5f0d38b32, 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 &3664916832564167473 GameObject: m_ObjectHideFlags: 0 @@ -1020,8 +1214,8 @@ RectTransform: - {fileID: 3664916834121473268} - {fileID: 320398124} - {fileID: 130281750} - - {fileID: 7545339558603919741} - {fileID: 6205448659049427752} + - {fileID: 655651630893765691} m_Father: {fileID: 3664916832564167477} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1313,7 +1507,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4348639590627783772 +--- !u!1 &4527791912016219838 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1321,51 +1515,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7545339558603919741} - - component: {fileID: 8296093917392722970} - - component: {fileID: 4821021837900289289} - - component: {fileID: 7531875257892798882} + - component: {fileID: 2609057251471961254} + - component: {fileID: 2411136131736408551} + - component: {fileID: 8117515348220274205} m_Layer: 5 - m_Name: Button_ProductManagement + m_Name: Image_text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7545339558603919741 +--- !u!224 &2609057251471961254 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4348639590627783772} - m_LocalRotation: {x: 0, y: 0, z: -0.10452837, w: 0.9945219} + m_GameObject: {fileID: 4527791912016219838} + 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: 3664916832844628215} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12} + m_Father: {fileID: 655651630893765691} + 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} - m_AnchoredPosition: {x: -403, y: 760} - m_SizeDelta: {x: 174, y: 186} + m_AnchoredPosition: {x: 42, y: -29.000061} + m_SizeDelta: {x: 90, y: 48} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8296093917392722970 +--- !u!222 &2411136131736408551 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4348639590627783772} + m_GameObject: {fileID: 4527791912016219838} m_CullTransparentMesh: 0 ---- !u!114 &4821021837900289289 +--- !u!114 &8117515348220274205 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4348639590627783772} + m_GameObject: {fileID: 4527791912016219838} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1378,7 +1571,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 894108bc2d0b2ed46a5f6efb09070f6e, type: 3} + m_Sprite: {fileID: 21300000, guid: 3be9a3bcc8d7c864a97b5be41e33418f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1388,49 +1581,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7531875257892798882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4348639590627783772} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - 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: 4821021837900289289} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &6396292362141172708 GameObject: m_ObjectHideFlags: 0 @@ -1461,7 +1611,7 @@ RectTransform: - {fileID: 664519285002385818} - {fileID: 6595414695695406318} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 6 + 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} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 200aebd2..2eb6a5e7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -985,6 +985,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} - target: {fileID: 1174152333972670060, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_fontColor.a @@ -2383,7 +2393,7 @@ RectTransform: m_Children: - {fileID: 1611898339} m_Father: {fileID: 219610915} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 39523790..c36f1af2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -1342,126 +1342,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 714437464} m_PrefabAsset: {fileID: 0} ---- !u!1 &427456890 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 427456891} - - component: {fileID: 427456894} - - component: {fileID: 427456893} - - component: {fileID: 427456892} - m_Layer: 5 - m_Name: Button_publicity - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &427456891 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427456890} - 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: 1340184477} - - {fileID: 1406010699} - m_Father: {fileID: 1991225675} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 43, y: 473} - m_SizeDelta: {x: 300, y: 202} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &427456892 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427456890} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - 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: 427456893} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &427456893 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427456890} - 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: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 07b37f98942beee44ad83b3152265db4, type: 3} - m_Type: 1 - 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!222 &427456894 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427456890} - m_CullTransparentMesh: 0 --- !u!1 &438315598 GameObject: m_ObjectHideFlags: 0 @@ -2444,41 +2324,16 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -339.30078 - objectReference: {fileID: 0} - - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.70312 - objectReference: {fileID: 0} - - target: {fileID: 3664916833805477842, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -698.10156 - objectReference: {fileID: 0} - - target: {fileID: 3664916833805477842, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.70312 - objectReference: {fileID: 0} - - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -519.1992 - objectReference: {fileID: 0} - - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.70312 - objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 260.69922 + objectReference: {fileID: 0} - target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x @@ -4071,80 +3926,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1340184476 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1340184477} - - component: {fileID: 1340184479} - - component: {fileID: 1340184478} - m_Layer: 5 - m_Name: icon_publicity - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1340184477 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1340184476} - 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: 427456891} - 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: 52, y: 55} - m_SizeDelta: {x: 126, y: 118} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1340184478 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1340184476} - 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: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 432fc61df22246a4bae187c5f0d38b32, 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!222 &1340184479 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1340184476} - m_CullTransparentMesh: 0 --- !u!1 &1353474824 GameObject: m_ObjectHideFlags: 0 @@ -4307,80 +4088,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1406010698 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1406010699} - - component: {fileID: 1406010701} - - component: {fileID: 1406010700} - m_Layer: 5 - m_Name: Image_text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1406010699 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406010698} - 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: 427456891} - 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} - m_AnchoredPosition: {x: 42, y: -29.000061} - m_SizeDelta: {x: 90, y: 48} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1406010700 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406010698} - 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: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3be9a3bcc8d7c864a97b5be41e33418f, 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!222 &1406010701 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406010698} - m_CullTransparentMesh: 0 --- !u!1 &1427218219 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index f48fe00c..8328146a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -155,9 +155,9 @@ RectTransform: m_Father: {fileID: 1999276911} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 490, y: 605} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &38996725 @@ -399,9 +399,9 @@ RectTransform: m_Father: {fileID: 1999276911} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 605} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &182799802 @@ -573,7 +573,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -583,7 +583,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -633,12 +633,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: -1439.4999 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -982,7 +982,7 @@ RectTransform: - {fileID: 1102915446} - {fileID: 1615189014} m_Father: {fileID: 1098091308} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1033,7 +1033,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1043,7 +1043,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1093,12 +1093,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: -1043.2999 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1170,7 +1170,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -525} - m_SizeDelta: {x: 18, y: 1734.5999} + m_SizeDelta: {x: 18, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &733707100 MonoBehaviour: @@ -1503,7 +1503,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1513,7 +1513,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1563,12 +1563,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: -1241.3999 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1831,6 +1831,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -1894,47 +1904,47 @@ PrefabInstance: - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x - value: 42 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.y - value: -36 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x - value: 141.43484 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x - value: 166.71742 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916832564167473, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -2064,7 +2074,7 @@ PrefabInstance: - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x - value: 267.43484 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -2200,7 +2210,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2210,7 +2220,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2260,12 +2270,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: -647.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2435,7 +2445,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2445,7 +2455,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2495,12 +2505,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: -845.19995 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2592,7 +2602,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2602,7 +2612,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2652,12 +2662,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: -1637.5999 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3123,9 +3133,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -21, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1886176504 MonoBehaviour: @@ -3289,7 +3299,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 526, y: -564} - m_SizeDelta: {x: 514, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1999276912 MonoBehaviour: @@ -3364,7 +3374,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3374,7 +3384,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3424,12 +3434,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: -449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3}