历史操作修改

Assets/Mesh/AEDAll_01.FBX.meta

@@ -67,35 +67,6 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations:
-    - serializedVersion: 16
-      name: Take 001aa
-      takeName: Take 001
-      internalID: 0
-      firstFrame: 0
-      lastFrame: 3734
-      wrapMode: 0
-      orientationOffsetY: 0
-      level: 0
-      cycleOffset: 0
-      loop: 0
-      hasAdditiveReferencePose: 0
-      loopTime: 0
-      loopBlend: 0
-      loopBlendOrientation: 0
-      loopBlendPositionY: 0
-      loopBlendPositionXZ: 0
-      keepOriginalOrientation: 0
-      keepOriginalPositionY: 1
-      keepOriginalPositionXZ: 0
-      heightFromFeet: 0
-      mirror: 0
-      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
-      curves: []
-      events: []
-      transformMask: []
-      maskType: 3
-      maskSource: {instanceID: 0}
-      additiveReferencePoseFrame: 0
     - serializedVersion: 16
       name: FuSu
       takeName: Take 001

Assets/Mesh/AEDAll_01New.FBX.meta

@@ -21,6 +21,15 @@ ModelImporter:
   - first:
       74: 5513559338412761389
     second: AnChuChan
+  - first:
+      74: -7478017851592872485
+    second: HuXi
+  - first:
+      74: -5720547947740870627
+    second: GuanChaHuXi
+  - first:
+      74: 1526922155403882310
+    second: tuoyi
   externalObjects: {}
   materials:
     materialImportMode: 1
@@ -53,15 +62,15 @@ ModelImporter:
       name: Take 001
       takeName: Take 001
       internalID: 0
-      firstFrame: 0
-      lastFrame: 3734
+      firstFrame: 3340
+      lastFrame: 3500
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 0
+      loopTime: 1
       loopBlend: 0
       loopBlendOrientation: 0
       loopBlendPositionY: 0
@@ -223,6 +232,93 @@ ModelImporter:
       maskType: 3
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: HuXi
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 3340
+      lastFrame: 3500
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 1
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: GuanChaHuXi
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 3165
+      lastFrame: 3290
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: tuoyi
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 1300
+      lastFrame: 1385
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
     isReadable: 0
   meshes:
     lODScreenPercentages: []

Assets/Mesh/NPC2.controller

@@ -1,17 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1102 &-7001275014385532491
+--- !u!1102 &-8802201035889879182
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: tuoyi
+  m_Name: HuXi
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: -204961516986953154}
+  - {fileID: -6106834383090269824}
+  - {fileID: -7853368777254970503}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -21,12 +22,91 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: b8258ac7cd2f6044abeabbac3fbc4772, type: 2}
+  m_Motion: {fileID: -7478017851592872485, guid: 5478e93ceaf174741a877554a1ea969d,
+    type: 3}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-7853368777254970503
+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: TXEnd
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 8444639773091616759}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.95312494
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-6353541661945796525
+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: Guancha
+    m_EventTreshold: 0
+  - m_ConditionMode: 2
+    m_ConditionEvent: GuanChaHuXi
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1760936155774570769}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9117648
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-6106834383090269824
+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: Huhuan
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3468741695885961152}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.95312494
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-5578467915566614854
 AnimatorState:
   serializedVersion: 5
@@ -34,11 +114,12 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: guancha
+  m_Name: guanchaHasHuXi
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
-  m_StateMachineBehaviours: []
+  m_StateMachineBehaviours:
+  - {fileID: -1396701043041130986}
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
   m_WriteDefaultValues: 1
@@ -47,13 +128,14 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: b0b6253bf29da5449b2fb07efc672e47, type: 2}
+  m_Motion: {fileID: -5720547947740870627, guid: 5478e93ceaf174741a877554a1ea969d,
+    type: 3}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
---- !u!1101 &-4663000866896880095
+--- !u!1101 &-4962242284525989864
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -62,7 +144,7 @@ AnimatorStateTransition:
   m_Name: 
   m_Conditions: []
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 145590554168387005}
+  m_DstState: {fileID: 5750082601494964300}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
@@ -75,6 +157,45 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &-1760936155774570769
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GuanChaNotHuXi
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours:
+  - {fileID: 8691691845197318921}
+  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: b0b6253bf29da5449b2fb07efc672e47, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!114 &-1396701043041130986
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3489c68e206a3f84c9015b3617a91d59, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1107 &-1340138183305457468
 AnimatorStateMachine:
   serializedVersion: 5
