diff --git a/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta b/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
new file mode 100644
index 0000000..e474937
--- /dev/null
+++ b/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 81dbcde0f90df4e9ba9ca2794490e57a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta b/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
new file mode 100644
index 0000000..eebd079
--- /dev/null
+++ b/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fd02c799f3f5c4c83b2fc26c105a3821
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat
index 5da4657..80d041e 100644
--- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat
+++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat
@@ -42,8 +42,8 @@ Material:
     - WaveCount: 50
     - WaveIntensity_1: 0.02
     - WaveIntensity_2: 1
-    - WaveSpread_Value: 11.7999935
+    - WaveSpread_Value: 0
     m_Colors:
-    - Center: {r: 0.78189915, g: 0.29703158, b: 0, a: 0}
+    - Center: {r: -0.040960018, g: 0.3156991, b: 0, a: 0}
     - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0}
   m_BuildTextureStacks: []
diff --git a/Assets/Scenes/动画测试与预览.unity b/Assets/Scenes/动画测试与预览.unity
index 63c16b3..685b5e6 100644
--- a/Assets/Scenes/动画测试与预览.unity
+++ b/Assets/Scenes/动画测试与预览.unity
@@ -312,7 +312,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 703923299}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 8.914796, y: 0.9224905, z: -3.2978365}
+  m_LocalPosition: {x: -7.39, y: 0.9224905, z: -3.2978365}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 490062778}
diff --git a/Assets/Scenes/各种系统测试与陈列.unity b/Assets/Scenes/各种系统测试与陈列.unity
index 977b91f..89fd68b 100644
--- a/Assets/Scenes/各种系统测试与陈列.unity
+++ b/Assets/Scenes/各种系统测试与陈列.unity
@@ -2703,6 +2703,36 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &1113866055
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1113866056}
+  m_Layer: 0
+  m_Name: "\u6295\u63B7\u70B9"
+  m_TagString: Untagged
+  m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1113866056
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1113866055}
+  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: 1272973346}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1144456071
 GameObject:
   m_ObjectHideFlags: 0
@@ -2958,6 +2988,304 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!1001 &1272973345
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1601657821}
+    m_Modifications:
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.455
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -2.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6505588563760846690, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_Name
+      value: "\u5C0F\u5B69\uFF08\u52A8\u753B\u6D4B\u8BD5"
+      objectReference: {fileID: 0}
+    - target: {fileID: 6505588563760846690, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 28d7167a156a930489d946fd19163778, type: 3}
+--- !u!4 &1272973346 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+  m_PrefabInstance: {fileID: 1272973345}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1272973347 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6505588563760846690, guid: 28d7167a156a930489d946fd19163778, type: 3}
+  m_PrefabInstance: {fileID: 1272973345}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &1272973348
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: ed1c51e5852ad914e8c313176c3789cb, type: 2}
+  m_CullingMode: 1
+  m_UpdateMode: 1
+  m_ApplyRootMotion: 1
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &1272973349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e2c1a0de69ef6d468a14db32ebf68fe, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  catched: {fileID: 0}
+  missile: {fileID: 4018427281142380165, guid: 628f0c1ef857ddd4687c94b8ba9b1aa6, type: 3}
+  throwOffset: {fileID: 0}
+--- !u!50 &1272973350
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!61 &1272973351
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0.28}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1.87, y: 5.53}
+  m_EdgeRadius: 0
+--- !u!114 &1272973352
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Actions: {fileID: -944628639613478452, guid: 6c1186e0febe48c4e866173c0f39422d, type: 3}
+  m_NotificationBehavior: 2
+  m_UIInputModule: {fileID: 0}
+  m_DeviceLostEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  m_DeviceRegainedEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  m_ControlsChangedEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  m_ActionEvents:
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnMoveHorizons
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 5a93f020-27b4-4cb6-975f-af9ed1ef4ec3
+    m_ActionName: PlayerNormal/MoveHorizons[/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick/left,/XInputControllerWindows/leftStick/right]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnRun
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 5c554403-34b9-4a85-a8f5-ac58363cad75
+    m_ActionName: PlayerNormal/Run[/XInputControllerWindows/rightShoulder,/Keyboard/shift]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnInteraction
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: a3099043-3ac2-4656-8595-f0c577842621
+    m_ActionName: PlayerNormal/Interaction[/XInputControllerWindows/buttonWest,/Keyboard/f]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnCoding
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: f7af9390-5dad-4c80-a4a7-83d8314f8e88
+    m_ActionName: PlayerNormal/Codeing[/XInputControllerWindows/rightTrigger,/Keyboard/space]
+  - m_PersistentCalls:
+      m_Calls: []
+    m_ActionId: beabb251-6f14-495d-9364-88119e0f9bf0
+    m_ActionName: NullMap/New action
+  - m_PersistentCalls:
+      m_Calls: []
+    m_ActionId: 078b3370-2cb6-4574-9156-0146ae814573
+    m_ActionName: PlayerInThrowing/Quit[/Keyboard/k]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnThrow
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 6bab4454-55d6-409c-9736-d1640a407628
+    m_ActionName: PlayerInThrowing/Throw[/Keyboard/shift]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnAdjustTheAngle
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: fddd4068-5ae8-4c1a-8498-4c8c30327f57
+    m_ActionName: PlayerInThrowing/AdjustTheAngle[/Keyboard/s,/Keyboard/w]
+  m_NeverAutoSwitchControlSchemes: 0
+  m_DefaultControlScheme: Player
+  m_DefaultActionMap: PlayerNormal
+  m_SplitScreenIndex: -1
+  m_Camera: {fileID: 0}
 --- !u!1 &1302000701
 GameObject:
   m_ObjectHideFlags: 0
