[FCT] add of item sold discussion in game cycle

[FIX] customer number wasn't correct
ChristopheClaustre · Dec 5, 2018 · f1c1a16 · f1c1a16
1 parent fadae61
commit f1c1a16
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 34 deletions.
diff --git a/Assets/Animations/General.controller b/Assets/Animations/General.controller
@@ -198,33 +198,6 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &1101149407065259978
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: hasPlayerChoose
-    m_EventTreshold: 0
-  - m_ConditionMode: 1
-    m_ConditionEvent: stuffSold
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102024082423434214}
-  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: 1
 --- !u!1101 &1101154248946789550
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -453,6 +426,33 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &1101388501066811750
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: hasPlayerChoose
+    m_EventTreshold: 0
+  - m_ConditionMode: 1
+    m_ConditionEvent: stuffSold
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102528948574556300}
+  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: 1
 --- !u!1101 &1101396672020782026
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -525,6 +525,30 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &1101435350611385540
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: DiscussionHasFinished
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102024082423434214}
+  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: 1
 --- !u!1101 &1101448349764334596
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -723,7 +747,7 @@ AnimatorStateTransition:
   m_Conditions:
   - m_ConditionMode: 4
     m_ConditionEvent: remainingCustomers
-    m_EventTreshold: 2
+    m_EventTreshold: 1
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102025159893956272}
   m_Solo: 0
@@ -771,7 +795,7 @@ AnimatorStateTransition:
   m_Conditions:
   - m_ConditionMode: 3
     m_ConditionEvent: remainingCustomers
-    m_EventTreshold: 1
+    m_EventTreshold: 0
   - m_ConditionMode: 3
     m_ConditionEvent: remainingObjects
     m_EventTreshold: 0
@@ -816,6 +840,33 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &1101685582820229194
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 3
+    m_ConditionEvent: capital
+    m_EventTreshold: -1
+  - m_ConditionMode: 3
+    m_ConditionEvent: grandpaLifeInPercent
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 1107122142171469110}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &1101693799870707640
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -1352,6 +1403,7 @@ AnimatorState:
   - {fileID: 1101693799870707640}
   - {fileID: 1101694786364806174}
   - {fileID: 1101413963069508386}
+  - {fileID: 1101685582820229194}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -1815,6 +1867,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &1102528948574556300
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Sold
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101435350611385540}
+  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: 7400000, guid: 5ec341b05c69ad447b01e9bd70da0ddf, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &1102561252396463082
 AnimatorState:
   serializedVersion: 5
@@ -1984,10 +2062,10 @@ AnimatorState:
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: 1101149407065259978}
   - {fileID: 1101154248946789550}
   - {fileID: 1101175612902843038}
   - {fileID: 1101229375298022766}
+  - {fileID: 1101388501066811750}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -2400,7 +2478,7 @@ AnimatorStateMachine:
     m_Position: {x: 804, y: 264, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102024082423434214}
-    m_Position: {x: 1056, y: 144, z: 0}
+    m_Position: {x: 1080, y: 264, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102025159893956272}
     m_Position: {x: 564, y: 348, z: 0}
@@ -2413,6 +2491,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 1102895489062480632}
     m_Position: {x: 804, y: 144, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102528948574556300}
+    m_Position: {x: 1080, y: 144, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

diff --git a/Assets/Animations/ManagementGeneral/disparition client.anim b/Assets/Animations/ManagementGeneral/disparition client.anim
@@ -30,7 +30,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.45
+    m_StopTime: 0.5833333
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -72,10 +72,17 @@ AnimationClip:
     floatParameter: 0
     intParameter: 0
     messageOptions: 0
-  - time: 0.45
+  - time: 0.5
     functionName: DecrementCustomers
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
     intParameter: 0
     messageOptions: 0
+  - time: 0.5833333
+    functionName: Wait
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
diff --git a/Assets/Scripts/GeneralManagement.cs b/Assets/Scripts/GeneralManagement.cs
@@ -146,7 +146,7 @@ public void EndDiscussion(string p_name)
 
     public void CustomerArrival()
     {
-        m_animatorGeneral.SetInteger("remainingCustomers", 5);
+        m_animatorGeneral.SetInteger("remainingCustomers", 4);
         m_animatorCustomers.SetInteger("remainingCustomers", 4);
     }