@@ -84,53 +205,40 @@ AnimatorStateMachine:
   m_PrefabAsset: {fileID: 0}
   m_Name: Base Layer
   m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: 145590554168387005}
-    m_Position: {x: 240, y: 100, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -5578467915566614854}
-    m_Position: {x: 430, y: 270, z: 0}
+    m_Position: {x: 670, y: 350, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 3468741695885961152}
-    m_Position: {x: 470, y: 160, z: 0}
+    m_Position: {x: 790, y: 110, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -8802201035889879182}
+    m_Position: {x: 230, y: -80, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 8444639773091616759}
+    m_Position: {x: 240, y: 110, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 3790523121504712053}
+    m_Position: {x: -20, y: 120, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 5750082601494964300}
+    m_Position: {x: 510, y: 110, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -1760936155774570769}
+    m_Position: {x: 410, y: 350, z: 0}
   - serializedVersion: 1
-    m_State: {fileID: -7001275014385532491}
-    m_Position: {x: 160, y: 270, z: 0}
+    m_State: {fileID: 4348191218450018252}
+    m_Position: {x: 530, y: 230, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_AnyStatePosition: {x: 10, y: -20, z: 0}
+  m_EntryPosition: {x: -250, y: 120, z: 0}
+  m_ExitPosition: {x: 900, y: -30, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 145590554168387005}
---- !u!1101 &-204961516986953154
-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: Guancha
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -5578467915566614854}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0.89436626
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
+  m_DefaultState: {fileID: 3790523121504712053}
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -145,19 +253,43 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Huhuan
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Tuoyi
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: Blend
+    m_Type: 1
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: HuXi
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: GuanChaHuXi
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: TXEnd
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -171,19 +303,43 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1102 &145590554168387005
+--- !u!1101 &1620933521673103665
+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: HuXi
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -8802201035889879182}
+  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 &3468741695885961152
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: New State
+  m_Name: huhuan
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: 8198922897633135112}
-  - {fileID: 4634509248977071993}
+  - {fileID: 4835068115737880461}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -193,24 +349,53 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 0}
+  m_Motion: {fileID: 7400000, guid: bf1a1c47fb9cce84bb6274bd184cb2a6, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
---- !u!1102 &3468741695885961152
+--- !u!1101 &3544756576154161647
+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: Guancha
+    m_EventTreshold: 0
+  - m_ConditionMode: 1
+    m_ConditionEvent: GuanChaHuXi
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -5578467915566614854}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9117648
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &3790523121504712053
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: huhuan
+  m_Name: New State
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: -4663000866896880095}
+  - {fileID: 1620933521673103665}
+  - {fileID: 8628638034356577362}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -220,13 +405,25 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: bf1a1c47fb9cce84bb6274bd184cb2a6, type: 2}
+  m_Motion: {fileID: 0}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
---- !u!1101 &4634509248977071993
+--- !u!114 &3822236757546705939
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 19b190059fc96234bbb7e0c9e11a0091, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1101 &4103549564497319868
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -238,20 +435,100 @@ AnimatorStateTransition:
     m_ConditionEvent: Tuoyi
     m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -7001275014385532491}
+  m_DstState: {fileID: 4348191218450018252}
   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_ExitTime: 0
+  m_HasExitTime: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &8198922897633135112
+--- !u!1102 &4348191218450018252
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: tuoyi
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -6353541661945796525}
+  - {fileID: 3544756576154161647}
+  m_StateMachineBehaviours:
+  - {fileID: 3822236757546705939}
+  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: 1526922155403882310, guid: 5478e93ceaf174741a877554a1ea969d,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &4835068115737880461
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5750082601494964300}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &5750082601494964300
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New State 0
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 6687144508213989109}
+  - {fileID: 4103549564497319868}
+  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 &6687144508213989109
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -276,3 +553,82 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &8444639773091616759
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: NotHuXi
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -4962242284525989864}
+  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 &8628638034356577362
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: HuXi
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 8444639773091616759}
+  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!114 &8691691845197318921
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3489c68e206a3f84c9015b3617a91d59, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!206 &9053816055631062958
+BlendTree:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BlendTree
+  m_Childs: []
+  m_BlendParameter: Blend
+  m_BlendParameterY: Blend
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0

