整合后的细节修改

1 year ago · 4e349c7349
parent 2ca9038539
commit 4e349c7349
27 changed files with 530748 additions and 236 deletions
--- a/AED.psd
+++ b/AED.psd
--- a/Assets/Mesh/AED03.controller
+++ b/Assets/Mesh/AED03.controller
@ -109,7 +109,7 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &-3904450527151307668
+--- !u!1101 &-6713088535870741363
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@ -131,14 +131,63 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1102 &-2445822652269321697
+--- !u!1102 &-3746405878785188469
 AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: DanChunQingSanKai
+  m_Name: AnChuChan2
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -3680229609780433234}
+  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: 4a43f63ab363e6f46968943e607791d0, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-3680229609780433234
+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.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &-3014542640407557148
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: DanChunQingSanKai2
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
@ -151,21 +200,20 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 4854180139978558704, guid: 5478e93ceaf174741a877554a1ea969d,
-    type: 3}
+  m_Motion: {fileID: 7400000, guid: 95edc5a5efd340e498413ea88e17330c, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-2312022115483516922
+--- !u!1102 &-2445822652269321697
 AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: EndFuSu
+  m_Name: DanChunQingSanKai
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
@ -178,21 +226,21 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: -7100618163015802634, guid: edda6d24ad24efd4f8111b709188e239,
+  m_Motion: {fileID: 4854180139978558704, guid: 5478e93ceaf174741a877554a1ea969d,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-1069381156878180000
+--- !u!1102 &-2312022115483516922
 AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: LeftTiePian
+  m_Name: EndFuSu
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
@ -205,25 +253,24 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: -5020793750439751421, guid: 5478e93ceaf174741a877554a1ea969d,
+  m_Motion: {fileID: -7100618163015802634, guid: edda6d24ad24efd4f8111b709188e239,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-573950803814654784
+--- !u!1102 &-1069381156878180000
 AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: FenXi
+  m_Name: LeftTiePian
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -3904450527151307668}
+  m_Transitions: []
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -233,7 +280,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: -2316810345196295183, guid: 5478e93ceaf174741a877554a1ea969d,
+  m_Motion: {fileID: -5020793750439751421, guid: 5478e93ceaf174741a877554a1ea969d,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
@ -348,25 +395,31 @@ AnimatorStateMachine:
    m_Position: {x: 290, y: 410, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -2445822652269321697}
-    m_Position: {x: 630, y: 490, z: 0}
+    m_Position: {x: 640, y: 460, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 221862564237850720}
-    m_Position: {x: 650, y: 540, z: 0}
+    m_Position: {x: 640, y: 510, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -8242147095563566239}
-    m_Position: {x: 550, y: 0, z: 0}
+    m_Position: {x: 630, y: 140, 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}
+    m_Position: {x: 640, y: 360, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 4217339329217386873}
-    m_Position: {x: 830, y: 40, z: 0}
+    m_Position: {x: 900, y: 140, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 3979542907300342388}
+    m_Position: {x: 630, y: 220, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -3014542640407557148}
+    m_Position: {x: 640, y: 410, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -3746405878785188469}
+    m_Position: {x: 630, y: 70, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
@ -374,7 +427,7 @@ AnimatorStateMachine:
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: 60, y: 50, z: 0}
  m_EntryPosition: {x: 60, y: 110, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ExitPosition: {x: 900, y: 300, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -7980876672862009540}
 --- !u!1101 &2083612033345293255
@ -453,6 +506,33 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &3979542907300342388
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FenXi2
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -6713088535870741363}
+  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: 8bb59d0e8cbd8fa408a87cf15e7aa12e, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &4217339329217386873
 AnimatorState:
  serializedVersion: 5
--- a/Assets/Mesh/AEDAll_01NewZouPao.FBX.meta
+++ b/Assets/Mesh/AEDAll_01NewZouPao.FBX.meta
@ -12,6 +12,9 @@ ModelImporter:
  - first:
      74: 6200578666267062213
    second: run
+  - first:
+      74: -8861705643629993270
+    second: ZhanLi
  externalObjects: {}
  materials:
    materialImportMode: 1
@ -127,6 +130,35 @@ ModelImporter:
      maskType: 3
      maskSource: {instanceID: 0}
      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: ZhanLi
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 104
+      lastFrame: 105
+      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: []
--- a/Assets/Mesh/AnChuChan2.anim
+++ b/Assets/Mesh/AnChuChan2.anim
--- a/Assets/Mesh/AnChuChan2.anim.meta
+++ b/Assets/Mesh/AnChuChan2.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4a43f63ab363e6f46968943e607791d0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Mesh/DanChunQingSanKai2.anim
+++ b/Assets/Mesh/DanChunQingSanKai2.anim
--- a/Assets/Mesh/DanChunQingSanKai2.anim.meta
+++ b/Assets/Mesh/DanChunQingSanKai2.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 95edc5a5efd340e498413ea88e17330c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Mesh/FenXi2.anim
+++ b/Assets/Mesh/FenXi2.anim
--- a/Assets/Mesh/FenXi2.anim.meta
+++ b/Assets/Mesh/FenXi2.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8bb59d0e8cbd8fa408a87cf15e7aa12e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Mesh/Level1NewStudunt.controller
+++ b/Assets/Mesh/Level1NewStudunt.controller
@ -204,7 +204,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 1827226128182048838, guid: bf7660972d1aa4944917a9cd7bb0dcab,
+  m_Motion: {fileID: -8861705643629993270, guid: bf7660972d1aa4944917a9cd7bb0dcab,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
@ -254,19 +254,19 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: Walk
    m_Type: 4
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: Run
    m_Type: 4
    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
--- a/Assets/Mesh/Level1SanKai.anim
+++ b/Assets/Mesh/Level1SanKai.anim
@ -28994,7 +28994,7 @@ AnimationClip:
    m_Level: 0
    m_CycleOffset: 0
    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
+    m_LoopTime: 0
    m_LoopBlend: 0
    m_LoopBlendOrientation: 0
    m_LoopBlendPositionY: 0
--- a/Assets/Mesh/Level1ani/npc.controller
+++ b/Assets/Mesh/Level1ani/npc.controller
@ -21,7 +21,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7637981878267065282, guid: faad58a3df0562d44967a48bf3ae62dc,
+  m_Motion: {fileID: -8861705643629993270, guid: faad58a3df0562d44967a48bf3ae62dc,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
@ -217,25 +217,25 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: DunXia
    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: SanKai
    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: SanKaiEnd
    m_Type: 9
    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
--- a/Assets/Mesh/NPC2.controller
+++ b/Assets/Mesh/NPC2.controller
@ -21,8 +21,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: -7478017851592872485, guid: 5478e93ceaf174741a877554a1ea969d,
-    type: 3}
+  m_Motion: {fileID: 0}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
--- a/Assets/Resources/operate.prefab
+++ b/Assets/Resources/operate.prefab
@ -67,10 +67,10 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3}
-    m_FontSize: 25
+    m_FontSize: 23
    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 15
+    m_BestFit: 0
+    m_MinSize: 2
    m_MaxSize: 25
    m_Alignment: 3
    m_AlignByGeometry: 0
--- a/Assets/Scenes/AED.unity
+++ b/Assets/Scenes/AED.unity
@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44531816, g: 0.49496323, b: 0.5739542, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -4757,8 +4757,8 @@ Camera:
  m_GameObject: {fileID: 210506936}
  m_Enabled: 1
  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.21814829, g: 1, b: 0.10849059, a: 0}
  m_projectionMatrixMode: 1
  m_GateFitMode: 2
  m_FOVAxisMode: 0
@ -4773,7 +4773,7 @@ Camera:
    height: 1
  near clip plane: 0.3
  far clip plane: 1000
-  field of view: 60
+  field of view: 30.8
  orthographic: 0
  orthographic size: 5
  m_Depth: -1
@ -4798,8 +4798,8 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 210506936}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
+  m_LocalRotation: {x: 0.05462176, y: 0.7260842, z: -0.6829694, w: 0.058061812}
+  m_LocalPosition: {x: -480.83, y: 1.2425996, z: 101.91664}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
@ -40701,6 +40701,100 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1974364004}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1975929640
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 731756246429292202, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 901808068256900297, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1562325552038418511, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6991739599617941527, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_Name
+      value: AEDAll_01New
+      objectReference: {fileID: 0}
+    - target: {fileID: 6991739599617941527, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -480.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.5033684
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 102.7813
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659627580239264429, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8793411806985166191, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0cdbe675c9c9bf14cab36dd00dffd4f9, type: 3}
 --- !u!1001 &1976011411
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/Level1.unity
+++ b/Assets/Scenes/Level1.unity
@ -11389,8 +11389,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -11555,8 +11555,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -11690,8 +11690,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -14877,8 +14877,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -20409,7 +20409,7 @@ PrefabInstance:
    - target: {fileID: -8679921383154817045, guid: 228b9d504b44ef542bf0e9fe8f63d47b,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 145.98
+      value: 141.84
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 228b9d504b44ef542bf0e9fe8f63d47b,
        type: 3}