@@ -3110,7 +3438,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 3
+  m_SortingOrder: 10
   m_Sprite: {fileID: 21300000, guid: 4860efe03218f35409057848102eb931, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -3133,6 +3461,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5C0F\u5B69"
       objectReference: {fileID: 0}
+    - target: {fileID: 1777921847428221707, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1777921847428221709, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -4208,6 +4540,7 @@ Transform:
   m_Children:
   - {fileID: 1333232960}
   - {fileID: 745750434}
+  - {fileID: 1272973346}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5666,7 +5999,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2096316088
 Transform:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/序章-战场.unity b/Assets/Scenes/序章-战场.unity
index 790b4dc..5f54340 100644
--- a/Assets/Scenes/序章-战场.unity
+++ b/Assets/Scenes/序章-战场.unity
@@ -989,6 +989,129 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &818525950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 818525951}
+  - component: {fileID: 818525953}
+  - component: {fileID: 818525952}
+  - component: {fileID: 818525954}
+  m_Layer: 0
+  m_Name: "\u7535\u62A5\u673A"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &818525951
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 818525950}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.45, y: -0.55, z: 0}
+  m_LocalScale: {x: 7.1263, y: 7.1263, z: 7.1263}
+  m_Children: []
+  m_Father: {fileID: 1803085805}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &818525952
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 818525950}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 0.16, y: 0.16}
+    newSize: {x: 0.16, y: 0.16}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.16, y: 0.16}
+  m_EdgeRadius: 0
+--- !u!212 &818525953
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 818525950}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 4
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.16, y: 0.16}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &818525954
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 818525950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 27090778fe68b5140902d9ef8f5d3802, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_interface: {fileID: 0}
 --- !u!1 &927359184
 GameObject:
   m_ObjectHideFlags: 0
@@ -1389,7 +1512,7 @@ GameObject:
   - component: {fileID: 1171269131}
   - component: {fileID: 1171269132}
   m_Layer: 0
-  m_Name: "\u7535\u62A5\u7EBF"
+  m_Name: "\u7535\u62A5\u7EBF\u56FE\u7247"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -6845,6 +6968,7 @@ Transform:
   - {fileID: 1537313304}
   - {fileID: 1006989818}
   - {fileID: 2116293276}