Assets/Resources/operate.prefab

@@ -92,3 +92,4 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   str: 
+  color: {r: 0, g: 0, b: 0, a: 0}

Assets/Scenes/Level1.unity

@@ -8122,7 +8122,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &322675973
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10902,6 +10902,7 @@ MonoBehaviour:
   safeBt: {fileID: 1582803186}
   finishBt: {fileID: 1540219667}
   selectBt: {fileID: 1431465422}
+  speed: 1
 --- !u!1 &410907253
 GameObject:
   m_ObjectHideFlags: 0
@@ -25339,8 +25340,12 @@ MonoBehaviour:
   - {fileID: 1137649769}
   errorTip: {fileID: 794437338}
   clickTip: {fileID: 679950162}
+  mouseMove: 0
   remove: 0
   safeOperate: 0
+  task1: {fileID: 0}
+  task2: {fileID: 0}
+  task3: {fileID: 0}
 --- !u!114 &934008812
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -30188,7 +30193,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 468386140}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.7244992
+  m_Size: 0.7244993
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -33915,7 +33920,7 @@ MonoBehaviour:
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
-    m_LineSpacing: 1.56
+    m_LineSpacing: 1
   m_Text: 
 --- !u!222 &1285025735
 CanvasRenderer:
@@ -35720,7 +35725,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1361850294
 RectTransform:
   m_ObjectHideFlags: 0
@@ -49547,7 +49552,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 932370271}
   m_Direction: 0
   m_Value: 0
-  m_Size: 0.9999999
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

Assets/Scripts/Level1/Canvas.cs

@@ -46,6 +46,10 @@ public class Canvas : MonoBehaviour
         tip.SetActive(false);
         toolBag.SetActive(true);
         step1_1.SetActive(true);