@ -23566,8 +23566,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -29037,7 +29037,7 @@ MonoBehaviour:
  showText: {fileID: 1304876436}
  curDialogue: 0
  dialogues:
-  - "\u5C0F\u660E\u662F\u4E00\u540D\u5927\u5B66\u751F\uFF0C\u4ECA\u5929\u5728\u5546\u573A\u8DEF\u8FC7\uFF0C\u7A81\u7136\u53D1\u73B0\u4E00\u4F4D\u6655\u5012\u5728\u5730\u7684\u8DEF\u4EBA\u3002\u4F60\u611F\u5230\u975E\u5E38\u7D27\u5F20\u548C\u56F0\u60D1\u3002\u4F5C\u4E3A\u4E00\u540D\u5B66\u751F\uFF0C\u867D\u7136\u6CA1\u6709\u4E13\u4E1A\u7684\u6025\u6551\u6280\u80FD\u548C\u7ECF\u9A8C\uFF0C\u4F60\u53EF\u4EE5\u5148\u5C1D\u8BD5\u62E8\u6253\u5F53\u5730\u7684\u6025\u6551\u7535\u8BDD120\uFF0C\u5E76\u5224\u65AD\u88AB\u6551\u8005\u7684\u60C5\u51B5\uFF0C\u8003\u8651\u5229\u7528\u81EA\u5DF1\u5177\u5907\u7684\u5FC3\u80BA\u590D\u82CF\u4E0E\u5FC3\u810F\u9664\u98A4\u6025\u6551\u77E5\u8BC6\u5BF9\u60A3\u8005\u8FDB\u884C\u6025\u6551"
+  - "\u5C0F\u660E\u662F\u4E00\u540D\u5927\u5B66\u751F\uFF0C\u4ECA\u5929\u5728\u5546\u573A\u8DEF\u8FC7\uFF0C\u7A81\u7136\u53D1\u73B0\u4E00\u4F4D\u6655\u5012\u5728\u5730\u7684\u8DEF\u4EBA\u3002\u4F5C\u4E3A\u4E00\u540D\u5B66\u751F\uFF0C\u867D\u7136\u6CA1\u6709\u4E13\u4E1A\u7684\u6025\u6551\u6280\u80FD\u548C\u7ECF\u9A8C\uFF0C\u4F60\u53EF\u4EE5\u5148\u5C1D\u8BD5\u62E8\u6253\u5F53\u5730\u7684\u6025\u6551\u7535\u8BDD120\uFF0C\u5E76\u5224\u65AD\u88AB\u6551\u8005\u7684\u60C5\u51B5\uFF0C\u8003\u8651\u5229\u7528\u81EA\u5DF1\u5177\u5907\u7684\u5FC3\u80BA\u590D\u82CF\u4E0E\u5FC3\u810F\u9664\u98A4\u6025\u6551\u77E5\u8BC6\u5BF9\u60A3\u8005\u8FDB\u884C\u6025\u6551"
  - 
  - 
  - 
