整合提交

Assets/Mesh/AED03.controller

@@ -10,7 +10,8 @@ AnimatorState:
   m_Name: AnChuChan
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 2083612033345293255}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -108,6 +109,28 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-3904450527151307668
+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: 4217339329217386873}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-2445822652269321697
 AnimatorState:
   serializedVersion: 5
@@ -189,6 +212,61 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &-573950803814654784
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FenXi
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -3904450527151307668}
+  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: -2316810345196295183, guid: 5478e93ceaf174741a877554a1ea969d,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-292187969987560731
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FuSu
+  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: -3843054903196119171, guid: edda6d24ad24efd4f8111b709188e239,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -270,13 +348,25 @@ AnimatorStateMachine:
     m_Position: {x: 290, y: 410, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -2445822652269321697}
-    m_Position: {x: 659.0093, y: 416.90326, z: 0}
+    m_Position: {x: 630, y: 490, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 221862564237850720}
-    m_Position: {x: 660, y: 470, z: 0}
+    m_Position: {x: 650, y: 540, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -8242147095563566239}
-    m_Position: {x: 290, y: 460, z: 0}
+    m_Position: {x: 550, y: 0, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 3465587264983316132}
+    m_Position: {x: 290, y: 520, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -573950803814654784}
+    m_Position: {x: 550, y: 80, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 8039015161950543680}
+    m_Position: {x: 580, y: 370, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4217339329217386873}
+    m_Position: {x: 830, y: 40, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -287,6 +377,108 @@ AnimatorStateMachine:
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -7980876672862009540}
+--- !u!1101 &2083612033345293255
+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: 4217339329217386873}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.875
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &2435146368937656358
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 3FuSu
+  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: 1827226128182048838, guid: edda6d24ad24efd4f8111b709188e239,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &3465587264983316132
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 3FuSu
+  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: 1827226128182048838, guid: edda6d24ad24efd4f8111b709188e239,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &4217339329217386873
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dengdai
+  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: 7400000, guid: 323866ea9dbbae54791f886a4b8558b5, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &4798573997622475086
 AnimatorState:
   serializedVersion: 5
@@ -341,3 +533,57 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &7609597927231430645
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FenXi
+  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: -2316810345196295183, guid: 5478e93ceaf174741a877554a1ea969d,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &8039015161950543680
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FuSu2
+  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: -3843054903196119171, guid: 5478e93ceaf174741a877554a1ea969d,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

Assets/Mesh/AEDAll_01.FBX.meta

@@ -39,6 +39,9 @@ ModelImporter:
   - first:
       74: -7100618163015802634
     second: EndFuSu
+  - first:
+      74: 1827226128182048838
+    second: 3FuSu
   externalObjects: {}
   materials:
     materialImportMode: 1
@@ -72,7 +75,7 @@ ModelImporter:
       takeName: Take 001
       internalID: 0
       firstFrame: 307
-      lastFrame: 770
+      lastFrame: 755
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
@@ -357,6 +360,35 @@ ModelImporter:
       maskType: 3
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: 3FuSu
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 624
+      lastFrame: 770
+      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/AEDAll_01New.FBX.meta

@@ -31,8 +31,14 @@ ModelImporter:
       74: 1526922155403882310
     second: tuoyi
   - first:
-      74: 6719204718095668130
-    second: all
+      74: -3843054903196119171
+    second: FuSu2
+  - first:
+      74: 9067093048684652814
+    second: TuoYiState
+  - first:
+      74: -2316810345196295183
+    second: FenXi
   externalObjects: {}
   materials:
     materialImportMode: 1
@@ -52,7 +58,7 @@ ModelImporter:
     animationRetargetingWarnings: 
     animationDoRetargetingWarnings: 0
     importAnimatedCustomProperties: 0
-    importConstraints: 0
+    importConstraints: 1
     animationCompression: 1
     animationRotationError: 0.5
     animationPositionError: 0.5
@@ -65,8 +71,8 @@ ModelImporter:
       name: Take 001
       takeName: Take 001
       internalID: 0