+  - {fileID: 818525951}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scripts/AbstractItem/BombingArea.cs b/Assets/Scripts/AbstractItem/BombingArea.cs
index f89f262..c739a0b 100644
--- a/Assets/Scripts/AbstractItem/BombingArea.cs
+++ b/Assets/Scripts/AbstractItem/BombingArea.cs
@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class BombingArea : MonoBehaviour
 {
+    //这是轰炸区的脚本，控制轰炸区相关的所有逻辑💣
     // Start is called before the first frame update
     private bool bombing = false;//是否正在轰炸
     public GameObject shell;//炮弹游戏物体
diff --git a/Assets/Scripts/AbstractItem/BoomShader.cs b/Assets/Scripts/AbstractItem/BoomShader.cs
index a53137f..4d76255 100644
--- a/Assets/Scripts/AbstractItem/BoomShader.cs
+++ b/Assets/Scripts/AbstractItem/BoomShader.cs
@@ -5,6 +5,7 @@ using UnityEngine;
 
 public class BoomShader : MonoBehaviour
 {
+    //这是控制炸弹爆炸后冲击波产生的脚本，是霄酱写的🤔
     public Material boomMaterial;//爆炸shader的材质
     private Vector2 boomPos;//爆炸坐标
     private bool isBoom = false;//是否爆炸
diff --git a/Assets/Scripts/AbstractItem/NormalInvestableItems.cs b/Assets/Scripts/AbstractItem/NormalInvestableItems.cs
index 4194126..0359892 100644
--- a/Assets/Scripts/AbstractItem/NormalInvestableItems.cs
+++ b/Assets/Scripts/AbstractItem/NormalInvestableItems.cs
@@ -6,6 +6,7 @@ using Fungus;
 public class NormalInvestableItems : Interactive
 {
     // Start is called before the first frame update
+    //普通可调查对象的类，用在按F可以触发调查对话的对象上💬
     public string itemName;
     void Start()
     {
diff --git a/Assets/Scripts/AbstractItem/Sentence.cs b/Assets/Scripts/AbstractItem/Sentence.cs
index ded9adb..0790783 100644
--- a/Assets/Scripts/AbstractItem/Sentence.cs
+++ b/Assets/Scripts/AbstractItem/Sentence.cs
@@ -5,6 +5,7 @@ using UnityEngine;
 public class Sentence : MonoBehaviour
 {
     // Start is called before the first frame update
+    //句子类，其对象是电报机中的一个句子
     [Tooltip("这个句子的内容是什么？")]
     public string content;
     [Tooltip("这个句子对应的数字序列是？")]
diff --git a/Assets/Scripts/Event/Event.cs b/Assets/Scripts/Event/Event.cs
index c9eb984..36f153d 100644
--- a/Assets/Scripts/Event/Event.cs
+++ b/Assets/Scripts/Event/Event.cs
@@ -5,6 +5,7 @@ using UnityEngine;
 public class Event : MonoBehaviour
 {
     // Start is called before the first frame update
+    //事件的基类
     void Start()
     {
         
diff --git a/Assets/Scripts/Event/WhenFinishFathersCode.cs b/Assets/Scripts/Event/WhenFinishFathersCode.cs
index 35dd20a..d3cf297 100644
--- a/Assets/Scripts/Event/WhenFinishFathersCode.cs
+++ b/Assets/Scripts/Event/WhenFinishFathersCode.cs
@@ -5,6 +5,7 @@ using Fungus;
 public class WhenFinishFathersCode : Event
 {
     // Start is called before the first frame update
+    //具体事件：当玩家打完了父亲教的电码
     void Start()
     {
         
diff --git a/Assets/Scripts/GameInfo/AllLinesInfo.cs b/Assets/Scripts/GameInfo/AllLinesInfo.cs
index 2cad8b2..f107ed7 100644
--- a/Assets/Scripts/GameInfo/AllLinesInfo.cs
+++ b/Assets/Scripts/GameInfo/AllLinesInfo.cs
@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class AllLinesInfo : MonoBehaviour
 {
+    //总线信息类，用来存储场景中电话线断裂的总体信息，
     // Start is called before the first frame update
     public int needCount;
     public int OKCount = 0;
@@ -17,4 +18,6 @@ public class AllLinesInfo : MonoBehaviour
     {
         
     }
+
+    public bool AreYouOK(){return (needCount == OKCount);}//返回完成量是不是等于需求量
 }
diff --git a/Assets/Scripts/GameInfo/IndexRecoder.cs b/Assets/Scripts/GameInfo/IndexRecoder.cs
index 96c1e82..60ec998 100644
--- a/Assets/Scripts/GameInfo/IndexRecoder.cs
+++ b/Assets/Scripts/GameInfo/IndexRecoder.cs
@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class IndexRecoder : MonoBehaviour
 {
+    //策划接口类，储存了所有易变的数值，每一项都写了toolTip，谁叫我是小棉袄呢❤对了，电报的字典也写在这里
     // Start is called before the first frame update
     [Tooltip("角色普通移动速度")]
     public float playerMoveSpeed;//角色普通移动速度
diff --git a/Assets/Scripts/Item/AFakeMachine.cs b/Assets/Scripts/Item/AFakeMachine.cs
new file mode 100644
index 0000000..e3c962c
--- /dev/null
+++ b/Assets/Scripts/Item/AFakeMachine.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AFakeMachine : Interactive
+{
+    // Start is called before the first frame update
+    //一个假的电报机类，因为“序章-战场”中的电报机不需要实际打码功能，为了方便我这里单独写一些代码
+    //继承可交互物体基类
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    public override void OnCall()
+    {
+        //当这个假的电报机被唤醒
+        //1.检查总线
+        AllLinesInfo info = FindObjectOfType<AllLinesInfo>();
+        if(info.AreYouOK())
+        {
+            //若所有线路OK
+            //转到场景“序章-家中”，给记录员发信息，让“序章-家中”表现为正确状态
+            Debug.Log("转到场景“序章-家中”，给记录员发信息，让“序章-家中”表现为正确状态");
+        }
+        else
+        {
+            //若还没OK，之后等策划编写新的内容
+            Debug.Log("还有线路没有联通");
+        }
+    }
+}
diff --git a/Assets/Scripts/Item/AFakeMachine.cs.meta b/Assets/Scripts/Item/AFakeMachine.cs.meta
new file mode 100644
index 0000000..ab141e5
--- /dev/null
+++ b/Assets/Scripts/Item/AFakeMachine.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 27090778fe68b5140902d9ef8f5d3802
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Item/Father.cs b/Assets/Scripts/Item/Father.cs
index 7b501c5..d3d22fa 100644
--- a/Assets/Scripts/Item/Father.cs
+++ b/Assets/Scripts/Item/Father.cs
@@ -6,6 +6,7 @@ using Fungus;
 public class Father : NormalInvestableItems
 {
     // Start is called before the first frame update
+    //父亲类，控制父亲作为可对话对象那会儿的父亲
     void Start()
     {
         
diff --git a/Assets/Scripts/Item/Machine.cs b/Assets/Scripts/Item/Machine.cs
index 07c09da..86896d8 100644
--- a/Assets/Scripts/Item/Machine.cs
+++ b/Assets/Scripts/Item/Machine.cs
@@ -5,6 +5,7 @@ using UnityEngine.UI;
 
 public class Machine : Interactive
 {
+    //电报机类。控制电报机的信息和各种功能，非常关键🤖
     private Text codeTextView;//电码TextView，显示目前打了打码
     private IndexRecoder indexRecoder;//策划数值接口
     private AllLinesInfo linesChecker;//路线信息
diff --git a/Assets/Scripts/Item/Mine.cs b/Assets/Scripts/Item/Mine.cs
index e55e61b..3142557 100644
--- a/Assets/Scripts/Item/Mine.cs
+++ b/Assets/Scripts/Item/Mine.cs
@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class Mine : MonoBehaviour
 {
+    //地雷系统的地雷类，因为系统还十分不完善，所以没有什么内容🥔
     // Start is called before the first frame update
     void Start()
     {
diff --git a/Assets/Scripts/Item/Missile.cs b/Assets/Scripts/Item/Missile.cs
index b2aba50..9f5760c 100644
--- a/Assets/Scripts/Item/Missile.cs
+++ b/Assets/Scripts/Item/Missile.cs
@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class Missile : Interactive
 {
+    //投掷物类，控制投掷。系统还十分不完善。
     // Start is called before the first frame update
     void Start()
     {
diff --git a/Assets/Scripts/Item/Shell.cs b/Assets/Scripts/Item/Shell.cs
index 0e1530a..344c230 100644
--- a/Assets/Scripts/Item/Shell.cs
+++ b/Assets/Scripts/Item/Shell.cs
@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class Shell : MonoBehaviour
 {
+    //炮弹类，控制轰炸区内的炮弹和炮弹的阴影🎇
     // Start is called before the first frame update
     public GameObject shadow;//阴影游戏物体
     private Transform ground;//地面的位置信息
diff --git a/Assets/Scripts/Item/TelephoneLine.cs b/Assets/Scripts/Item/TelephoneLine.cs
index c9003a8..0393fe3 100644
--- a/Assets/Scripts/Item/TelephoneLine.cs
+++ b/Assets/Scripts/Item/TelephoneLine.cs
@@ -5,6 +5,7 @@ using UnityEngine.UI;
 
 public class TelephoneLine : Interactive
 {
+    //电话线类，控制每一处断裂的电话线
     // Start is called before the first frame update
     private float allNeedTime;
     private float hasReparedTime = 0f;
diff --git a/Assets/Scripts/M_Player.cs b/Assets/Scripts/M_Player.cs
index 0a0e971..ce8ed4c 100644
--- a/Assets/Scripts/M_Player.cs
+++ b/Assets/Scripts/M_Player.cs
@@ -26,12 +26,14 @@ public class M_Player : MonoBehaviour
     public GameObject missile;//投掷物的预制体
     [Tooltip("投掷物抛出点")]
     public Transform throwOffset;//记录一下抛出点的位置
+    private Animator M_Animator;
     void Start()
     {
         indexRecoder = FindObjectOfType<IndexRecoder>();//获取数值记录组件，方便策划修改暴露参数    
         m_rigidbody = GetComponent<Rigidbody2D>();//获取自身刚体组件
         faceDir = 1;//默认面部朝右
         playerInput = GetComponent<PlayerInput>(); //获取自身输入组件
+        //M_Animator = GetComponent<Animator>();
     }
 
     // Update is called once per frame
@@ -45,6 +47,7 @@ public class M_Player : MonoBehaviour
         Move();
     }
 
+    //调整投掷角度的函数
     private void AdjustTheAngle()
     {
         if(canAdjustTheAngle)//如果玩家正在调整角度
@@ -77,7 +80,7 @@ public class M_Player : MonoBehaviour
             inputDir = -1;
             faceDir = -1;
         }
-        else inputDir = 0;
+        else {inputDir = 0;}
         //修改面部朝向
         transform.localScale = new Vector3(
             Mathf.Abs(transform.localScale.x)*faceDir,
@@ -95,7 +98,15 @@ public class M_Player : MonoBehaviour
                                             );
 
     }
+    // void OnAnimatorMove()//Unity的回调函数，这样做能解决模型无法转向的问题，每帧调用一次
+    // {
+    //     m_rigidbody.MovePosition(m_rigidbody.position + faceDir*M_Animator.deltaPosition.magnitude*Vector2.right);
+    //     Debug.Log(M_Animator.deltaPosition.magnitude);
+    //     //m_RigidBody.MoveRotation(m_Rotation);//当物体有物理组件rigidbody的时候，再修改位置和旋转信息就不要用transfrom了，用刚体自带的Move等方法
+    // }
 
+
+    //监听投掷按键的函数
     public void OnThrow(InputAction.CallbackContext context)
     {
         if(context.started)//如果按下投掷键，表示可以开始控制角度了
@@ -108,9 +119,11 @@ public class M_Player : MonoBehaviour
         }
     }
 
+    //监听修改投掷角度的函数
     public void OnAdjustTheAngle(InputAction.CallbackContext context)
     {throwingAngleDir = context.ReadValue<float>();}//把收到的轴的值交给角度变化的大小和方向
 
+    //控制投掷相关的具体函数
     private void Throw()
     {
         //Debug.Log("我投出手上拿着的东西了");
@@ -133,6 +146,7 @@ public class M_Player : MonoBehaviour
         }
     }
 
+    //监听交互按键的函数
     public void OnInteraction(InputAction.CallbackContext context)
     {
         if(context.started)
@@ -154,6 +168,7 @@ public class M_Player : MonoBehaviour
         }
     }
 
+    //监听打电码的函数
     public void OnCoding(InputAction.CallbackContext context)
     {
         if(context.canceled)
@@ -173,6 +188,7 @@ public class M_Player : MonoBehaviour
         }
     }
 
+    //使自身进入投掷状态的函数
     public void EnterThrowingState()
     {
         throwingState = true;//修改自身记录状态变量，表示正式进入投掷状态
@@ -181,9 +197,11 @@ public class M_Player : MonoBehaviour
         //2.动画相关
         //
     }
+    
+    //等待完善投掷系统
     public void QuitThrowingsState(){}
 
-    //绘制曲线的函数，非常🐂
+    //绘制投掷曲线的函数，非常🐂
     public void DrawPath()
     {
         //
@@ -208,6 +226,5 @@ public class M_Player : MonoBehaviour
             line.SetPosition(i, segments[i]);  //把算好的点传入线的点集     
         }
     }
-    //
 
 }
diff --git a/Assets/Scripts/Parallax.cs b/Assets/Scripts/Parallax.cs
index fa8ab48..29bd4a1 100644
--- a/Assets/Scripts/Parallax.cs
+++ b/Assets/Scripts/Parallax.cs
@@ -7,6 +7,7 @@ using UnityEngine;
     使用方式：将类挂载到需要视差的背景上，将主摄像机赋值给Cam，调节视差率即可
     注意 移动的背景一定要比不移动的面积大
 */
+//视差类，霄酱写的🤔
 public class Parallax : MonoBehaviour
 {
 
diff --git a/Assets/Scripts/ScreenShader.cs b/Assets/Scripts/ScreenShader.cs
index e6f395e..09fe39c 100644
--- a/Assets/Scripts/ScreenShader.cs
+++ b/Assets/Scripts/ScreenShader.cs
@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class ScreenShader : MonoBehaviour
 {
+    //大概是镜子的反射类？妈的这样写谁看得懂？操你妈 F U C K Y O U
     public Material material;
     private void OnRenderImage(RenderTexture source,RenderTexture destination){
         Graphics.Blit(source, destination, material);
diff --git a/Assets/图/动画/renwu.controller b/Assets/图/动画/renwu.controller
index 18fa201..e15537f 100644
--- a/Assets/图/动画/renwu.controller
+++ b/Assets/图/动画/renwu.controller
@@ -11,17 +11,18 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 1259281646917324526}
-    m_Position: {x: 140, y: 120, z: 0}
+    m_Position: {x: 210, y: 120, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 3926615483802031973}
     m_Position: {x: -10, y: 60, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
-  m_EntryTransitions: []
+  m_EntryTransitions:
+  - {fileID: 351989570621910821}
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
   m_AnyStatePosition: {x: -110, y: -30, z: 0}
-  m_EntryPosition: {x: -60, y: 180, z: 0}
+  m_EntryPosition: {x: -40, y: 190, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 1259281646917324526}
@@ -47,6 +48,20 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1109 &351989570621910821
+AnimatorTransition:
+  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: 3926615483802031973}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
 --- !u!1102 &1259281646917324526
 AnimatorState:
   serializedVersion: 6
diff --git a/Assets/图/动画/他爸.controller b/Assets/图/动画/他爸.controller
index 9b66957..4ec358f 100644
--- a/Assets/图/动画/他爸.controller
+++ b/Assets/图/动画/他爸.controller
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!1102 &-5481511477900700387
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -28,7 +28,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &-3660802073315185107
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -76,7 +76,7 @@ AnimatorController:
     m_Controller: {fileID: 9100000}
 --- !u!1102 &429271347515795469
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -102,7 +102,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1107 &2735281586871154179
 AnimatorStateMachine:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -114,13 +114,13 @@ AnimatorStateMachine:
     m_Position: {x: 200, y: 0, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -5481511477900700387}
-    m_Position: {x: 300, y: 60, z: 0}
+    m_Position: {x: 235, y: 65, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 5671058436772492650}
-    m_Position: {x: 430, y: 130, z: 0}
+    m_Position: {x: 270, y: 130, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 8033208513622415575}
-    m_Position: {x: 390, y: 190, z: 0}
+    m_Position: {x: 305, y: 195, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 429271347515795469}
     m_Position: {x: 340, y: 260, z: 0}
@@ -145,7 +145,7 @@ AnimatorStateMachine:
   m_DefaultState: {fileID: 8147200386770861203}
 --- !u!1102 &4290427244686223265
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -171,7 +171,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &5671058436772492650
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -197,7 +197,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &8033208513622415575
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -223,7 +223,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &8147200386770861203
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -249,7 +249,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &8438016665438056779
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
diff --git a/Assets/图/动画/行走.anim b/Assets/图/动画/行走.anim
index ebb2727..5abd377 100644
--- a/Assets/图/动画/行走.anim
+++ b/Assets/图/动画/行走.anim
@@ -259,6 +259,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.23333333
+        value: {x: 0, y: 0, z: 65.976}
+        inSlope: {x: 0, y: 0, z: 80.299095}
+        outSlope: {x: 0, y: 0, z: 80.299095}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.5
         value: {x: 0, y: 0, z: 82.775}
@@ -278,7 +287,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: {x: 0, y: 0, z: 80.733}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -357,7 +366,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: {x: 0, y: 0, z: -23.283}
         inSlope: {x: 0, y: 0, z: 163.224}
         outSlope: {x: 0, y: 0, z: 163.224}
@@ -601,14 +610,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0.6666667
         value: {x: 0, y: 0, z: -168.265}
-        inSlope: {x: 0, y: 0, z: 122.43}
-        outSlope: {x: 0, y: 0, z: 122.43}
+        inSlope: {x: 0, y: 0, z: 111.29999}
+        outSlope: {x: 0, y: 0, z: 111.29999}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: {x: 0, y: 0, z: -152.187}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -969,7 +978,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: {x: 1.8169591, y: -0.019465405, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -1256,14 +1265,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0.75
         value: {x: 0.6054773, y: 0.87830406, z: 0}
-        inSlope: {x: 0, y: 0.91338146, z: 0}
-        outSlope: {x: 0, y: 0.91338146, z: 0}
+        inSlope: {x: 0, y: 0.7611511, z: 0}
+        outSlope: {x: 0, y: 0.7611511, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: {x: 0.66883564, y: 0.9416353, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -1400,36 +1409,81 @@ AnimationClip:
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.13333334
+        value: {x: 0.48, y: 4.17, z: 0}
+        inSlope: {x: 3.6600075, y: 0.45454094, z: 0}
+        outSlope: {x: 3.6600075, y: 0.45454094, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.23333333
-        value: {x: 0.22525907, y: 4.221789, z: 0}
-        inSlope: {x: 0.17594665, y: 0, z: 0}
-        outSlope: {x: 0.17594665, y: 0, z: 0}
+        value: {x: 1.04, y: 4.21, z: 0}
+        inSlope: {x: 5.018182, y: 0, z: 0}
+        outSlope: {x: 5.018182, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.31666666
+        value: {x: 1.4, y: 4.18, z: 0}
+        inSlope: {x: 4.56, y: -0.72000504, z: 0}
+        outSlope: {x: 4.56, y: -0.72000504, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.4
+        value: {x: 1.8, y: 4.04, z: 0}
+        inSlope: {x: 1.7454555, y: -1.2545443, z: 0}
+        outSlope: {x: 1.7454555, y: -1.2545443, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.5
-        value: {x: 0.27397153, y: 4.11267, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: 1.88, y: 3.95, z: 0}
+        inSlope: {x: 1.2000006, y: 0, z: 0}
+        outSlope: {x: 1.2000006, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.6666667
+        value: {x: 2.36, y: 4.12, z: 0}
+        inSlope: {x: 3.4, y: 0.80000305, z: 0}
+        outSlope: {x: 3.4, y: 0.80000305, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.75
-        value: {x: 0.22998485, y: 4.2034197, z: 0}
-        inSlope: {x: -0.17594665, y: 0, z: 0}
-        outSlope: {x: -0.17594665, y: 0, z: 0}
+        value: {x: 2.73, y: 4.17, z: 0}
+        inSlope: {x: 3.6000004, y: 0, z: 0}
+        outSlope: {x: 3.6000004, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.8666667
+        value: {x: 3.08, y: 4.14, z: 0}
+        inSlope: {x: 2.3199997, y: -0.39999962, z: 0}
+        outSlope: {x: 2.3199997, y: -0.39999962, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1
-        value: {x: 0.1859982, y: 4.1039405, z: 0}
+        value: {x: 3.31, y: 4.07, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -2955,7 +3009,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 1.8169591
         inSlope: 0
         outSlope: 0
@@ -3001,7 +3055,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: -0.019465405
         inSlope: 0
         outSlope: 0
@@ -3047,7 +3101,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -3837,7 +3891,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0.66883564
         inSlope: 0
         outSlope: 0
@@ -3903,14 +3957,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0.75
         value: 0.87830406
-        inSlope: 0.91338146
-        outSlope: 0.91338146
+        inSlope: 0.7611511
+        outSlope: 0.7611511
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0.9416353
         inSlope: 0
         outSlope: 0
@@ -3983,7 +4037,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -4349,36 +4403,81 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0.48
+        inSlope: 3.6600075
+        outSlope: 3.6600075
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.23333333
-        value: 0.22525907
-        inSlope: 0.17594665
-        outSlope: 0.17594665
+        value: 1.04
+        inSlope: 5.018182
+        outSlope: 5.018182
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.31666666
+        value: 1.4
+        inSlope: 4.56
+        outSlope: 4.56
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.4
+        value: 1.8
+        inSlope: 1.7454555
+        outSlope: 1.7454555
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
-        value: 0.27397153
-        inSlope: 0
-        outSlope: 0
+        value: 1.88
+        inSlope: 1.2000006
+        outSlope: 1.2000006
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 2.36
+        inSlope: 3.4
+        outSlope: 3.4
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.75
-        value: 0.22998485
-        inSlope: -0.17594665
-        outSlope: -0.17594665
+        value: 2.73
+        inSlope: 3.6000004
+        outSlope: 3.6000004
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.8666667
+        value: 3.08
+        inSlope: 2.3199997
+        outSlope: 2.3199997
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: 0.1859982
+        value: 3.31
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -4404,36 +4503,81 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 4.17
+        inSlope: 0.45454094
+        outSlope: 0.45454094
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.23333333
-        value: 4.221789
+        value: 4.21
         inSlope: 0
         outSlope: 0
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.31666666
+        value: 4.18
+        inSlope: -0.72000504
+        outSlope: -0.72000504
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.4
+        value: 4.04
+        inSlope: -1.2545443
+        outSlope: -1.2545443
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
-        value: 4.11267
+        value: 3.95
         inSlope: 0
         outSlope: 0
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 4.12
+        inSlope: 0.80000305
+        outSlope: 0.80000305
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.75
-        value: 4.2034197
+        value: 4.17
         inSlope: 0
         outSlope: 0
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.8666667
+        value: 4.14
+        inSlope: -0.39999962
+        outSlope: -0.39999962
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: 4.1039405
+        value: 4.07
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -4459,6 +4603,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.23333333
         value: 0
@@ -4468,6 +4621,24 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.31666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.4
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
         value: 0
@@ -4477,6 +4648,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.75
         value: 0
@@ -4486,6 +4666,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.8666667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
         value: 0
@@ -5240,6 +5429,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.23333333
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
         value: 0
@@ -5259,7 +5457,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -5304,6 +5502,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.23333333
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
         value: 0
@@ -5323,7 +5530,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -5368,6 +5575,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.23333333
+        value: 65.976
+        inSlope: 80.299095
+        outSlope: 80.299095
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
         value: 82.775
@@ -5387,7 +5603,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 80.733
         inSlope: 0
         outSlope: 0
@@ -5469,7 +5685,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -5551,7 +5767,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -5633,7 +5849,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: -23.283
         inSlope: 163.224
         outSlope: 163.224
@@ -6303,7 +6519,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -6367,7 +6583,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -6424,14 +6640,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0.6666667
         value: -168.265
-        inSlope: 122.43
-        outSlope: 122.43
+        inSlope: 111.29999
+        outSlope: 111.29999
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.8666667
         value: -152.187
         inSlope: 0
         outSlope: 0
@@ -8545,7 +8761,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_10/bone_11
+    path: bone_1/bone_10
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8555,7 +8771,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_10/bone_11
+    path: bone_1/bone_10
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8565,7 +8781,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_10/bone_11
+    path: bone_1/bone_10
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8755,7 +8971,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_10
+    path: bone_1/bone_10/bone_11
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8765,7 +8981,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_10
+    path: bone_1/bone_10/bone_11
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8775,7 +8991,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_10
+    path: bone_1/bone_10/bone_11
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8785,7 +9001,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_10/bone_11/bone_12
+    path: bone_1/bone_13/bone_14
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8795,7 +9011,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_10/bone_11/bone_12
+    path: bone_1/bone_13/bone_14
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8805,7 +9021,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_10/bone_11/bone_12
+    path: bone_1/bone_13/bone_14
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8935,7 +9151,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_13/bone_14
+    path: bone_1/bone_10/bone_11/bone_12
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8945,7 +9161,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_13/bone_14
+    path: bone_1/bone_10/bone_11/bone_12
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8955,7 +9171,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_13/bone_14
+    path: bone_1/bone_10/bone_11/bone_12
     classID: 4
     script: {fileID: 0}
   m_HasGenericRootTransform: 0
diff --git a/Assets/图/动画包.unitypackage.meta b/Assets/图/动画包.unitypackage.meta
new file mode 100644
index 0000000..b3cb06c
--- /dev/null
+++ b/Assets/图/动画包.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 73111a550ebd15b44943e6d155181519
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/游戏内动画资源.meta b/Assets/游戏内动画资源.meta
new file mode 100644
index 0000000..f10ba13
--- /dev/null
+++ b/Assets/游戏内动画资源.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 07f794bfdee78f549bda2af5e01a4e80
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/游戏内动画资源/AC.meta b/Assets/游戏内动画资源/AC.meta
new file mode 100644
index 0000000..d6b8f1c
--- /dev/null
+++ b/Assets/游戏内动画资源/AC.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 679b5ab020a850d40b3dc0a7ae556d0d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/游戏内动画资源/AC/小孩（序章）.controller b/Assets/游戏内动画资源/AC/小孩（序章）.controller
new file mode 100644
index 0000000..411361c
--- /dev/null
+++ b/Assets/游戏内动画资源/AC/小孩（序章）.controller
@@ -0,0 +1,159 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-9181802701414636654
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u8D70"
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 7883594159301626064}
+  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: cffd8edf6b210da46b5d57ee7c61f5c8, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-8200817034425736061
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u5F85\u673A"
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 6955327852232728186}
+  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: c5193ce48c865f54d82ed80f602df605, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u5C0F\u5B69\uFF08\u5E8F\u7AE0\uFF09"
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: IsWalking
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 7854166707549671423}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1101 &6955327852232728186
+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: IsWalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -9181802701414636654}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1107 &7854166707549671423
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -8200817034425736061}
+    m_Position: {x: 340, y: 110, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -9181802701414636654}
+    m_Position: {x: 465.57388, y: -24.151016, 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_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -8200817034425736061}
+--- !u!1101 &7883594159301626064
+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: IsWalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -8200817034425736061}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
diff --git a/Assets/游戏内动画资源/AC/小孩（序章）.controller.meta b/Assets/游戏内动画资源/AC/小孩（序章）.controller.meta
new file mode 100644
index 0000000..d60a968
--- /dev/null
+++ b/Assets/游戏内动画资源/AC/小孩（序章）.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed1c51e5852ad914e8c313176c3789cb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/游戏内动画资源/AM.meta b/Assets/游戏内动画资源/AM.meta
new file mode 100644
index 0000000..fe51f36
--- /dev/null
+++ b/Assets/游戏内动画资源/AM.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7813f76ff00dc0744bb25f41b68300ee
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/图/动画/待机.anim b/Assets/游戏内动画资源/AM/待机.anim
similarity index 100%
rename from Assets/图/动画/待机.anim
rename to Assets/游戏内动画资源/AM/待机.anim
diff --git a/Assets/图/动画/待机.anim.meta b/Assets/游戏内动画资源/AM/待机.anim.meta
similarity index 100%
rename from Assets/图/动画/待机.anim.meta
rename to Assets/游戏内动画资源/AM/待机.anim.meta
diff --git a/Assets/图/动画/走.anim b/Assets/游戏内动画资源/AM/走.anim
similarity index 99%
rename from Assets/图/动画/走.anim
rename to Assets/游戏内动画资源/AM/走.anim
index ba292d6..49fd5bd 100644
--- a/Assets/图/动画/走.anim
+++ b/Assets/游戏内动画资源/AM/走.anim
@@ -2992,36 +2992,63 @@ AnimationClip:
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.16666667
+        value: {x: 0.30555433, y: 4.609655, z: 0}
+        inSlope: {x: 1.6407206, y: -0.118040085, z: 0}
+        outSlope: {x: 1.6407206, y: -0.118040085, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.33333334
-        value: {x: 0.050330877, y: 4.5633473, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: 0.59723777, y: 4.5633473, z: 0}
+        inSlope: {x: 1.6546545, y: -0.34042275, z: 0}
+        outSlope: {x: 1.6546545, y: -0.34042275, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.35
+        value: {x: 0.6730761, y: 4.547244, z: 0}
+        inSlope: {x: 1.82012, y: 0, z: 0}
+        outSlope: {x: 1.82012, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.5
-        value: {x: 0.050330877, y: 4.639502, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: 0.90715206, y: 4.694209, z: 0}
+        inSlope: {x: 2.322339, y: 0, z: 0}
+        outSlope: {x: 2.322339, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.6666667
+        value: {x: 1.4084835, y: 4.5990195, z: 0}
+        inSlope: {x: 2.5704648, y: -0.7899657, z: 0}
+        outSlope: {x: 2.5704648, y: -0.7899657, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.8333333
-        value: {x: 0.050330877, y: 4.5403013, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: 1.7639736, y: 4.430887, z: 0}
+        inSlope: {x: 1.6680691, y: 0, z: 0}
+        outSlope: {x: 1.6680691, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1
-        value: {x: 0.050330877, y: 4.6194916, z: 0}
+        value: {x: 1.9645065, y: 4.6194916, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -10015,36 +10042,63 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        value: 0.30555433
+        inSlope: 1.6407206
+        outSlope: 1.6407206
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
-        value: 0.050330877
-        inSlope: 0
-        outSlope: 0
+        value: 0.59723777
+        inSlope: 1.6546545
+        outSlope: 1.6546545
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.35
+        value: 0.6730761
+        inSlope: 1.82012
+        outSlope: 1.82012
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
-        value: 0.050330877
-        inSlope: 0
-        outSlope: 0
+        value: 0.90715206
+        inSlope: 2.322339
+        outSlope: 2.322339
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 1.4084835
+        inSlope: 2.5704648
+        outSlope: 2.5704648
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.8333333
-        value: 0.050330877
-        inSlope: 0
-        outSlope: 0
+        value: 1.7639736
+        inSlope: 1.6680691
+        outSlope: 1.6680691
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: 0.050330877
+        value: 1.9645065
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -10070,9 +10124,27 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        value: 4.609655
+        inSlope: -0.118040085
+        outSlope: -0.118040085
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
         value: 4.5633473
+        inSlope: -0.34042275
+        outSlope: -0.34042275
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.35
+        value: 4.547244
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -10081,16 +10153,25 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
-        value: 4.639502
+        value: 4.694209
         inSlope: 0
         outSlope: 0
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 4.5990195
+        inSlope: -0.7899657
+        outSlope: -0.7899657
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.8333333
-        value: 4.5403013
+        value: 4.430887
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -10125,6 +10206,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
         value: 0
@@ -10134,6 +10224,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.35
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
         value: 0
@@ -10143,6 +10242,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.8333333
         value: 0
diff --git a/Assets/图/动画/走.anim.meta b/Assets/游戏内动画资源/AM/走.anim.meta
similarity index 100%
rename from Assets/图/动画/走.anim.meta
rename to Assets/游戏内动画资源/AM/走.anim.meta
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index d3f50e3..fc29fde 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -6,14 +6,48 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
+<<<<<<< HEAD
       value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
+=======
+      value: 22424703114646680e0b0227036c721f04041d09232c2304283a097df7ee3d2cfb
+>>>>>>> 2781f7f874d8b595397c9bc5108186d845fe6bb0
       flags: 0
     RecentlyUsedScenePath-1:
+      value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb7df7ee3d2cfb
+      flags: 0
+    RecentlyUsedScenePath-2:
+      value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25
+      flags: 0
+    RecentlyUsedScenePath-3:
+      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
+      flags: 0
+    RecentlyUsedScenePath-4:
+      value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820
+      flags: 0
+    RecentlyUsedScenePath-5:
       value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
       flags: 0
+<<<<<<< HEAD
     RecentlyUsedScenePath-2:
       value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
       flags: 0
+=======
+    RecentlyUsedScenePath-6:
+      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
+      flags: 0
+    RecentlyUsedScenePath-7:
+      value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
+      flags: 0
+    UnityEditor.ShaderGraph.Blackboard:
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
+      flags: 0
+    UnityEditor.ShaderGraph.FloatingWindowsLayout2:
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
+      flags: 0
+    UnityEditor.ShaderGraph.InspectorWindow:
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
+      flags: 0
+>>>>>>> 2781f7f874d8b595397c9bc5108186d845fe6bb0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0