@ -31146,7 +31146,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 201.84558, y: 350.3}
+  m_AnchoredPosition: {x: 226, y: 350.3}
  m_SizeDelta: {x: 150, y: 200}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1026219516
@ -34072,6 +34072,11 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 8
      objectReference: {fileID: 0}
+    - target: {fileID: 2086276236115935925, guid: b8772314a357f27409b4cfefa5135127,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 2268164877986776012, guid: b8772314a357f27409b4cfefa5135127,
        type: 3}
      propertyPath: m_Layer
@ -35289,7 +35294,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u758F\u6563\u5468\u8FB9\u4EBA\u7FA4"
+  m_Text: "\u758F\u6563\u5468\u8FB9\u65E0\u5173\u4EBA\u5458"
 --- !u!222 &1171445533
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -35637,8 +35642,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -43215,7 +43220,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: dcf60074f01d2e542a4577d258c664ea, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -45.120102
+      value: -46.72
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: dcf60074f01d2e542a4577d258c664ea, type: 3}
      propertyPath: m_LocalPosition.y
@ -43223,7 +43228,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: dcf60074f01d2e542a4577d258c664ea, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 134.32
+      value: 132.69
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: dcf60074f01d2e542a4577d258c664ea, type: 3}
      propertyPath: m_LocalRotation.w