-      firstFrame: 3340
-      lastFrame: 3500
+      firstFrame: 0
+      lastFrame: 4501
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
@@ -95,7 +101,7 @@ ModelImporter:
       takeName: Take 001
       internalID: 0
       firstFrame: 1787
-      lastFrame: 1892
+      lastFrame: 1880
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
@@ -124,7 +130,7 @@ ModelImporter:
       takeName: Take 001
       internalID: 0
       firstFrame: 1710
-      lastFrame: 1787
+      lastFrame: 1790
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
@@ -153,7 +159,7 @@ ModelImporter:
       takeName: Take 001
       internalID: 0
       firstFrame: 2300
-      lastFrame: 2421
+      lastFrame: 2366
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
@@ -323,11 +329,69 @@ ModelImporter:
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
     - serializedVersion: 16
-      name: all
+      name: FuSu2
       takeName: Take 001
       internalID: 0
-      firstFrame: 0
-      lastFrame: 3734
+      firstFrame: 3749
+      lastFrame: 4325
+      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: TuoYiState
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 1064
+      lastFrame: 1065
+      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: FenXi
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 1905
+      lastFrame: 1980
       wrapMode: 0
       orientationOffsetY: 0
       level: 0

Assets/Mesh/AEDqunzhong_man.FBX.meta

@@ -12,7 +12,15 @@ ModelImporter:
   - first:
       74: -8861705643629993270
     second: ZhanLi
-  externalObjects: {}
+  - first:
+      74: 1082531598529159271
+    second: sankai
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #19
+    second: {fileID: 2100000, guid: 42c048b689d1684428b1d0339277a24c, type: 2}
   materials:
     materialImportMode: 1
     materialName: 0
@@ -102,7 +110,7 @@ ModelImporter:
       name: ZhanLi
       takeName: Take 001
       internalID: 0
-      firstFrame: 52
+      firstFrame: 60
       lastFrame: 87
       wrapMode: 0
       orientationOffsetY: 0
@@ -127,6 +135,35 @@ ModelImporter:
       maskType: 3
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: sankai
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 111
+      lastFrame: 130
+      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/Level1SanKai.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed121b2e02a23a849bc1581a96805daa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Mesh/Level1ani/npc.controller

@@ -1,5 +1,33 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-9039803274101372053
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: DunXia
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 4963680394924079791}
+  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: 7637981878267065282, guid: faad58a3df0562d44967a48bf3ae62dc,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &-8895292357535327986
 AnimatorStateMachine:
   serializedVersion: 5
@@ -15,6 +43,12 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -6729207015631175847}
     m_Position: {x: 334.46805, y: 178.06573, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -9039803274101372053}
+    m_Position: {x: 850, y: -160, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2451191104384494497}
+    m_Position: {x: 710, y: 180, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -22,9 +56,22 @@ AnimatorStateMachine:
   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_ExitPosition: {x: 990, y: 150, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -6729207015631175847}
+--- !u!114 &-8869389659795441087
+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: d4f7fef6f8e896642b7a6c3d3a132151, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  end: 0
 --- !u!1101 &-8321101215380506327
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -77,6 +124,28 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-5477033852926806967
+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: -3377350175563867511}
+  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 &-3377350175563867511
 AnimatorState:
   serializedVersion: 5
@@ -89,6 +158,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 666785529508319261}
+  - {fileID: 7073869804786140877}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -105,6 +175,34 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &-2451191104384494497
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SanKai
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -5477033852926806967}
+  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: 1082531598529159271, guid: faad58a3df0562d44967a48bf3ae62dc,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -120,6 +218,24 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
+  - m_Name: DunXia
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: SanKai
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: SanKaiEnd
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -158,3 +274,53 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &4963680394924079791
+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: SanKai
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2451191104384494497}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.7222222
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &7073869804786140877
+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: DunXia
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -9039803274101372053}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1

Assets/Mesh/Level1ani/sankai.controller

@@ -21,8 +21,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 4854180139978558704, guid: 5478e93ceaf174741a877554a1ea969d,
-    type: 3}
+  m_Motion: {fileID: 7400000, guid: ed121b2e02a23a849bc1581a96805daa, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -43,6 +42,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -97212946452960514}
     m_Position: {x: 370, y: 100, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4646899687670625484}