+        // 1-1
+        GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
+        obj.GetComponent<Operate>().str= TaskInfo.task1info;
+        GameManager.Instance.task1 = obj.GetComponent<Operate>();
     }
     public void Question(int value)
     {
@@ -72,11 +76,12 @@ public class Canvas : MonoBehaviour
     public void FinishOperate() {
         if (GameObject.FindGameObjectsWithTag("ZAW").Length == 0)
         {
-            GameObject obj = Instantiate(Resources.Load<GameObject>("operate"),GameObject.FindWithTag("Grid").transform);
-            obj.GetComponent<Operate>().str = "2-清理周边环境";
+            //GameObject obj = Instantiate(Resources.Load<GameObject>("operate"),GameObject.FindWithTag("Grid").transform);
+            //obj.GetComponent<Operate>().str = "2-清理周边环境";
             step1_2.SetActive(false);
             errorTip.SetActive(true);
             errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关",60);
+            GameManager.Instance.task3.color = TaskInfo.color2;
             GameEndTip.SetActive(true);
             GameEndTip.GetComponentInChildren<Text>().text = "已经成功保留充足急救空间,请前往下一关卡";
             EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
@@ -91,8 +96,8 @@ public class Canvas : MonoBehaviour
     void SafeUIChange(params object[] data) {
         if ((bool)data[0])
         {
-            GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
-            obj.GetComponent<Operate>().str = "1-确认现场环境安全";
+            //GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
+            //obj.GetComponent<Operate>().str = "1-确认现场环境安全";
             if ((bool)data[1])
             {
                 errorTip.SetActive(true);
@@ -103,6 +108,10 @@ public class Canvas : MonoBehaviour
             }
             else {
                 step1_2.GetComponent<Step1_2>().SafeFinish();
+                GameManager.Instance.task2.color= TaskInfo.color2;
+                GameObject task3 = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
+                task3.GetComponent<Operate>().str = TaskInfo.task3info;
+                GameManager.Instance.task3 = task3.GetComponent<Operate>();
             }
 
         }

Assets/Scripts/Level1/Operate.cs

@@ -6,8 +6,10 @@ public class Operate : MonoBehaviour
 {
     Text text;
     public string str="";
+    public Color color; 
     void Start()
     {
+        color = TaskInfo.color1;
         text = GetComponent<Text>();
         transform.SetParent(GameObject.FindWithTag("Grid").transform);
     }
@@ -15,6 +17,7 @@ public class Operate : MonoBehaviour
     private void Update()
     {
         text.text = str;
+        text.color = color;
         transform.localScale = Vector3.one;
     }
 }

Assets/Scripts/Level1/Step1_2.cs

@@ -10,10 +10,15 @@ public class Step1_2 : MonoBehaviour
     public GameObject safeBt;
     public Button finishBt;
     public GameObject selectBt;
-
+    public float speed = 1;
     private void OnEnable()
     {
-        tip.DOText("在对人员进行抢救时，确认周围的环境是否安全是很重要的，请旋转视角对周围环境进行确认，并在上方进行选择", 3);
+        GameManager.Instance.task1.color = TaskInfo.color2;
+        GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
+        obj.GetComponent<Operate>().str = TaskInfo.task2info;
+        GameManager.Instance.task2 = obj.GetComponent<Operate>();
+        GameManager.Instance.mouseMove = true;
+        tip.DOText("在对人员进行抢救时，确认周围的环境是否安全是很重要的，请用鼠标拖动视角查看周围环境并在上方做出判断", 3);
         safeBt.GetComponent<RectTransform>().DOLocalMove(Vector3.zero, 2);
     }
     public void SafeFinish() {
@@ -23,6 +28,13 @@ public class Step1_2 : MonoBehaviour
         tip.DOText("周围环境存在风险，请选择解决方式",2);
     }
 
+    private void Update()
+    {
+        if (Input.GetMouseButton(0) && GameManager.Instance.mouseMove) { 
+            FindObjectOfType<CinemachineFreeLook>().m_XAxis.Value += Input.GetAxis("Mouse X") * speed;
+        }
+    }
+
     public void Remove() {
         tip.text = "";
         tip.DOText("请用鼠标进行点击，保持周边环境空旷(提示周边物品和靠的太近的人)", 2);

Assets/Scripts/Level1/TextInfo.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public static class TaskInfo
+{
+    /// <summary>
+    /// 关卡1
+    /// </summary>
+    public static string task1info = "1-请选择解决方式";
+    public static string task2info = "2-请确认周围环境是否安全";
+    public static string task3info = "3-请选择进行的操作";
+    public static Color color1 = new Color32(255, 255, 255, 255);//操作未完成文本颜色
+    public static Color color2 = Color.gray;//操作完成文本颜色
+
+    /// <summary>
+    /// 关卡2
+    /// </summary>
+    public static string task4info = "1-判断被救者有无意识";
+    public static string task5info = "2-观察被救者部位";
+    public static string task6info = "3-选择合适的操作";
+    public static Color color3 = new Color32(255, 255, 255, 255);//操作未完成文本颜色
+    public static Color color4 = Color.gray;//操作完成文本颜色
+}

Assets/Scripts/Level1/TextInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: adbef45866dd9b4438bd1e628c6c819e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Level2/AniEnd.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using System;
 public class AniEnd : MonoBehaviour
 {
     public Text yishi;
@@ -12,22 +13,18 @@ public class AniEnd : MonoBehaviour
     {
         animator = GetComponent<Animator>();
     }
+
+    private void Start()
+    {
+        animator.SetBool("HuXi",Canvas2.Instance.isHasHX);
+        animator.SetBool("GuanChaHuXi", Canvas2.Instance.isHasHX);
+    }
     public void E_HuhuanEnd()
     {
         EventManager.Instance.emit("NextAc");
         yishi.text = "昏迷";
     }
 
-    public void E_GuanchaEnd(){
-        //yifu.SetActive(false);
-        EventManager.Instance.emit("ActionTwoEnd");
-    }
-
-    public void E_TuoyiEnd() {
-        EventManager.Instance.emit("guancha");
-
-        animator.SetTrigger("Guancha");
-    }
 
     public void E_GameEnd()
     {
@@ -36,4 +33,9 @@ public class AniEnd : MonoBehaviour
         errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关", 60);
         EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
     }
+
+    IEnumerator Timer(Action action,float t) {
+        yield return new WaitForSeconds(t);
+        action.Invoke();
+    }
 }

Assets/Scripts/Level2/Canvas2.cs

@@ -5,8 +5,9 @@ using Cinemachine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using DG.Tweening;
+using System;
 
-public class Canvas2 : MonoBehaviour
+public class Canvas2 : MonoSingleton<Canvas2>
 {
     public AudioClip[] ac;
     AudioSource audioSource;
@@ -16,14 +17,31 @@ public class Canvas2 : MonoBehaviour
     public Animator animator;
     public GameObject errorTip;
     public GameObject step2_3;
+    public bool isHasHX;
+    public AnimationClip[] huXiClip;
+    public Operate operates1;
+    public Operate operates2;
+    public Operate operates3;
+    public Transform cmpos;
+    public Transform cmposq;
+
+    protected override void Awake()
+    {
+        base.Awake();
+        isHasHX = UnityEngine.Random.value >= 0.5 ? true : false;
+    }
     private void Start()
     {
         audioSource = GetComponent<AudioSource>();
         EventManager.Instance.register("NextAc", NextAc);
         EventManager.Instance.register("ActionTwoEnd", ActionTwoEnd);
-        EventManager.Instance.register("guancha",Guancha);
+        EventManager.Instance.register("guancha", Guancha);
         tip2.SetActive(true);
-        Invoke("InitLevel2", 3);
+        Invoke("JTTX",3);
+        GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
+        operates1 = obj.GetComponent<Operate>();
+        operates1.str = TaskInfo.task4info;
+        operates1.color = TaskInfo.color3;
     }
 
 
@@ -49,7 +67,7 @@ public class Canvas2 : MonoBehaviour
             animator.SetTrigger("Huhuan");
         }
 
-     
+
         else {
             errorTip.SetActive(true);
             errorTip.GetComponentInChildren<ErrorTip>().InitThis("当前拍打部位错误，请重试");
@@ -57,16 +75,21 @@ public class Canvas2 : MonoBehaviour
     }
     void NextAc(params object[] data) {
         GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
-        obj.GetComponent<Operate>().str = "1-判断被救者有无意识";
+        operates2 = obj.GetComponent<Operate>();
+        obj.GetComponent<Operate>().str = TaskInfo.task5info;
+        operates2.color = TaskInfo.color3;
+
+        operates1.color = TaskInfo.color4;
         tip2.GetComponentInChildren<Tip>().str = "请选择正确的部位进行观察被救者的呼吸";
         tip2.SetActive(false);
         tip2.SetActive(true);
         step2_2.SetActive(true);
-        
+
     }
 
     void ActionTwoEnd(params object[] data) {
         step2_3.SetActive(true);
+        Debug.Log("asdad");
     }
 
     public void ActionTwo(bool inspect)
@@ -83,5 +106,20 @@ public class Canvas2 : MonoBehaviour
         }
     }
 
-    
+    public void JTTX() {
+        FindObjectOfType<CinemachineVirtualCamera>().transform.position = cmpos.position;
+        FindObjectOfType<CinemachineVirtualCamera>().transform.rotation = cmpos.rotation;
+        StartCoroutine(WaitExecute(()=> {
+            FindObjectOfType<CinemachineVirtualCamera>().transform.position = cmposq.position;
+            FindObjectOfType<CinemachineVirtualCamera>().transform.rotation = cmposq.rotation;
+            animator.SetTrigger("TXEnd");
+        }, 5));
+        StartCoroutine(WaitExecute(InitLevel2, 6));
+
+    }
+
+    IEnumerator WaitExecute(Action action,float t) {
+        yield return new WaitForSeconds(t);
+        action();
+    }
 }

Assets/Scripts/Level2/GuanChaState.cs

@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GuanChaState : StateMachineBehaviour
+{
+    bool one = false;
+    public override void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+    {
+        if (stateInfo.normalizedTime>=1 &&!one) {
+            one = true;
+            EventManager.Instance.emit("ActionTwoEnd");
+        }
+    }
+}

Assets/Scripts/Level2/GuanChaState.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3489c68e206a3f84c9015b3617a91d59
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Level2/Step2_3.cs

@@ -22,20 +22,23 @@ public class Step2_3 : MonoBehaviour
 
     void Start()
     {
+
+        Canvas2.Instance.operates2.color = TaskInfo.color4;
+
         GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
-        obj.GetComponent<Operate>().str = "2-观察被救者部位";
+        Canvas2.Instance.operates3 = obj.GetComponent<Operate>();
+        obj.GetComponent<Operate>().str = TaskInfo.task6info;
+
+        
     }
 
     void Obstacle()
     {
-        Debug.Log("随机结果");
-        rand = 10;
-        rand = Random.RandomRange(0, 2);
-        if (rand == 0)
+        if (Canvas2.Instance.isHasHX)
         {
             State.text = "Õý³£";
         }
-        else if (rand == 1)
+        else
         {
             State.text = "²»Õý³£";
 
@@ -52,10 +55,11 @@ public class Step2_3 : MonoBehaviour
             if (answer == 2)
             {
                 greenMan.SetTrigger("Call");
-                GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
-                obj.GetComponent<Operate>().str = "3-请人拨打120";
+                //GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
+                //obj.GetComponent<Operate>().str = "3-请人拨打120";
                 tip.SetActive(false);
                 gameObject.SetActive(false);
+                Debug.Log("关闭页面");
             }
             else {
                 errorTip.SetActive(true);
@@ -67,10 +71,11 @@ public class Step2_3 : MonoBehaviour
             if (answer == 2)
             {
                 greenMan.SetTrigger("Call");
-                GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
-                obj.GetComponent<Operate>().str = "3-请人拨打120以及拿取AED";
+                //GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
+                //obj.GetComponent<Operate>().str = "3-请人拨打120以及拿取AED";
                 tip.SetActive(false);
                 gameObject.SetActive(false);
+                Debug.Log("关闭页面");
             }
             else {
                 errorTip.SetActive(true);

Assets/Scripts/Level2/TuoYiState.cs

@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TuoYiState : StateMachineBehaviour
+{
+    public override void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+    {
+        if (stateInfo.normalizedTime>=1) {
+            EventManager.Instance.emit("guancha");
+            animator.SetTrigger("Guancha");
+        }
+        
+    }
+}

Assets/Scripts/Level2/TuoYiState.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 19b190059fc96234bbb7e0c9e11a0091
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Tools/GameManager.cs

@@ -12,10 +12,14 @@ public class GameManager : MonoSingleton<GameManager>
     public GameObject[] needTransferObjs;
     public GameObject errorTip;
     public GameObject clickTip;
+    public bool mouseMove = false;
     bool safe=false;
     public bool remove=false;
     public int safeOperate;//玩家选择的对应操作，0对应转移，1对应清理
     RaycastHit rh;
+    public Operate task1;
+    public Operate task2;
+    public Operate task3;
     protected override void Awake()
     {
         base.Awake();
@@ -61,6 +65,7 @@ public class GameManager : MonoSingleton<GameManager>
     }
 
     public void PanDuanSafe(bool safe) {
+        mouseMove = false;
         EventManager.Instance.emit("PanDuanSafe", this.safe == safe,this.safe);  
     }
 
@@ -87,8 +92,9 @@ public class GameManager : MonoSingleton<GameManager>
         {
             obj.transform.position += new Vector3(2, 0, -35);
         }
-        GameObject obj2 = Instantiate(Resources.Load<GameObject>("operate"));
-        obj2.GetComponent<Operate>().str = "2-将被救者转移到安全位置";
+        //GameObject obj2 = Instantiate(Resources.Load<GameObject>("operate"));
+        //obj2.GetComponent<Operate>().str = "2-将被救者转移到安全位置";
+        GameManager.Instance.task3.color = Color.gray;
         Invoke("ZhuanyiEnd",2);
 
 
@@ -99,6 +105,7 @@ public class GameManager : MonoSingleton<GameManager>
         errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关", 60);
         GameEndTip.SetActive(true);
         GameEndTip.GetComponentInChildren<Text>().text="已成功转移到安全位置";
+
         EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
     }
 }