@ -45714,8 +45719,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -47657,8 +47662,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -52332,6 +52337,11 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 8
      objectReference: {fileID: 0}
+    - target: {fileID: 2086276236115935925, guid: b8772314a357f27409b4cfefa5135127,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 2268164877986776012, guid: b8772314a357f27409b4cfefa5135127,
        type: 3}
      propertyPath: m_Layer
@ -52759,20 +52769,35 @@ PrefabInstance:
      propertyPath: m_RootOrder
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f697c3224ef578149a2af8c6de7920eb,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.72363
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f697c3224ef578149a2af8c6de7920eb,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.72363
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f697c3224ef578149a2af8c6de7920eb,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.72363
+      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: f697c3224ef578149a2af8c6de7920eb,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -45.04
+      value: -46.54
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: f697c3224ef578149a2af8c6de7920eb,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.56
+      value: 0.65907
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: f697c3224ef578149a2af8c6de7920eb,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 140.83
+      value: 136.31
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: f697c3224ef578149a2af8c6de7920eb,
        type: 3}
@ -55081,7 +55106,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 201.84558, y: 350.3}
+  m_AnchoredPosition: {x: 235, y: 403}
  m_SizeDelta: {x: 150, y: 200}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1874961605
@ -60442,7 +60467,7 @@ PrefabInstance:
    - target: {fileID: -8679921383154817045, guid: 7dd652e795bbec74e8e6592ac449cc76,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 151.48
+      value: 146.1
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 7dd652e795bbec74e8e6592ac449cc76,
        type: 3}
@ -62300,17 +62325,29 @@ PrefabInstance:
      propertyPath: m_RootOrder
      value: 7
      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 460a8dcfaacd169408e76c03084bd8b7, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.81871
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 460a8dcfaacd169408e76c03084bd8b7, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.81871
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 460a8dcfaacd169408e76c03084bd8b7, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.81871
+      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 460a8dcfaacd169408e76c03084bd8b7, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -47.12
+      value: -47.417
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 460a8dcfaacd169408e76c03084bd8b7, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.57
+      value: 0.59341
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 460a8dcfaacd169408e76c03084bd8b7, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 135.59
+      value: 129.628
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 460a8dcfaacd169408e76c03084bd8b7, type: 3}
      propertyPath: m_LocalRotation.w
--- a/Assets/Scenes/Level2.unity
+++ b/Assets/Scenes/Level2.unity
@ -1774,13 +1774,13 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 96105465}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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:
  - {fileID: 289090294}
  - {fileID: 1477930349}
-  m_Father: {fileID: 2094399789}
+  m_Father: {fileID: 487939551}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -7093,13 +7093,13 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 275092871}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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:
  - {fileID: 384827331}
  - {fileID: 1297995125}
-  m_Father: {fileID: 487939551}
+  m_Father: {fileID: 2094399789}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -8448,7 +8448,7 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 295021946}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: []
@ -8457,7 +8457,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -714, y: -331}
+  m_AnchoredPosition: {x: 206, y: 312}
  m_SizeDelta: {x: 150, y: 200}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &295021948
@ -9269,13 +9269,13 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 325930757}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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:
  - {fileID: 1884934965}
  - {fileID: 1084391070}
-  m_Father: {fileID: 2094399789}
+  m_Father: {fileID: 487939551}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -13301,9 +13301,9 @@ MonoBehaviour:
  dialogues:
  - "\u5B8C\u6210\u786E\u8BA4\u73B0\u573A\u5B89\u5168\u540E\uFF0C\u63A5\u4E0B\u6765\u51C6\u5907\u5BF9\u88AB\u6551\u8005\u8FDB\u884C\u5224\u65AD\u547C\u6551"
  - "\u8BF7\u9009\u62E9\u6B63\u786E\u7684\u90E8\u4F4D\u8FDB\u884C\u62CD\u6253\u8BE2\u95EE"