+    m_Position: {x: 405, y: 165, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -141,7 +143,7 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -155,3 +157,29 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1102 &4646899687670625484
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Level1SanKai
+  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: 7400000, guid: ed121b2e02a23a849bc1581a96805daa, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

Assets/Mesh/Material #19.mat

@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Material #19
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 6d65c43390c51b44cb45be84cb935123, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 6d65c43390c51b44cb45be84cb935123, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0.7924528, g: 0.7924528, b: 0.7924528, a: 1}

Assets/Mesh/Material #19.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 42c048b689d1684428b1d0339277a24c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Mesh/Material/AEDqunzhong_01.mat

@@ -9,8 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: AEDqunzhong_01
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -73,5 +73,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 1}
-    - _EmissionColor: {r: 0.0044871024, g: 0.0044871024, b: 0.0044871024, a: 1}
+    - _Color: {r: 0.7924528, g: 0.7924528, b: 0.7924528, a: 1}
+    - _EmissionColor: {r: 0.509434, g: 0.509434, b: 0.509434, a: 1}

Assets/Mesh/Material/Yishen/Kouzhao.mat

@@ -74,4 +74,4 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.25, g: 0.25, b: 0.25, a: 1}
+    - _EmissionColor: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1}

Assets/Mesh/Material/Yishen/Yifu.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Yifu
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _EMISSION
+  m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -62,16 +62,16 @@ Material:
     - _DstBlend: 0
     - _GlossMapScale: 1
     - _Glossiness: 0
-    - _GlossyReflections: 1
+    - _GlossyReflections: 0
     - _Metallic: 0.19
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
+    - _SpecularHighlights: 0
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.18946455, g: 0.18946455, b: 0.18946455, a: 1}
+    - _EmissionColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}

Assets/Mesh/Material/Yishen/casual01_m_35.mat

@@ -74,4 +74,4 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.18946455, g: 0.18946455, b: 0.18946455, a: 1}
+    - _EmissionColor: {r: 0.5566038, g: 0.5566038, b: 0.5566038, a: 1}

Assets/Mesh/dengdai.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 323866ea9dbbae54791f886a4b8558b5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Text.prefab

@@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4798585779824782896
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4798585779824782897}
+  - component: {fileID: 4798585779824782911}
+  - component: {fileID: 4798585779824782910}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4798585779824782897
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4798585779824782896}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -17, y: -18.900024}
+  m_SizeDelta: {x: 292.71118, y: 36.815216}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4798585779824782911
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4798585779824782896}
+  m_CullTransparentMesh: 0
+--- !u!114 &4798585779824782910
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4798585779824782896}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3}
+    m_FontSize: 27
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5BF9\u88AB\u6551\u8005\u7684\u64CD\u4F5C\uFF1A"

Assets/Resources/Text.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 630bfee4a91d2bb44a2237b09ef61b34
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Level3.unity

@@ -4705,12 +4705,12 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 201040509}
-  m_LocalRotation: {x: 0.0030373838, y: -0.87593114, z: 0.48239514, w: 0.0055149626}
-  m_LocalPosition: {x: -43.90671, y: 2.426836, z: 107.14391}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 1199883961}
-  m_RootOrder: 1
+  m_Father: {fileID: 279920632}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!81 &201040511
 AudioListener:
@@ -6701,6 +6701,37 @@ Transform:
   m_Father: {fileID: 672253432}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &279920631
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 279920632}
+  m_Layer: 0
+  m_Name: Part1Point (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &279920632
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 279920631}
+  m_LocalRotation: {x: 0.18679309, y: -0.6762897, z: 0.18347119, w: 0.68853396}
+  m_LocalPosition: {x: -43.145, y: 1.344, z: 106.504}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 201040510}
+  m_Father: {fileID: 1199883961}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 30.357002, y: -88.97201, z: 0}
 --- !u!1001 &280262531
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15309,7 +15340,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E0D\u6B63\u5E38"
+  m_Text: "\u6CA1\u6709\u547C\u5438"
 --- !u!222 &610043805
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -23743,7 +23774,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u660F\u8FF7"
+  m_Text: "\u6CA1\u6709\u547C\u5438"
 --- !u!222 &972260157
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -26228,6 +26259,7 @@ MonoBehaviour:
   aniAction: {fileID: 1062217261}
   cameraPoints:
   - {fileID: 1887588447}
