From b587f817093bbf5a825cb01649a74c0778b70d06 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 8 Sep 2021 17:55:16 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BB=95=E5=85=A5=E3=82=8C=E3=82=BF=E3=83=96Vi?= =?UTF-8?q?ew=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shopping/Scripts/ShopHeaderTabView.cs | 18 + .../Scripts/ShopHeaderTabView.cs.meta | 3 + .../Scenes/shopping/Scripts/ShopHeaderView.cs | 33 ++ .../shopping/Scripts/ShopHeaderView.cs.meta | 3 + .../MyGame/Scenes/shopping/shopping.unity | 407 ++++++++---------- 5 files changed, 240 insertions(+), 224 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs new file mode 100644 index 00000000..fdaa4880 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs @@ -0,0 +1,18 @@ +using System; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class ShopHeaderTabView : MonoBehaviour +{ + [SerializeField] private Button button; + [SerializeField] private GameObject onObject; + [SerializeField] private GameObject offObject; + + public IObservable ClickObservable => button.OnClickAsObservable().TakeUntilDestroy(this); + public void SetToggle(bool active) + { + onObject.SetActive(active); + offObject.SetActive(!active); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs.meta b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs.meta new file mode 100644 index 00000000..625c1abe --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c8f923fbd6b4418ab2b578c5688d314e +timeCreated: 1631089705 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs new file mode 100644 index 00000000..85cfce0f --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs @@ -0,0 +1,33 @@ +using System; +using UniRx; +using UnityEngine; + +public enum ShopHeaderTab +{ + Material, + Recipe +} +public class ShopHeaderView : MonoBehaviour +{ + [SerializeField] private ShopHeaderTabView materialTab; + [SerializeField] private ShopHeaderTabView recipeTab; + + public IReadOnlyReactiveProperty Tab => tab; + private readonly ReactiveProperty tab = new ReactiveProperty(); + private void Start() + { + tab.AddTo(this); + tab.Value = ShopHeaderTab.Material; + tab.Subscribe(tabName => + { + materialTab.SetToggle(tabName == ShopHeaderTab.Material); + recipeTab.SetToggle(tabName == ShopHeaderTab.Recipe); + }).AddTo(this); + materialTab.ClickObservable.Select(_ => ShopHeaderTab.Material) + .Merge(recipeTab.ClickObservable.Select(_ => ShopHeaderTab.Recipe)) + .Subscribe(tabName => + { + tab.Value = tabName; + }).AddTo(this); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs.meta b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs.meta new file mode 100644 index 00000000..2324c789 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 988fc455527e44edbbc26f8ebb8d5f56 +timeCreated: 1631089253 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index aee97239..f48fe00c 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -130,6 +130,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 38996724} + - component: {fileID: 38996726} + - component: {fileID: 38996725} m_Layer: 5 m_Name: Button_recipe m_TagString: Untagged @@ -153,11 +155,69 @@ RectTransform: m_Father: {fileID: 1999276911} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 490, y: 605} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &38996725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38996723} + 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: 0 + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &38996726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38996723} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8f923fbd6b4418ab2b578c5688d314e, type: 3} + m_Name: + m_EditorClassIdentifier: + button: {fileID: 38996725} + onObject: {fileID: 920429384} + offObject: {fileID: 432591953} --- !u!1 &75933247 GameObject: m_ObjectHideFlags: 0 @@ -314,6 +374,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 182799801} + - component: {fileID: 182799803} + - component: {fileID: 182799802} m_Layer: 5 m_Name: Button_material m_TagString: Untagged @@ -337,11 +399,69 @@ RectTransform: m_Father: {fileID: 1999276911} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 605} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &182799802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 182799800} + 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: 0 + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &182799803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 182799800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8f923fbd6b4418ab2b578c5688d314e, type: 3} + m_Name: + m_EditorClassIdentifier: + button: {fileID: 182799802} + onObject: {fileID: 1946291540} + offObject: {fileID: 1085629572} --- !u!1 &336140365 GameObject: m_ObjectHideFlags: 0 @@ -453,7 +573,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -463,7 +583,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -513,12 +633,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1439.4999 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -559,7 +679,6 @@ GameObject: - component: {fileID: 432591954} - component: {fileID: 432591957} - component: {fileID: 432591956} - - component: {fileID: 432591955} m_Layer: 5 m_Name: Button_off m_TagString: Untagged @@ -587,49 +706,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -9} m_SizeDelta: {x: 498, y: 116} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &432591955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 432591953} - 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: 432591956} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &432591956 MonoBehaviour: m_ObjectHideFlags: 0 @@ -883,6 +959,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 593115437} + - component: {fileID: 593115438} m_Layer: 5 m_Name: Window m_TagString: Untagged @@ -912,6 +989,20 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -64} m_SizeDelta: {x: 1028, y: 1150} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &593115438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 593115436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 988fc455527e44edbbc26f8ebb8d5f56, type: 3} + m_Name: + m_EditorClassIdentifier: + materialTab: {fileID: 182799803} + recipeTab: {fileID: 38996726} --- !u!1001 &666905498 PrefabInstance: m_ObjectHideFlags: 0 @@ -942,7 +1033,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -952,7 +1043,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1002,12 +1093,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1043.2999 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1079,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: 0} + m_SizeDelta: {x: 18, y: 1734.5999} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &733707100 MonoBehaviour: @@ -1318,7 +1409,6 @@ GameObject: - component: {fileID: 920429385} - component: {fileID: 920429388} - component: {fileID: 920429387} - - component: {fileID: 920429386} m_Layer: 5 m_Name: Button_on m_TagString: Untagged @@ -1346,49 +1436,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 498, y: 116} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &920429386 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 920429384} - 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: 920429387} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &920429387 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1456,7 +1503,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1466,7 +1513,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1516,12 +1563,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1241.3999 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1705,7 +1752,6 @@ GameObject: - component: {fileID: 1085629573} - component: {fileID: 1085629576} - component: {fileID: 1085629575} - - component: {fileID: 1085629574} m_Layer: 5 m_Name: Button_off m_TagString: Untagged @@ -1733,49 +1779,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -9.000015} m_SizeDelta: {x: 498, y: 116} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1085629574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1085629572} - 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: 1085629575} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &1085629575 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1891,47 +1894,47 @@ PrefabInstance: - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 42 objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -36 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 141.43484 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 166.71742 objectReference: {fileID: 0} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -40 objectReference: {fileID: 0} - target: {fileID: 3664916832564167473, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -2061,7 +2064,7 @@ PrefabInstance: - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 267.43484 objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -2197,7 +2200,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2207,7 +2210,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2257,12 +2260,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -647.1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2432,7 +2435,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2442,7 +2445,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2492,12 +2495,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -845.19995 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2589,7 +2592,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2599,7 +2602,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2649,12 +2652,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1637.5999 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3120,9 +3123,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -21, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1886176504 MonoBehaviour: @@ -3185,7 +3188,6 @@ GameObject: - component: {fileID: 1946291541} - component: {fileID: 1946291544} - component: {fileID: 1946291543} - - component: {fileID: 1946291542} m_Layer: 5 m_Name: Button_on m_TagString: Untagged @@ -3213,49 +3215,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 498, y: 116} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1946291542 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1946291540} - 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: 1946291543} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &1946291543 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3330,7 +3289,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 526, y: -564} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 514, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1999276912 MonoBehaviour: @@ -3405,7 +3364,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3415,7 +3374,7 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3465,12 +3424,12 @@ PrefabInstance: - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -449 objectReference: {fileID: 0} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3}