-  - "\u8BF7\u9009\u62E9\u6B63\u786E\u7684\u90E8\u4F4D\u8FDB\u884C\u89C2\u5BDF\u88AB\u6551\u8005\u7684\u547C\u5438"
-  - "\u8BF7\u70B9\u51FB\u5DE6\u65B9\u5DE5\u5177\u7BB1\u8FDB\u884C\u4E0B\u4E00\u6B65\u63AA\u65BD"
-  - "\u6210\u529F\u786E\u8BA4\u88AB\u6551\u8005\u60C5\u51B5"
+  - "\u7ECF\u8FC7\u62CD\u6253\u540E\u53D1\u73B0\u88AB\u6551\u8005\u65E0\u610F\u8BC6\uFF0C\u8BF7\u9009\u62E9\u6B63\u786E\u7684\u90E8\u4F4D\u8FDB\u884C\u89C2\u5BDF\u88AB\u6551\u8005\u7684\u547C\u5438"
+  - "\u89C2\u5BDF\u547C\u5438\u540E\u88AB\u6551\u8005\u65E0\u547C\u5438\uFF0C\u8BF7\u70B9\u51FB\u5DE6\u65B9\u5DE5\u5177\u7BB1\u8FDB\u884C\u4E0B\u4E00\u6B65\u63AA\u65BD"
+  - "\u6210\u529F\u786E\u8BA4\u88AB\u6551\u8005\u60C5\u51B5\uFF0C\u8BF7\u524D\u5F80\u4E0B\u4E00\u5173\u5361\u8FDB\u884C30:2\u5FC3\u80BA\u590D\u82CF"
  - 
  - 
  - 
@ -13546,7 +13546,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -751, y: -56}
+  m_AnchoredPosition: {x: -751, y: -25.2}
  m_SizeDelta: {x: 300, y: 80}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &479306869
@ -13809,17 +13809,17 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 1692494128}
-  - {fileID: 275092872}
-  - {fileID: 518990882}
-  - {fileID: 1109878089}
+  - {fileID: 96105466}
+  - {fileID: 1873259907}
+  - {fileID: 985865919}
+  - {fileID: 325930758}
  m_Father: {fileID: 758956101}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &487939552
 MonoBehaviour:
@ -14602,13 +14602,13 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 518990881}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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:
  - {fileID: 1165413109}
  - {fileID: 272466548}
-  m_Father: {fileID: 487939551}
+  m_Father: {fileID: 2094399789}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -24908,7 +24908,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 3, y: -409}
+  m_AnchoredPosition: {x: 3, y: -301.8}
  m_SizeDelta: {x: 131, y: 179}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &926120713
@ -26048,13 +26048,13 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 985865918}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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:
  - {fileID: 1077429689}
  - {fileID: 113987337}
-  m_Father: {fileID: 2094399789}
+  m_Father: {fileID: 487939551}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -29087,13 +29087,13 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1109878088}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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:
  - {fileID: 326872564}
  - {fileID: 915780788}
-  m_Father: {fileID: 487939551}
+  m_Father: {fileID: 2094399789}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -29967,10 +29967,10 @@ RectTransform:
  m_Father: {fileID: 758956101}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &1151176759
 PrefabInstance:
@ -41996,13 +41996,13 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1692494127}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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:
  - {fileID: 1176520311}
  - {fileID: 2084703657}
-  m_Father: {fileID: 487939551}
+  m_Father: {fileID: 2094399789}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -45904,13 +45904,13 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1873259906}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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:
  - {fileID: 1884303398}
  - {fileID: 428021858}
-  m_Father: {fileID: 2094399789}
+  m_Father: {fileID: 487939551}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -48137,7 +48137,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!64 &1965418837
 MeshCollider:
  m_ObjectHideFlags: 0
@ -52057,17 +52057,17 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 96105466}
-  - {fileID: 1873259907}
-  - {fileID: 985865919}
-  - {fileID: 325930758}
+  - {fileID: 1692494128}
+  - {fileID: 275092872}
+  - {fileID: 518990882}
+  - {fileID: 1109878089}
  m_Father: {fileID: 758956101}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2094399790
 MonoBehaviour:
--- a/Assets/Scenes/Level3.unity
+++ b/Assets/Scenes/Level3.unity
@ -37176,7 +37176,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!64 &1499374483
 MeshCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/Level4.unity
