From b1c9485f88cfd81a787d854b7502b1b3b5c3efa7 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 26 Oct 2021 17:25:57 +0900 Subject: [PATCH] =?UTF-8?q?=E7=95=91=E3=81=AEUI=E5=BE=A9=E5=B8=B0=E3=82=A2?= =?UTF-8?q?=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animation/Button_FieldSummary.controller | 69 ++++- .../Animation/Button_growth.controller | 69 ++++- .../Resource/Animation/Footer.controller | 69 ++++- .../Resource/Animation/Header.controller | 69 ++++- .../MyGame/Scenes/CornField/CornField.unity | 87 ++++-- .../Scenes/CornField/Scripts/CornField.cs | 7 +- .../MyGame/Scenes/Main/Prefabs/Canvas.prefab | 292 +----------------- .../Assets/MyGame/Scripts/AnimationButton.cs | 23 ++ .../MyGame/Scripts/AnimationButton.cs.meta | 3 + 9 files changed, 351 insertions(+), 337 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scripts/AnimationButton.cs create mode 100644 popcorn/Assets/MyGame/Scripts/AnimationButton.cs.meta diff --git a/popcorn/Assets/MyGame/Resource/Animation/Button_FieldSummary.controller b/popcorn/Assets/MyGame/Resource/Animation/Button_FieldSummary.controller index e18c40c5..d3f4bbcc 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Button_FieldSummary.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Button_FieldSummary.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8322160122224725593 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Active + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2879491498492816131} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,7 +33,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Button_FieldSummary serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Active + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -22,6 +53,32 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &2262495430887709302 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: None + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &2879491498492816131 AnimatorState: serializedVersion: 5 @@ -59,9 +116,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 2879491498492816131} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 280, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2262495430887709302} + m_Position: {x: 320, y: 110, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: -8322160122224725593} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -69,4 +130,4 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 2879491498492816131} + m_DefaultState: {fileID: 2262495430887709302} diff --git a/popcorn/Assets/MyGame/Resource/Animation/Button_growth.controller b/popcorn/Assets/MyGame/Resource/Animation/Button_growth.controller index af122f7d..c7eae570 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Button_growth.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Button_growth.controller @@ -37,9 +37,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -7033040496665614111} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 330, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4049533579053196443} + m_Position: {x: 330, y: 110, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: 8026699333041037360} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -47,7 +51,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -7033040496665614111} + m_DefaultState: {fileID: 4049533579053196443} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -56,7 +60,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Button_growth serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Active + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -70,3 +80,54 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &4049533579053196443 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: None + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8026699333041037360 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Active + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7033040496665614111} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Footer.controller b/popcorn/Assets/MyGame/Resource/Animation/Footer.controller index 67d360f8..5fca2d51 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Footer.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Footer.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-5392236767584935022 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Active + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 780446597797504262} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,7 +33,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Footer serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Active + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -59,9 +90,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 780446597797504262} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 280, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7045403067459468640} + m_Position: {x: 320, y: 110, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: -5392236767584935022} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -69,4 +104,30 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 780446597797504262} + m_DefaultState: {fileID: 7045403067459468640} +--- !u!1102 &7045403067459468640 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: None + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/popcorn/Assets/MyGame/Resource/Animation/Header.controller b/popcorn/Assets/MyGame/Resource/Animation/Header.controller index 077eaeee..ba82ff70 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Header.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Header.controller @@ -26,6 +26,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-4025425608929581816 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: None + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -34,7 +60,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Header serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Active + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -59,9 +91,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -5900078319125893540} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 310, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4025425608929581816} + m_Position: {x: 329.41174, y: 105.389496, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: 3972425425646063538} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -69,4 +105,29 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -5900078319125893540} + m_DefaultState: {fileID: -4025425608929581816} +--- !u!1101 &3972425425646063538 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Active + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5900078319125893540} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 58505401..6208c058 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -756,10 +756,10 @@ RectTransform: m_Father: {fileID: 457045028} 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_SizeDelta: {x: 0, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 122.21785, y: -54} + m_SizeDelta: {x: 101.03571, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &323920547 MonoBehaviour: @@ -1268,7 +1268,7 @@ PrefabInstance: - target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 8 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1283,7 +1283,7 @@ PrefabInstance: - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 9 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1373,6 +1373,30 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &387414340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 387414338} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcbdd8d8cf3349d7a73943e88c571750, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &387414341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 387414336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcbdd8d8cf3349d7a73943e88c571750, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &443195450 GameObject: m_ObjectHideFlags: 0 @@ -1486,7 +1510,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -32.99994, y: 15.999985} - m_SizeDelta: {x: 0, y: 88} + m_SizeDelta: {x: 230.7357, y: 88} m_Pivot: {x: 0, y: 1} --- !u!114 &457045029 MonoBehaviour: @@ -2271,8 +2295,9 @@ MonoBehaviour: animationDuration: 0.5 fertilizerFinishWaitTime: 2.21 uiVisibleController: {fileID: 1859409048} + sideButtons: {fileID: 1735316554} promoteGrowthButton: {fileID: 730756546} - upgradeButton: {fileID: 1992043646} + upgradeButton: {fileID: 974444277} harvestEffectPrefab: {fileID: 3900911687800301846, guid: e9a7e2b2f003d44fab5926ca6ec6d728, type: 3} harvestPrefab: {fileID: 8524901521850801684, guid: e642499b3643dab4ba05b02e8c6bde1c, @@ -2636,9 +2661,9 @@ RectTransform: m_Father: {fileID: 457045028} 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: 39, y: -25} m_SizeDelta: {x: 0, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &971086866 stripped @@ -3067,7 +3092,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1106859980 RectTransform: m_ObjectHideFlags: 0 @@ -3081,7 +3106,7 @@ RectTransform: m_Children: - {fileID: 457045028} m_Father: {fileID: 387414334} - m_RootOrder: 11 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4309,6 +4334,7 @@ GameObject: m_Component: - component: {fileID: 1735316555} - component: {fileID: 1735316556} + - component: {fileID: 1735316557} m_Layer: 5 m_Name: Button_FieldSummary m_TagString: Untagged @@ -4330,7 +4356,7 @@ RectTransform: - {fileID: 525465088} - {fileID: 974444275} m_Father: {fileID: 387414334} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4356,6 +4382,18 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1735316557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735316554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcbdd8d8cf3349d7a73943e88c571750, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1775503937 GameObject: m_ObjectHideFlags: 0 @@ -14350,18 +14388,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1992043646 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 320398125, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1998181882 GameObject: m_ObjectHideFlags: 0 @@ -14700,7 +14726,7 @@ PrefabInstance: - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} propertyPath: m_RootOrder - value: 12 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} @@ -15084,6 +15110,11 @@ PrefabInstance: propertyPath: m_Name value: StockCorn objectReference: {fileID: 0} + - target: {fileID: 1507187604136703909, guid: 21599f8e6d1104a07b0b14b49f8c1429, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1507187604136703914, guid: 21599f8e6d1104a07b0b14b49f8c1429, type: 3} propertyPath: m_Pivot.x @@ -15097,7 +15128,7 @@ PrefabInstance: - target: {fileID: 1507187604136703914, guid: 21599f8e6d1104a07b0b14b49f8c1429, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1507187604136703914, guid: 21599f8e6d1104a07b0b14b49f8c1429, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index 3ddcf96d..9b679719 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -23,6 +23,7 @@ public class CornField : MonoBehaviour [SerializeField] private float fertilizerFinishWaitTime = 1f; [Space] [SerializeField] private UIVisibleController uiVisibleController; + [SerializeField] private GameObject sideButtons; [SerializeField] private Button promoteGrowthButton; [SerializeField] private Button upgradeButton; [SerializeField] private GameObject harvestEffectPrefab; @@ -118,9 +119,8 @@ public class CornField : MonoBehaviour SoundManager.Instance.PlayBGM("bgm_fertilizer"); brotherFertilizerAnimation.StartAnimation(); // button非表示 - fertilizerButtonView.gameObject.SetActive(false); promoteGrowthButton.gameObject.SetActive(false); - upgradeButton.gameObject.SetActive(false); + sideButtons.SetActive(false); uiVisibleController.SetActive(false); SetCornField(true); @@ -166,9 +166,8 @@ public class CornField : MonoBehaviour { isFertilizing = false; // ボタン表示復活 - fertilizerButtonView.gameObject.SetActive(true); promoteGrowthButton.gameObject.SetActive(true); - upgradeButton.gameObject.SetActive(true); + sideButtons.SetActive(true); uiVisibleController.SetActive(true); }); }).AddTo(this); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index e18629c6..3d77fcda 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -183,7 +183,7 @@ RectTransform: - {fileID: 118497225} - {fileID: 2041305254} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -248,143 +248,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &320398123 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 320398124} - - component: {fileID: 320398127} - - component: {fileID: 320398126} - - component: {fileID: 320398125} - - component: {fileID: 4852160585447148657} - m_Layer: 5 - m_Name: Button_setting - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &320398124 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 320398123} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} - m_Children: - - {fileID: 1462604263} - - {fileID: 1453424321} - m_Father: {fileID: 3664916832844628215} - m_RootOrder: 3 - 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 &320398127 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 320398123} - m_CullTransparentMesh: 0 ---- !u!114 &320398126 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 320398123} - 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: dc21b36ca25396e4889e7972120f2031, 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 &320398125 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 320398123} - 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: 320398126} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &4852160585447148657 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 320398123} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} - m_Name: - m_EditorClassIdentifier: - onClickPlaySEFilename: - randomPlaySEFilenames: [] - randomPlayVoiceFilenames: [] - vibrationType: 0 --- !u!1 &1339603268 GameObject: m_ObjectHideFlags: 0 @@ -459,154 +322,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1453424320 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1453424321} - - component: {fileID: 1453424323} - - component: {fileID: 1453424322} - 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 &1453424321 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1453424320} - 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: 320398124} - 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: 45, y: -29.000061} - m_SizeDelta: {x: 92, y: 48} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1453424323 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1453424320} - m_CullTransparentMesh: 0 ---- !u!114 &1453424322 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1453424320} - 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: 09f2a6baf71660843beb5990355c5b37, 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 &1462604262 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1462604263} - - component: {fileID: 1462604265} - - component: {fileID: 1462604264} - m_Layer: 5 - m_Name: icon_machine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1462604263 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1462604262} - 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: 320398124} - 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: 42, y: 24} - m_SizeDelta: {x: 120, y: 104} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1462604265 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1462604262} - m_CullTransparentMesh: 0 ---- !u!114 &1462604264 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1462604262} - 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: be898bf614df7fe479e246677fd24076, 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 &1464061988 GameObject: m_ObjectHideFlags: 0 @@ -1271,7 +986,7 @@ RectTransform: - {fileID: 655651630893765691} - {fileID: 8136363072906095234} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1437,7 +1152,6 @@ RectTransform: - {fileID: 3664916834242367713} - {fileID: 3664916833752817997} - {fileID: 3664916834121473268} - - {fileID: 320398124} - {fileID: 130281750} - {fileID: 6205448659049427752} - {fileID: 8103176713869808018} @@ -2377,7 +2091,7 @@ PrefabInstance: - target: {fileID: 4554347650268844882, guid: 2403d69753829416a83b8cfa00108d38, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4554347650268844882, guid: 2403d69753829416a83b8cfa00108d38, type: 3} diff --git a/popcorn/Assets/MyGame/Scripts/AnimationButton.cs b/popcorn/Assets/MyGame/Scripts/AnimationButton.cs new file mode 100644 index 00000000..681a4a39 --- /dev/null +++ b/popcorn/Assets/MyGame/Scripts/AnimationButton.cs @@ -0,0 +1,23 @@ +using System; +using UniRx; +using UniRx.Triggers; +using UnityEngine; +using UnityEngine.UI; + +namespace MyGame.Scripts +{ + [RequireComponent(typeof(Animator))] + public class AnimationButton : MonoBehaviour + { + private static readonly int Active = Animator.StringToHash("Active"); + + private void Start() + { + var animator = GetComponent(); + gameObject.OnEnableAsObservable().Subscribe(_ => + { + animator.SetTrigger(Active); + }).AddTo(this); + } + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/AnimationButton.cs.meta b/popcorn/Assets/MyGame/Scripts/AnimationButton.cs.meta new file mode 100644 index 00000000..93c5878c --- /dev/null +++ b/popcorn/Assets/MyGame/Scripts/AnimationButton.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: dcbdd8d8cf3349d7a73943e88c571750 +timeCreated: 1635235730 \ No newline at end of file