販売兄の閉店時アニメーション切替対応

popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller

@@ -59,25 +59,28 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -3568928167266774065}
-    m_Position: {x: 300, y: 160, z: 0}
+    m_Position: {x: 310, y: 40, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 8164371926150459515}
-    m_Position: {x: 290, y: 30, z: 0}
+    m_Position: {x: 310, y: -50, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -2123996942653153202}
-    m_Position: {x: 360, y: 450, z: 0}
+    m_Position: {x: 310, y: 120, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 2248593463434949668}
-    m_Position: {x: 320, y: 250, z: 0}
+    m_Position: {x: 350, y: 190, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 3603799768492295907}
-    m_Position: {x: 390, y: 520, z: 0}
+    m_Position: {x: 400, y: 340, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -5442313241527987121}
-    m_Position: {x: 350, y: 330, z: 0}
+    m_Position: {x: 380, y: 270, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions:
   - {fileID: 6442717320784534736}
+  - {fileID: 4178123793388062258}
+  - {fileID: 390402204728617694}
+  - {fileID: 4791712422503958028}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
@@ -85,7 +88,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: -3568928167266774065}
+  m_DefaultState: {fileID: -2123996942653153202}
 --- !u!1102 &-3568928167266774065
 AnimatorState:
   serializedVersion: 5
@@ -122,7 +125,8 @@ AnimatorState:
   m_Name: Brother_blue_main
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 1763129385586290165}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -152,7 +156,31 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: Open
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: CleaningA
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: CleaningB
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: MoveSideways
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -166,6 +194,56 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &390402204728617694
+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: CleaningB
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -5442313241527987121}
+  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!1101 &1763129385586290165
+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: Open
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -3568928167266774065}
+  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!1102 &2248593463434949668
 AnimatorState:
   serializedVersion: 5
@@ -218,6 +296,56 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &4178123793388062258
+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: CleaningA
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 2248593463434949668}
+  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!1101 &4791712422503958028
+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: MoveSideways
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3603799768492295907}
+  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!1101 &6442717320784534736
 AnimatorStateTransition:
   m_ObjectHideFlags: 1

popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherBlueView.cs

@@ -4,9 +4,24 @@ public class BrotherBlueView : MonoBehaviour
 {
     [SerializeField] private Animator animator;
     private static readonly int Sell = Animator.StringToHash("Sell");
+    private static readonly int Open = Animator.StringToHash("Open");
+    private static readonly int CleaningA = Animator.StringToHash("CleaningA");
+    private static readonly int CleaningB = Animator.StringToHash("CleaningB");
+    private static readonly int MoveSideways = Animator.StringToHash("MoveSideways");
+    private static readonly int[] CloseTriggerArray = {CleaningA, CleaningB, MoveSideways};
 
     public void SellAction()
     {
         animator.SetTrigger(Sell);
     }
+
+    public void OpenAction()
+    {
+        animator.SetTrigger(Open);
+    }
+
+    public void CloseAction()
+    {
+        animator.SetTrigger(CloseTriggerArray.RandomChoose());
+    }
 }

popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs

@@ -40,8 +40,11 @@ public class MarketManager : MonoBehaviour
         {
             if (TutorialManager.Instance.Index == 10)
             {
+                // SetShopViewを使わず表示構築
                 rewardButtonView.gameObject.SetActive(false);
-                TutorialManager.Instance.ShowTutorialConversation(11, () =>
+                blueView.OpenAction();
+                
+                TutorialManager.Instance.ShowTutorialConversation(4, () =>
                 {
                     walkerMask.gameObject.SetActive(true);
                     // お客さん配置
@@ -238,6 +241,7 @@ public class MarketManager : MonoBehaviour
                 // 宣伝ボタン表示
                 rewardButtonView.gameObject.SetActive(true);
                 BrotherPinkView.Instance.SetNormal();
+                blueView.OpenAction();
                 closeSign.SetActive(false);
                 break;
             case ShopState.Busy:
@@ -248,6 +252,7 @@ public class MarketManager : MonoBehaviour
                 if (market.CustomerList.Count(x => x.State.Value == CustomerState.Order) == 0)
                 {
                     BrotherPinkView.Instance.SetSleepy();
+                    blueView.CloseAction();
                     closeSign.SetActive(true);
                 }
                 else
@@ -262,6 +267,8 @@ public class MarketManager : MonoBehaviour
                         .Subscribe(_ =>
                         {
                             BrotherPinkView.Instance.SetSleepy();
+                            Observable.Timer(TimeSpan.FromSeconds(1f))
+                                .Subscribe(x => blueView.CloseAction());
                             closeSign.SetActive(true);
                         }).AddTo(ShopClosedCompositeDisposable);
                 }