+++ b/Assets/Scenes/Level4.unity
--- a/Assets/Scenes/New
+++ b/Assets/Scenes/New
@ -0,0 +1,30 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 0}
+  m_Name: "New Build Profile - \u526F\u672C"
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::BuildProfile
+  BuildTasks:
+  - ProductName: Level2
+    BuildTarget: 20
+    BuildPath: "D:/\u6253\u5305\u6D4B\u8BD5/\u65B0AED"
+    SceneAssets:
+    - {fileID: 102900000, guid: be9f593401d7c4647a1342851397a640, type: 3}
+  - ProductName: Level3
+    BuildTarget: 20
+    BuildPath: "D:/\u6253\u5305\u6D4B\u8BD5/\u65B0AED"
+    SceneAssets:
+    - {fileID: 102900000, guid: 7c83f403f58786645b29009d1d03fc09, type: 3}
+  - ProductName: Level4
+    BuildTarget: 20
+    BuildPath: "D:/\u6253\u5305\u6D4B\u8BD5/\u65B0AED"
+    SceneAssets:
+    - {fileID: 102900000, guid: 76cf7488e3eec82448fc3f3162228e60, type: 3}
--- a/副本.asset.meta
+++ b/副本.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 890e0b20c25a290439640447303c7441
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Common/PassManager.cs
+++ b/Assets/Scripts/Common/PassManager.cs
@ -138,6 +138,11 @@ public class PassManager : MonoBehaviour

        PartTipText.ChangeText(PartTipTxtList[index - 1], action);
    }
+    public void SetTip(string str, Action action)
+    {
+
+        PartTipText.ChangeText(str, action);
+    }
    public void SetTip(string str)
    {

--- a/Assets/Scripts/Level1/Level1Const.cs
+++ b/Assets/Scripts/Level1/Level1Const.cs
@ -2,7 +2,7 @@

 public static class Level1Const
 {
-    public static string operate1Info = "1-选择施救方式";
+    public static string operate1Info = "1-选择施救动作";
    public static string operate2Info = "2-根据周围环境，选择合适操作";
    public static string operate3Info = "3-转移到安全区域之后，选择合适操作";
    public static Color operateFrontColor = new Color32(255, 255, 255, 255);//操作未完成文本颜色
--- a/Assets/Scripts/Level2/AniEnd.cs
+++ b/Assets/Scripts/Level2/AniEnd.cs
@ -28,7 +28,8 @@ public class AniEnd : MonoBehaviour
        errorTip.InitThis("恭喜通关", 60);
        DialogueController.Instance.StartDialogue(4);
        Level2Manager.Instance.allOperate[2].Finished();
-        EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
+        StartCoroutine(Timer(() => { EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); }, 2.5f));
+     
    }

    IEnumerator Timer(Action action,float t) {
--- a/Assets/Scripts/Pass3/Pass3AniAction.cs
+++ b/Assets/Scripts/Pass3/Pass3AniAction.cs
@ -35,8 +35,8 @@ public class Pass3AniAction : AniAction
        {

            // PassManager.Instance.SetNpcSate("仍然无明显反应");
-            PassManager.Instance.SetTip("人工呼吸完成，被救者仍然无明显反应,请前往下一关卡进行使用AED");
-            PassManager.Instance.PassOver();
+            PassManager.Instance.SetTip("人工呼吸完成，被救者仍然无明显反应,请前往下一关卡进行使用AED",()=> {PassManager.Instance.PassOver(); });
+            
            PassManager.Instance.ChangeCameraPoint(1);
        });
    }
--- a/Assets/Scripts/pass4/Pass4AniAction.cs
+++ b/Assets/Scripts/pass4/Pass4AniAction.cs
@ -10,7 +10,9 @@ public class Pass4AniAction : AniAction
    public GameObject chuChanTip;
    public GameObject chuChanPanel;
    public GameObject Part6Btn;
-    
+
+    int sanKaiIndex = 1;
+    int fuSuIndex = 1;

    public GameObject doctor;
    public Transform endPoint;
@ -23,7 +25,7 @@ public class Pass4AniAction : AniAction
        PassManager.Instance.AddHisitoryInfo("判断意识");
        PassManager.Instance.AddHisitoryInfo("观察呼吸");
        PassManager.Instance.AddHisitoryInfo("拨打呼救");
