diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs new file mode 100644 index 00000000..16d41928 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs @@ -0,0 +1,27 @@ +using System; +using UniRx; +using UniRx.Triggers; +using UnityEngine; +using UnityEngine.UI; + +public class PromoteGrowthButton : MonoBehaviour +{ + [SerializeField] private Button growthButton; + [SerializeField] private GameObject onObject; + [SerializeField] private GameObject offObject; + + private void Start() + { + onObject.SetActive(false); + offObject.SetActive(true); + growthButton.OnPointerDownAsObservable() + .Select(_ => true) + .Merge(growthButton.OnPointerUpAsObservable().Select(_ => false)) + .Pairwise() + .Subscribe(x => + { + onObject.SetActive(x.Current); + offObject.SetActive(!x.Current); + }).AddTo(this); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs.meta b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs.meta new file mode 100644 index 00000000..e3810373 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5700583b026d457ea83897470f6485ca +timeCreated: 1626828650 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 9e7755cc..5f2f452c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -85,7 +85,6 @@ GameObject: - component: {fileID: 118497225} - component: {fileID: 118497228} - component: {fileID: 118497227} - - component: {fileID: 118497226} m_Layer: 5 m_Name: Button_off m_TagString: Untagged @@ -151,49 +150,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &118497226 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 118497224} - 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: 118497227} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &130281749 GameObject: m_ObjectHideFlags: 0 @@ -203,6 +159,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 130281750} + - component: {fileID: 6119163445458718855} + - component: {fileID: 7809777061605929427} m_Layer: 5 m_Name: Button_growth m_TagString: Untagged @@ -227,11 +185,69 @@ RectTransform: m_Father: {fileID: 3664916832844628215} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -215, y: -212} - m_SizeDelta: {x: 100, y: -2108} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 373, y: -203} + m_SizeDelta: {x: 237.56934, y: 125.794174} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6119163445458718855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 130281749} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5700583b026d457ea83897470f6485ca, type: 3} + m_Name: + m_EditorClassIdentifier: + growthButton: {fileID: 7809777061605929427} + onObject: {fileID: 2041305253} + offObject: {fileID: 118497224} +--- !u!114 &7809777061605929427 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 130281749} + 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!1 &320398123 GameObject: m_ObjectHideFlags: 0 @@ -807,7 +823,6 @@ GameObject: - component: {fileID: 2041305254} - component: {fileID: 2041305257} - component: {fileID: 2041305256} - - component: {fileID: 2041305255} m_Layer: 5 m_Name: Button_push m_TagString: Untagged @@ -873,49 +888,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2041305255 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2041305253} - 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: 2041305256} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &3664916832564167473 GameObject: m_ObjectHideFlags: 0