+  - {fileID: 279920632}
   ctrlPartList:
   - {fileID: 1502901903}
   - {fileID: 1395498583}
@@ -29812,7 +29844,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1887588447}
-  - {fileID: 201040510}
+  - {fileID: 279920632}
   m_Father: {fileID: 0}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -34057,9 +34089,9 @@ RectTransform:
   m_Father: {fileID: 2046227858}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -917, y: -480.2}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 43, y: 59.80005}
   m_SizeDelta: {x: 629.33044, y: 96.13571}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1381343738
@@ -44109,6 +44141,17 @@ MonoBehaviour:
           m_StringArgument: "\u80F8\u5916\u6309\u538B"
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 1062217259}
+        m_MethodName: ChangeCameraPoint
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 2
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
   falseEvent:
     m_PersistentCalls:
       m_Calls:
@@ -45936,9 +45979,9 @@ RectTransform:
   m_Father: {fileID: 2046227858}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -211.2, y: -316}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -211.2, y: 224}
   m_SizeDelta: {x: 390.82812, y: 416.53683}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1919777259

Assets/Scenes/New Build Profile.asset

@@ -27,9 +27,9 @@ MonoBehaviour:
     BuildTarget: 20
     BuildPath: "D:/\u6253\u5305\u6D4B\u8BD5/\u65B0AED"
     SceneAssets:
-    - {fileID: 102900000, guid: 81868cf07d3a2254cae6615c4f2c50d5, type: 3}
+    - {fileID: 102900000, guid: 7c83f403f58786645b29009d1d03fc09, type: 3}
   - ProductName: Level4
     BuildTarget: 20
     BuildPath: "D:/\u6253\u5305\u6D4B\u8BD5/\u65B0AED"
     SceneAssets:
-    - {fileID: 102900000, guid: c6472ae02622c414f85e845c3d5e7d77, type: 3}
+    - {fileID: 102900000, guid: 76cf7488e3eec82448fc3f3162228e60, type: 3}

Assets/Scripts/Common.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a6138d4e7dc3f341aea7e6c6ed589da
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/AutoScrollTest.cs

@@ -0,0 +1,49 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+public class AutoScrollTest : MonoBehaviour
+{
+    public Text textPrefab;
+    public RectTransform contentRoot;
+    public MScrollRect scrollRect;
+    private float interval = 1;
+    private float time = 0;
+
+    public int currentChiCount;
+    public int lastChiCount;
+
+    private void Start()
+    {
+        currentChiCount = contentRoot.transform.childCount;
+        lastChiCount= contentRoot.transform.childCount;
+    }
+    private void Update()
+    {
+
+        //time += Time.deltaTime;
+        //if (time >= interval)
+        //{
+        //    AddText();
+        //    time = 0;
+        //}
+
+
+        currentChiCount = contentRoot.transform.childCount;
+        if (currentChiCount != lastChiCount)
+        {
+            float height = contentRoot.rect.height;
+            height += 25;        
+            contentRoot.sizeDelta = new Vector2 (contentRoot.sizeDelta.x, height);
+            StartCoroutine(UIHelper.ScrollToBottom(scrollRect));
+           
+            lastChiCount = currentChiCount;
+        }
+
+    }
+
+    public void AddText()
+    {
+        UIHelper.AddScrollText(textPrefab, contentRoot, time.ToString(), scrollRect);
+    }
+}
+

Assets/Scripts/Common/AutoScrollTest.cs.meta

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

Assets/Scripts/Common/MScrollRect.cs

@@ -0,0 +1,21 @@
+using UnityEngine.UI;
+using UnityEngine.EventSystems;
+
+public class MScrollRect : ScrollRect
+{
+    public bool isDrag;
+    public override void OnDrag(PointerEventData eventData)
+    {
+        base.OnDrag(eventData);
+        isDrag = true;
+    }
+
+    public override void OnEndDrag(PointerEventData eventData)
+    {
+        base.OnEndDrag(eventData);
+        if (normalizedPosition.y <= 0)
+        {
+            isDrag = false;
+        }
+    }
+}