-        PassManager.Instance.AddHisitoryInfo("30比2心肺复苏");
+        PassManager.Instance.AddHisitoryInfo("30:2心肺复苏");
        PassManager.Instance.AddHisitoryInfo("人工呼吸");
        PassManager.Instance.AddHisitoryInfo("打开AED电源");

@ -37,14 +39,26 @@ public class Pass4AniAction : AniAction
            PassManager.Instance.SetCtrlPart(3);
        });

-        AniActionDict.Add("QingSanKai", () => {
+        AniActionDict.Add("DanChunQingSanKai2", () => {
+
+            if (sanKaiIndex == 1)
+            {
+                sanKaiIndex++;
+                PassManager.Instance.SetStudentAni("FenXi2");

-            PassManager.Instance.SetStudentAni("FenXi");
+            }
+            else
+            {
+               // PassManager.Instance.SetStudentAni("AnChuChan2");
+            }
+         
+            
+           
            
           

        });
-        AniActionDict.Add("FenXi", () => {
+        AniActionDict.Add("FenXi2", () => {

            
            xinLvTip.SetActive(true);
@ -58,7 +72,7 @@ public class Pass4AniAction : AniAction
        });


-        AniActionDict.Add("AnChuChan", () => {
+        AniActionDict.Add("AnChuChan2", () => {
            PassManager.Instance.SetTip("除颤进行中，请等待");
            chuChanTip.SetActive(true);
            PassManager.Instance.StartTimeAction(4f, () => {
@ -81,28 +95,39 @@ public class Pass4AniAction : AniAction

        AniActionDict.Add("RGHX", () => {

-            PassManager.Instance.SetCtrlPart(6);
-            int ran = Random.Range(0, 100);
-            if (ran > 50)
+            if (fuSuIndex == 1)
            {
-                Part6Btn.SetActive(true);
-                PassManager.Instance.SetTip("经过30：2的胸外按压和人工呼吸，被救者的意识依然没有恢复,请点击工具箱");
-                
+                PassManager.Instance.SetCtrlPart(6);
+                int ran = Random.Range(0, 100);
+                if (ran > 50)
+                {
+                    Part6Btn.SetActive(true);
+                    PassManager.Instance.SetTip("经过30:2的胸外按压和人工呼吸，被救者的意识依然没有恢复,请点击工具箱");
+                    fuSuIndex += 1;
+                }
+                else
+                {
+
+                    Part6Btn.SetActive(false);
+                    PassManager.Instance.SetTip("经过再次的30:2的胸外按压和人工呼吸，被救者的意识得到了恢复，等待到了急救人员赶到了现场，现在将抢救工作交给医护人员，恭喜通关！");
+                    EndAni();
+
+                }
            }
            else
            {

-                Part6Btn.SetActive(false);
-                PassManager.Instance.SetTip("经过30：2的胸外按压和人工呼吸，被救者的意识得到了恢复，正好急救人员了赶到了现场，抢救成功！");
+                PassManager.Instance.SetTip("经过再次的30:2的胸外按压和人工呼吸，被救者的意识得到了恢复，等待到了急救人员赶到了现场，现在将抢救工作交给医护人员，恭喜通关！", () => { PassManager.Instance.PassOver(); });
                EndAni();

            }
+           


        });

        AniActionDict.Add("EndFuSu", () => {
-            PassManager.Instance.SetTip("经过再次的30：2的胸外按压和人工呼吸，被救者的意识得到了恢复，正好急救人员了赶到了现场，抢救成功！");
+            PassManager.Instance.SetTip("经过再次的30:2的胸外按压和人工呼吸，被救者的意识得到了恢复，等待到了急救人员赶到了现场，现在将抢救工作交给医护人员，恭喜通关！",()=> { PassManager.Instance.PassOver(); });
            EndAni();
        });

--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -5,7 +5,7 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 1
+  - enabled: 0
    path: Assets/Scenes/Level1.unity
    guid: 4233a03550fb9124db863528d6c65f60
  - enabled: 0
@ -17,4 +17,7 @@ EditorBuildSettings:
  - enabled: 0
    path: 
    guid: 00000000000000000000000000000000
+  - enabled: 1
+    path: Assets/Scenes/Level4.unity
+    guid: 76cf7488e3eec82448fc3f3162228e60
  m_configObjects: {}