[FCT] management of the end of the day coming sooner because of lack …

…of objects
ChristopheClaustre · Dec 5, 2018 · 721d8e7 · 721d8e7
1 parent f1c1a16
commit 721d8e7
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 3 deletions.
diff --git a/Assets/Animations/General.controller b/Assets/Animations/General.controller
@@ -1413,7 +1413,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 0}
+  m_Motion: {fileID: 7400000, guid: 847def341d6359048ad5adb504c35ab1, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 

diff --git a/Assets/Animations/ManagementCustomer/ManagementCustomer.controller b/Assets/Animations/ManagementCustomer/ManagementCustomer.controller
@@ -165,6 +165,30 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &1101513428747333612
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 4
+    m_ConditionEvent: remainingCustomers
+    m_EventTreshold: 1
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102318006892421500}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 0
 --- !u!1101 &1101577068603754570
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -577,11 +601,12 @@ AnimatorStateMachine:
     m_State: {fileID: 1102318006892421500}
     m_Position: {x: 504, y: 120, z: 0}
   m_ChildStateMachines: []
-  m_AnyStateTransitions: []
+  m_AnyStateTransitions:
+  - {fileID: 1101513428747333612}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_AnyStatePosition: {x: 384, y: 228, z: 0}
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 1152, y: 132, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}

diff --git a/Assets/Animations/ManagementGeneral/fin jour.anim b/Assets/Animations/ManagementGeneral/fin jour.anim
@@ -0,0 +1,60 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: fin jour
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events:
+  - time: 0
+    functionName: HideAllCustomers
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
diff --git a/Assets/Animations/ManagementGeneral/fin jour.anim.meta b/Assets/Animations/ManagementGeneral/fin jour.anim.meta
diff --git a/Assets/Scripts/GeneralManagement.cs b/Assets/Scripts/GeneralManagement.cs
@@ -163,6 +163,12 @@ public void DecrementWaitingCustomers()
         m_animatorCustomers.SetInteger("remainingCustomers", remaining - 1);
     }
 
+    public void HideAllCustomers()
+    {
+        m_animatorGeneral.SetInteger("remainingCustomers", 0);
+        m_animatorCustomers.SetBool("showCurrent", false);
+    }
+
     public void CustomerIncomming()
     {
         m_animatorCustomers.SetBool("showCurrent", true);

diff --git a/Assets/_Scenes/FuckingScene.unity b/Assets/_Scenes/FuckingScene.unity
@@ -593,6 +593,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1e92ecbbf3486a24791f9e56b41eefe3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &864425148
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 864425145}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a799aaa8aa484646a4e95f566205815, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &875746573
 Prefab:
   m_ObjectHideFlags: 0