Assets/Scripts/Common/MScrollRect.cs.meta

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

Assets/Scripts/Common/UIHelper.cs

@@ -0,0 +1,28 @@
+using UnityEngine;
+using System.Collections;
+using UnityEngine.UI;
+
+public static class UIHelper
+{
+    public static void AddScrollText(Text prefab, RectTransform contentRoot, string text, MScrollRect scrollRect)
+    {
+        if (contentRoot == null)
+            return;
+
+        var listItem = GameObject.Instantiate<Text>(prefab, contentRoot, false);
+        listItem.text = text;
+
+        if (scrollRect != null && scrollRect.isActiveAndEnabled)
+            scrollRect.StartCoroutine(ScrollToBottom(scrollRect));
+    }
+
+    public static IEnumerator ScrollToBottom(MScrollRect scrollRect)
+    {
+        yield return null;
+
+        if (scrollRect != null && scrollRect.isActiveAndEnabled && !scrollRect.isDrag)
+            scrollRect.normalizedPosition = new Vector2(0, 0);
+    }
+}
+
+

Assets/Scripts/Common/UIHelper.cs.meta

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

Assets/Scripts/Level1/Level1Manager.cs

@@ -138,8 +138,7 @@ public class Level1Manager : MonoSingleton<Level1Manager>
 
     void DisperseCrowd(params object[] data) {
         PlaySankai();
-        Invoke("SankaiAni",4f);
-        
+        Invoke("SankaiAni",1.5f);
     }
 
     void EndGame() {
@@ -148,7 +147,7 @@ public class Level1Manager : MonoSingleton<Level1Manager>
 
     public void PlaySankai() {
         audioSource.clip = audioClips;
-        audioSource.Play();
+       // audioSource.Play();
     }
     void SankaiAni() {
         sjzanimator.SetTrigger("Sankai");

Assets/Scripts/Level1/NPCControl.cs

@@ -14,8 +14,8 @@ public class NPCControl : MonoBehaviour
     }
 
     public void BackPos() {
-        transform.localEulerAngles += new Vector3(0,180,0);
-        StartCoroutine(MovePosByWalk(transform, birthPos, 2f));
+        animator.SetTrigger("SanKai");
+        Invoke("Eback",0.1f);
     }
 
     public void StartWalk() {
@@ -29,14 +29,23 @@ public class NPCControl : MonoBehaviour
             yield return new WaitForFixedUpdate();
             Vector3 moveDir = (targetPos - ts.position).normalized;
             ts.position += moveDir * Time.fixedDeltaTime * speed;
-            //Quaternion targetRotation = Quaternion.LookRotation(targetPos - ts.position);
-            //ts.rotation = Quaternion.Lerp(ts.rotation, targetRotation, 0.01f);
             if (Vector3.Distance(ts.position, targetPos) <= 0.1)
             {
                 ts.position = targetPos;
-                animator.SetBool("Walk", false);
+                animator.SetTrigger("DunXia");
+                Debug.Log("dunxia");
                 yield break;
             }
         }
     }
+
+    public void Eback() {
+        Debug.Log("返回");
+        transform.localEulerAngles += new Vector3(0, 180, 0);
+        Invoke("run",0.2f);
+    }
+
+    void run() {
+        StartCoroutine(MovePosByWalk(transform, birthPos, 2f));
+    }
 }

Assets/Scripts/Level1/SankaiState.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class NPCSankaiState : StateMachineBehaviour
+{
+    bool end = false;
+    public override void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+    {
+        if (stateInfo.normalizedTime >= 1 && !end)
+        {
+            end = true;
+            Debug.Log("散开结束");
+            animator.gameObject.GetComponent<NPCControl>().Eback();
+            animator.SetTrigger("SanKaiEnd");
+        }
+
+    }
+}

Assets/Scripts/Level1/SankaiState.cs.meta

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

Assets/Scripts/Level2/Const/Level2Const.cs

