From d3b86d310cbbc6bad6d45d33ddb093811768a26c Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Thu, 3 Feb 2022 15:21:32 +0900
Subject: [PATCH] =?UTF-8?q?vip=E5=AE=A3=E4=BC=9D=E3=83=9C=E3=82=BF?=
 =?UTF-8?q?=E3=83=B3=E5=87=A6=E7=90=86=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resource/Animation/Button_vip.controller  | 31 ++++++++++++++++++-
 .../MyGame/Scenes/Main/Prefabs/Canvas.prefab  | 15 +++++----
 .../Scripts/VipCustomerButtonView.cs          | 19 ++++++++++++
 .../Scripts/VipCustomerButtonView.cs.meta     |  3 ++
 4 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs
 create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs.meta

diff --git a/popcorn/Assets/MyGame/Resource/Animation/Button_vip.controller b/popcorn/Assets/MyGame/Resource/Animation/Button_vip.controller
index d9c8146e..5a38ba45 100644
--- a/popcorn/Assets/MyGame/Resource/Animation/Button_vip.controller
+++ b/popcorn/Assets/MyGame/Resource/Animation/Button_vip.controller
@@ -38,6 +38,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -3739160205852285787}
     m_Position: {x: 200, y: 0, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 877997704866898633}
+    m_Position: {x: 500, y: 120, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -47,7 +50,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: -3739160205852285787}
+  m_DefaultState: {fileID: 877997704866898633}
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -70,3 +73,29 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1102 &877997704866898633
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New State
+  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/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab
index a38db8be..c5603ff5 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab
@@ -1472,7 +1472,7 @@ GameObject:
   - component: {fileID: 2633402978755532797}
   - component: {fileID: 4283180668829566650}
   m_Layer: 5
-  m_Name: icon_fertilizer
+  m_Name: icon_vip
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2478,7 +2478,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1408184404978035950}
-  - component: {fileID: 1657996136668002032}
+  - component: {fileID: 512143980313251866}
   - component: {fileID: 2570027885372274640}
   - component: {fileID: 7731324448850360389}
   m_Layer: 5
@@ -2508,7 +2508,7 @@ RectTransform:
   m_AnchoredPosition: {x: 43, y: 684}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1657996136668002032
+--- !u!114 &512143980313251866
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2517,12 +2517,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 7129812585269745309}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 825e8c21a1da42d494e43d1c51c40c24, type: 3}
+  m_Script: {fileID: 11500000, guid: 817f9d5cab724bb8a22de5e9dbd2f967, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  rewardButton: {fileID: 7453407021347122718}
-  DisableObject: {fileID: 0}
-  remainTimeText: {fileID: 0}
+  vipButton: {fileID: 7453407021347122718}
+  buttonAnimator: {fileID: 2570027885372274640}
 --- !u!95 &2570027885372274640
 Animator:
   serializedVersion: 3
@@ -2642,7 +2641,7 @@ GameObject:
   - component: {fileID: 7453407021347122718}
   - component: {fileID: 403123792383491358}
   m_Layer: 5
-  m_Name: Button_fertilizer_on
+  m_Name: Button_on
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs
new file mode 100644
index 00000000..4d41eefa
--- /dev/null
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs
@@ -0,0 +1,19 @@
+using System;
+using UniRx;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace MyGame.Scenes.marketing.Scripts
+{
+    public class VipCustomerButtonView : MonoBehaviour
+    {
+        [SerializeField] private Button vipButton;
+        [SerializeField] private Animator buttonAnimator;
+        public IObservable<Unit> VipButton => vipButton.OnClickAsObservable().TakeUntilDestroy(this);
+
+        public void ShowButton()
+        {
+            buttonAnimator.Play("Button_vip");
+        }
+    }
+}
\ No newline at end of file
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs.meta
new file mode 100644
index 00000000..c6098821
--- /dev/null
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 817f9d5cab724bb8a22de5e9dbd2f967
+timeCreated: 1643868118
\ No newline at end of file