@@ -6,5 +6,5 @@ public static class Level2Const
     public static string operate2Info = "5-观察被救者部位";
     public static string operate3Info = "6-选择合适的操作";
     public static Color operateFrontColor = new Color32(255, 255, 255, 255);//操作未完成文本颜色
-    public static Color operateAfterColor = Color.gray;//操作完成文本颜色
+    public static Color operateAfterColor = new Color32(175, 175, 175, 255);//操作完成文本颜色
 }

Assets/Scripts/Level2/Level2Manager.cs

@@ -141,7 +141,7 @@ public class Level2Manager : MonoSingleton<Level2Manager>
                 cmtransform.DORotate(cmBirthPlace.localEulerAngles,0.5f);
                 animator.SetTrigger("TXEnd");
             }, 3.5f));
-            StartCoroutine(WaitExecute(PlayAudio, 5));
+            StartCoroutine(WaitExecute(PlayAudio, 0.5f));
         }));
     }
 

Assets/Scripts/Pass3/Pass3AniAction.cs

@@ -15,18 +15,29 @@ public class Pass3AniAction : AniAction
 
 
 
-        AniActionDict.Add("FuSu", () => {
+        AniActionDict.Add("FuSu", () =>
+        {
+            PassManager.Instance.SetStudentAni("3FuSu");
+           
+            
 
-           PassManager.Instance. SetCtrlPart(3);
+        });
+        AniActionDict.Add("3FuSu", () =>
+        {
+           
+            PassManager.Instance.SetCtrlPart(3);
             PassManager.Instance.SetTip(3);
 
+
         });
 
-        AniActionDict.Add("RGHX", () => {
+        AniActionDict.Add("RGHX", () =>
+        {
 
-            PassManager.Instance.SetNpcSate("仍然无明显反应");
+            // PassManager.Instance.SetNpcSate("仍然无明显反应");
             PassManager.Instance.SetTip("人工呼吸完成，被救者仍然无明显反应,请前往下一关卡进行使用AED");
             PassManager.Instance.PassOver();
+            PassManager.Instance.ChangeCameraPoint(1);
         });
     }
 }

Assets/Scripts/pass4/Pass4AniAction.cs

@@ -38,8 +38,15 @@ public class Pass4AniAction : AniAction
         });
 
         AniActionDict.Add("QingSanKai", () => {
-         
 
+            PassManager.Instance.SetStudentAni("FenXi");
+            
+           
+
+        });
+        AniActionDict.Add("FenXi", () => {
+
+            
             xinLvTip.SetActive(true);
             PassManager.Instance.StartTimeAction(4f, () => {
                 xinLvTip.SetActive(false);
@@ -50,6 +57,7 @@ public class Pass4AniAction : AniAction
 
         });
 
+
         AniActionDict.Add("AnChuChan", () => {
             PassManager.Instance.SetTip("除颤进行中，请等待");
             chuChanTip.SetActive(true);
@@ -63,10 +71,14 @@ public class Pass4AniAction : AniAction
         });
 
         AniActionDict.Add("FuSu", () => {
+            PassManager.Instance.SetStudentAni("3FuSu");
+            
+        });
+        AniActionDict.Add("3FuSu", () => {
+            
             PassManager.Instance.SetStudentAni("RGHX");
         });
 
-
         AniActionDict.Add("RGHX", () => {
 
             PassManager.Instance.SetCtrlPart(6);

ProjectSettings/EditorBuildSettings.asset

@@ -5,10 +5,10 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/Level1.unity
     guid: 4233a03550fb9124db863528d6c65f60
-  - enabled: 1
+  - enabled: 0
     path: Assets/Scenes/Level2.unity
     guid: be9f593401d7c4647a1342851397a640
   - enabled: 0

ProjectSettings/QualitySettings.asset

@@ -193,11 +193,11 @@ QualitySettings:
     shadowResolution: 2
     shadowProjection: 1
     shadowCascades: 4
-    shadowDistance: 150
+    shadowDistance: 50
     shadowNearPlaneOffset: 3
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 1
+    shadowmaskMode: 0
     skinWeights: 4
     textureQuality: 0
     anisotropicTextures: 2