Merge remote-tracking branch 'origin/main' into Luo

2026-03-20 18:22:14 +08:00
parent 91e660a936 a439a970de
commit d8173c50c9
30 changed files with 12894 additions and 15208 deletions
--- a/Assets/DC/场景05/铁锤.prefab
+++ b/Assets/DC/场景05/铁锤.prefab
@@ -0,0 +1,371 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &28227577246149781
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4785389153843999406}
+  m_Layer: 0
+  m_Name: "\u94C1\u9524"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4785389153843999406
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28227577246149781}
+  serializedVersion: 2
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5888336648166069895}
+  - {fileID: 3326027744781041902}
+  - {fileID: 7398639212727517349}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &3000195467859060485
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4785389153843999406}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.063
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.23
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5.132
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.0073473873
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.99997306
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 179.158
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -5213811733767658936, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: e89eec05bb0a145498eed992f9ad5e70, type: 2}
+    - target: {fileID: 919132149155446097, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u94C1\u9524 (1)"
+      objectReference: {fileID: 0}
+    - target: {fileID: 6074107895320682575, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 796b95831c56e53479bd3a69efbdf6fb, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6203164831483462547}
+  m_SourcePrefab: {fileID: 100100000, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b, type: 3}
+--- !u!1 &2694203917422877268 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+    type: 3}
+  m_PrefabInstance: {fileID: 3000195467859060485}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &6203164831483462547
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2694203917422877268}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 05a9f9ec52ec0f541bfa5dfc503abf7d, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!4 &3326027744781041902 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+    type: 3}
+  m_PrefabInstance: {fileID: 3000195467859060485}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6214170918208876908
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4785389153843999406}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -2.498
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.23
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.66
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.70248514
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7116985
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90.747
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u94C1\u9524"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2875921194348989004}
+  m_SourcePrefab: {fileID: 100100000, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b, type: 3}
+--- !u!4 &5888336648166069895 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+    type: 3}
+  m_PrefabInstance: {fileID: 6214170918208876908}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &6556188100272983101 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+    type: 3}
+  m_PrefabInstance: {fileID: 6214170918208876908}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &2875921194348989004
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6556188100272983101}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 17ef6a1f4ed86d742bc86ff97f4c1955, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!1001 &7000711855892801358
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4785389153843999406}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.494
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.23
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.688
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.6989094
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.71521026
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 268.67902
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -5213811733767658936, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: e638cbf630ccfa84ab9d52b197765c3a, type: 2}
+    - target: {fileID: 919132149155446097, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u94C1\u9524 (2)"
+      objectReference: {fileID: 0}
+    - target: {fileID: 6074107895320682575, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: d99a7cb25abea2046b1a64e6b9d8ade6, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6386401606375208686}
+  m_SourcePrefab: {fileID: 100100000, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b, type: 3}
+--- !u!4 &7398639212727517349 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+    type: 3}
+  m_PrefabInstance: {fileID: 7000711855892801358}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &7919280356087699999 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+    type: 3}
+  m_PrefabInstance: {fileID: 7000711855892801358}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &6386401606375208686
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7919280356087699999}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 7f7798e9142708a48936eb451635d985, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
--- a/Assets/DC/场景05/铁锤.prefab.meta
+++ b/Assets/DC/场景05/铁锤.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 716bc870e30c7664d9c8b31b3902ff6d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DC/场景05/铁锤/铁锤
+++ b/Assets/DC/场景05/铁锤/铁锤
@@ -0,0 +1,73 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-8064937407943723701
+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: -2380501832190533178}
+    m_Position: {x: 200, y: 0, 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: -2380501832190533178}
+--- !u!1102 &-2380501832190533178
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u60AC\u6D6E"
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 1827226128182048838, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+    type: 3}
+  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: "\u94C1\u9524 (1)"
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -8064937407943723701}
+    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}
--- a/Assets/DC/场景05/铁锤/铁锤
+++ b/Assets/DC/场景05/铁锤/铁锤
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 05a9f9ec52ec0f541bfa5dfc503abf7d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DC/场景05/铁锤/铁锤
+++ b/Assets/DC/场景05/铁锤/铁锤
@@ -0,0 +1,73 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-6100984551958322136
+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: -2072683243751314623}
+    m_Position: {x: 200, y: 0, 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: -2072683243751314623}
+--- !u!1102 &-2072683243751314623
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u60AC\u6D6E"
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 1827226128182048838, guid: f2f3bf0c5c1861e42a1bcd04ec7b382b,
+    type: 3}
+  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: "\u94C1\u9524 (2)"
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -6100984551958322136}
+    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}
--- a/Assets/DC/场景05/铁锤/铁锤
+++ b/Assets/DC/场景05/铁锤/铁锤
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7f7798e9142708a48936eb451635d985
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DC/场景05/铁锤/铁锤.controller
+++ b/Assets/DC/场景05/铁锤/铁锤.controller
@@ -1,57 +1,13 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-3264384440916700490
-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: 7004160726610739232}
-    m_Position: {x: 200, y: 0, 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: 7004160726610739232}
--- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: "\u94C1\u9524"
-  serializedVersion: 5
-  m_AnimatorParameters: []
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: Base Layer
-    m_StateMachine: {fileID: -3264384440916700490}
-    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!1102 &7004160726610739232
+--- !u!1102 &-1072705684373815842
 AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Take 001
+  m_Name: "\u60AC\u6D6E"
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
@@ -71,3 +27,47 @@ AnimatorState:
  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: "\u94C1\u9524"
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 338822444447754720}
+    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!1107 &338822444447754720
+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: -1072705684373815842}
+    m_Position: {x: 200, y: 0, 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: -1072705684373815842}
--- a/Assets/DC/场景05/铁锤/铁锤.fbx
+++ b/Assets/DC/场景05/铁锤/铁锤.fbx
--- a/Assets/DC/场景07/镜子_幸福生活/01.mat
+++ b/Assets/DC/场景07/镜子_幸福生活/01.mat
@@ -161,7 +161,7 @@ Material:
    - _ZWrite: 1
    m_Colors:
    - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor: {r: 1, g: 0.9889865, b: 0.9669811, a: 1}
+    - _BaseColor: {r: 1, g: 0.98898643, b: 0.9669811, a: 1}
    - _Color: {r: 1, g: 0.98898643, b: 0.9669811, a: 1}
    - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 0}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/_SnowWhite/Audios/精灵开心.mp3
+++ b/Assets/_SnowWhite/Audios/精灵开心.mp3
--- a/Assets/_SnowWhite/Audios/精灵开心.mp3.meta
+++ b/Assets/_SnowWhite/Audios/精灵开心.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 55dbe5cea6831ba44989531cc23b28ca
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_SnowWhite/Audios/精灵沮丧.mp3
+++ b/Assets/_SnowWhite/Audios/精灵沮丧.mp3
--- a/Assets/_SnowWhite/Audios/精灵沮丧.mp3.meta
+++ b/Assets/_SnowWhite/Audios/精灵沮丧.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 82293a89fb667bd4c90a6cead8ea1954
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_SnowWhite/Prefabs/Ai/PlayerSpirit.controller
+++ b/Assets/_SnowWhite/Prefabs/Ai/PlayerSpirit.controller
@@ -70,7 +70,7 @@ AnimatorStateTransition:
  m_TransitionDuration: 0.25
  m_TransitionOffset: 0
  m_ExitTime: 0.875
-  m_HasExitTime: 1
+  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
--- a/Assets/_SnowWhite/Prefabs/Ai/PlayerSpirit.prefab
+++ b/Assets/_SnowWhite/Prefabs/Ai/PlayerSpirit.prefab
@@ -446,7 +446,7 @@ MonoBehaviour:
  animator: {fileID: 8127229926286440268}
  audioSource: {fileID: 3208871693691034825}
  touchCollider: {fileID: 0}
-  spiritMeshRenderer: {fileID: 0}
+  spiritMeshRenderer: {fileID: 5891328448759991741}
  defaultMaterial: {fileID: 2100000, guid: 72860b5b98077fd478f130c44d014a78, type: 2}
  happyMaterial: {fileID: 2100000, guid: 1ed3ce4a9a13d62489a2a3497909e56e, type: 2}
  sadMaterial: {fileID: 2100000, guid: dc1b1e4db82f83446ae7cabae3384b40, type: 2}
--- a/Assets/_SnowWhite/Prefabs/ForestEvent/WildBoar/WildBoar.prefab
+++ b/Assets/_SnowWhite/Prefabs/ForestEvent/WildBoar/WildBoar.prefab
@@ -936,7 +936,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 31fdc309290c6b440b1a3b4dc2100444, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  maxHp: 5
+  maxHp: 30
  currentHp: 0
  circleRadius: 8
  circleSpeed: 1
@@ -971,6 +971,11 @@ MonoBehaviour:
    type: 3}
  itemFlyDuration: 1
  itemFlyDistance: 1.5
+  itemDisplayDuration: 4
+  itemScaleDownDuration: 1
+  itemFlyToHandDuration: 2
+  itemStartScale: {x: 1, y: 1, z: 1}
+  itemEndScale: {x: 0, y: 0, z: 0}
  repathRate: 0.5
  endReachedDistance: 0.5
  lockYPosition: 1
--- a/Assets/_SnowWhite/Prefabs/Witch/Witch.prefab
+++ b/Assets/_SnowWhite/Prefabs/Witch/Witch.prefab
@@ -4798,6 +4798,7 @@ Transform:
  - {fileID: 4311604265522201689}
  - {fileID: 6902911969641551717}
  - {fileID: 8457914344997642332}
+  - {fileID: 8528575039551314653}
  m_Father: {fileID: 866955366586278604}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &220805855430480670
@@ -5701,6 +5702,37 @@ Transform:
  - {fileID: 991762392196113090}
  m_Father: {fileID: 1330324921941762269}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7962092316664273180
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8528575039551314653}
+  m_Layer: 0
+  m_Name: Leg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8528575039551314653
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7962092316664273180}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.005, y: 0.039, z: 0.06}
+  m_LocalScale: {x: 0.74, y: 0.74, z: 0.74}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 6284874577115046576}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8026851626019812413
 GameObject:
  m_ObjectHideFlags: 0
@@ -6332,8 +6364,9 @@ MonoBehaviour:
  angryAnimParam: Angry
  leaveAnimParam: Leave
  idleAnimParam: Idle
-  walkDistance: 3
+  walkDistance: 2.5
  moveSpeed: 1
+  leg: {fileID: 8528575039551314653}
  debugMode: 1
  currentState: 0
 --- !u!82 &7264895147927453267
--- a/Assets/_SnowWhite/Resources/UI/HUDPanel.prefab
+++ b/Assets/_SnowWhite/Resources/UI/HUDPanel.prefab
@@ -563,7 +563,7 @@ RectTransform:
  m_Children:
  - {fileID: 14603909123281466}
  - {fileID: 1520060182627552417}
-  - {fileID: 1661330965035013419}
+  - {fileID: 1542484562868175874}
  - {fileID: 14603910604296089}
  - {fileID: 14603909935618084}
  - {fileID: 14603910878599804}
@@ -607,7 +607,7 @@ MonoBehaviour:
  bloodEffectDuration: 2
  timerPanel: {fileID: 0}
  timerText: {fileID: 0}
-  ghostUIPrefab: {fileID: 9017577495742741455}
+  ghostUIPrefab: {fileID: 1318352266979312371}
  ghostUIDuration: 3
  ghostUIContainer: {fileID: 14603909944634288}
  ghostSpineGraphic: {fileID: 0}
@@ -1215,7 +1215,7 @@ RectTransform:
  m_GameObject: {fileID: 1190333178644712044}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.63, y: 0.63, z: 0.63}
+  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 14603909944634288}
@@ -1275,6 +1275,94 @@ CanvasGroup:
  m_Interactable: 1
  m_BlocksRaycasts: 1
  m_IgnoreParentGroups: 0
+--- !u!1 &1318352266979312371
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1542484562868175874}
+  - component: {fileID: 6241713961425219709}
+  - component: {fileID: 8172231458880547597}
+  - component: {fileID: 452456647248175361}
+  m_Layer: 10
+  m_Name: ghostUIPrefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1542484562868175874
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1318352266979312371}
+  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_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 14603909944634288}
+  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: -967, y: 0}
+  m_SizeDelta: {x: 525, y: 416}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6241713961425219709
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1318352266979312371}
+  m_CullTransparentMesh: 1
+--- !u!114 &8172231458880547597
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1318352266979312371}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.79607844}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: fd7237e06c3ea6f4fadc1d1eb0329c76, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!225 &452456647248175361
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1318352266979312371}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &1921751254443132453
 GameObject:
  m_ObjectHideFlags: 0
@@ -1817,124 +1905,3 @@ Animator:
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorStateOnDisable: 0
  m_WriteDefaultValuesOnDisable: 0
--- !u!1 &9017577495742741455
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1661330965035013419}
-  - component: {fileID: 3624383442721764108}
-  - component: {fileID: 2961853340268937047}
-  - component: {fileID: 2858526735889923129}
-  m_Layer: 10
-  m_Name: ghostUIPrefab
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1661330965035013419
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9017577495742741455}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.63, y: 0.63, z: 0.63}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 14603909944634288}
-  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: 0, y: 0}
-  m_SizeDelta: {x: 521, y: 412}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3624383442721764108
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9017577495742741455}
-  m_CullTransparentMesh: 1
--- !u!225 &2961853340268937047
-CanvasGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9017577495742741455}
-  m_Enabled: 1
-  m_Alpha: 1
-  m_Interactable: 1
-  m_BlocksRaycasts: 1
-  m_IgnoreParentGroups: 0
--- !u!114 &2858526735889923129
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9017577495742741455}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  skeletonDataAsset: {fileID: 11400000, guid: 2f899e95232e6144786de8fb99678a8d, type: 2}
-  additiveMaterial: {fileID: 0}
-  multiplyMaterial: {fileID: 0}
-  screenMaterial: {fileID: 0}
-  m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
-  initialSkinName: 
-  initialFlipX: 0
-  initialFlipY: 0
-  startingAnimation: 
-  startingLoop: 0
-  timeScale: 1
-  freeze: 0
-  layoutScaleMode: 0
-  referenceSize: {x: 521, y: 412}
-  pivotOffset: {x: 0, y: 0}
-  referenceScale: 1
-  layoutScale: 1
-  rectTransformSize: {x: 521, y: 412}
-  editReferenceRect: 0
-  updateWhenInvisible: 3
-  allowMultipleCanvasRenderers: 0
-  canvasRenderers: []
-  separatorSlotNames: []
-  enableSeparatorSlots: 0
-  separatorParts: []
-  updateSeparatorPartLocation: 1
-  updateSeparatorPartScale: 0
-  disableMeshAssignmentOnOverride: 1
-  physicsPositionInheritanceFactor: {x: 1, y: 1}
-  physicsRotationInheritanceFactor: 1
-  physicsMovementRelativeTo: {fileID: 0}
-  meshGenerator:
-    settings:
-      useClipping: 1
-      zSpacing: 0
-      tintBlack: 0
-      canvasGroupCompatible: 0
-      pmaVertexColors: 1
-      addNormals: 0
-      calculateTangents: 0
-      immutableTriangles: 0
-  updateTiming: 1
-  unscaledTime: 0
--- a/Assets/_SnowWhite/Scenes/GongSi1Lou.unity
+++ b/Assets/_SnowWhite/Scenes/GongSi1Lou.unity
--- a/Assets/_SnowWhite/Scripts/AI/SpiritController.cs
+++ b/Assets/_SnowWhite/Scripts/AI/SpiritController.cs
@@ -26,7 +26,7 @@ namespace SpiritSystem
        [SerializeField] private Animator animator;
        [SerializeField] private AudioSource audioSource;
        [SerializeField] private Collider touchCollider;
-        [SerializeField] private SkinnedMeshRenderer spiritMeshRenderer;
+        [SerializeField] private MeshRenderer spiritMeshRenderer;
        #endregion
        
        #region 材质球配置
@@ -202,10 +202,12 @@ namespace SpiritSystem
                    ApplyMaterial(defaultMaterial);
                    break;
                case SpiritState.Dance:
+                    GameManager.Ins.PlaySound3DRPC("精灵开心",transform,true);
                    PlayAnimation(AnimDance);
                    ApplyMaterial(happyMaterial);  // 切换到高兴材质
                    break;
                case SpiritState.Sad:
+                    GameManager.Ins.PlaySound3DRPC("精灵沮丧",transform,true);
                    PlayAnimation(AnimSad);
                    ApplyMaterial(sadMaterial);  // 切换到沮丧材质
                    break;
@@ -790,6 +792,8 @@ namespace SpiritSystem
            // 设置跳舞状态（设置动画参数State=1）
            SetState(SpiritState.Dance);
            
+            yield return new WaitForSeconds(3f);
+            ReturnToFollow();
            // 通知外部完成
            onComplete?.Invoke();
            
@@ -862,7 +866,9 @@ namespace SpiritSystem
            
            // 设置沮丧状态（设置动画参数State=2）
            SetState(SpiritState.Sad);
-            
+
+            yield return new WaitForSeconds(3f);
+            ReturnToFollow();
            // 通知外部完成
            onComplete?.Invoke();
            
--- a/Assets/_SnowWhite/Scripts/Base/GameManager.cs
+++ b/Assets/_SnowWhite/Scripts/Base/GameManager.cs
@@ -167,7 +167,7 @@ public class GameManager : MonoBehaviour

        Debug.Log("AI介绍完成，开始游戏正常流程");

-        HUDPanel.Show();
+        
    }

    private IEnumerator DelayedStartIntroduction(AIController aiController)
@@ -180,6 +180,7 @@ public class GameManager : MonoBehaviour
    {
        CreatePlayer();
        PlayBGM(0);
+        HUDPanel.Show();
        CreateGameStartDoor(GameLocal.Ins.startDoorPos.position);
    }

--- a/Assets/_SnowWhite/Scripts/Cutscene/Witch.cs
+++ b/Assets/_SnowWhite/Scripts/Cutscene/Witch.cs
@@ -25,6 +25,8 @@ public class Witch : MonoBehaviour
    [Header("移动配置")]
    public float walkDistance = 5f;
    public float moveSpeed = 2f;
+
+    public Transform leg;
    
    [Header("调试模式")]
    public bool debugMode = true;
--- a/Assets/_SnowWhite/Scripts/Cutscene/WitchPurificationEvent.cs
+++ b/Assets/_SnowWhite/Scripts/Cutscene/WitchPurificationEvent.cs
@@ -1,5 +1,6 @@
 using UnityEngine;
 using System.Collections;
+using System.Collections.Generic;
 using DG.Tweening;
 using DarkTonic.MasterAudio;

@@ -52,12 +53,12 @@ public class WitchPurificationEvent : CutsceneBase
    public float shoesToPlayerHeight = 0f;      // 铁鞋到玩家的高度（与玩家脚部平齐）

    [Header("铁鞋配置")]
-    public IronShoes ironShoes;                 // 圣光铁鞋引用
+    public GameObject ironShoes;                 // 圣光铁鞋引用
    public float shoesFlyDuration = 2f;         // 铁鞋飞行时间
    public float shoesOrbitDuration = 1f;       // 铁鞋环绕时间

    [Header("女巫配置")]
-    public GameObject witchPrefab;              // 女巫预制体（可使用GameManager的）
+    public GameObject witchPrefab;              // 女巫预制体（可使用 GameManager 的）
    public GameObject queenPrefab;              // 母后预制体（和蔼可亲的形象）
    public float floatUpDuration = 2f;          // 飘浮上升时间
    public float floatHeight = 2f;              // 飘浮高度
@@ -77,7 +78,12 @@ public class WitchPurificationEvent : CutsceneBase
    [Header("音效配置")]
    [SoundGroup] public string narrationAudio = "1.21";     // 魔力队长旁白
    [SoundGroup] public string purificationSfx = "2.30";    // 圣光转化音效
-    [SoundGroup] public string victoryBgm = "3.4";          // 胜利BGM
+    [SoundGroup] public string victoryBgm = "3.4";          // 胜利 BGM
+
+    [Header("幸福画框配置")]
+    public GameObject[] endGameFrames;        // 6 个 3D 画框数组
+    public float frameFadeDuration = 2f;      // 每个画框渐显时间
+    public float frameInterval = 1f;          // 画框显示间隔

    [Header("时间配置")]
    public float delayBetweenPhases = 1f;       // 阶段间延迟
@@ -98,9 +104,51 @@ public class WitchPurificationEvent : CutsceneBase
    private Animator witchAnimator;             // 女巫动画器
    private Renderer[] witchRenderers;          // 女巫渲染器
    private Material[] witchMaterials;          // 女巫材质
+    private Transform currentWitchLeg;          // 当前女巫腿部节点

    #endregion

+    protected override void Start()
+    {
+        base.Start();
+        ironShoes.gameObject.SetActive(false);
+        
+        // 初始化画框透明度为 0
+        InitFramesTransparent();
+    }
+    
+    /// <summary>
+    /// 初始化画框透明度为 0
+    /// </summary>
+    private void InitFramesTransparent()
+    {
+        if (endGameFrames == null || endGameFrames.Length == 0)
+            return;
+        
+        for (int i = 0; i < endGameFrames.Length; i++)
+        {
+            if (endGameFrames[i] != null)
+            {
+                // 获取画框的所有 MeshRenderer（包括子物体）
+                var renderers = endGameFrames[i].GetComponentsInChildren<MeshRenderer>();
+                
+                foreach (var renderer in renderers)
+                {
+                    // 获取材质实例（避免修改共享材质）
+                    var mat = renderer.material;
+                    
+                    // 设置透明度为 0
+                    Color color = mat.color;
+                    color.a = 0f;
+                    mat.color = color;
+                }
+            }
+        }
+        
+        if (debugMode)
+            Debug.Log("[WitchPurificationEvent] 画框透明度已初始化为 0");
+    }
+
    #region 实现抽象方法

    public override void StartCutscene()
@@ -211,7 +259,7 @@ public class WitchPurificationEvent : CutsceneBase
            Debug.Log("[WitchPurificationEvent] 步骤7: 母后落地");

        yield return StartCoroutine(QueenLanding());
-
+        GameManager.Ins?.PlayBGM(5);
        yield return new WaitForSeconds(delayBetweenPhases);

        // ========== 步骤8: 旁白 ==========
@@ -258,8 +306,9 @@ public class WitchPurificationEvent : CutsceneBase
            endGameScene.SetActive(false);

        // 播放场景1 BGM（可选）
-        // GameManager.Ins?.PlayBGM(0);
+         GameManager.Ins?.PlayBGM(0);

+        ironShoes.gameObject.SetActive(true);
        yield return new WaitForSeconds(1f);
    }

@@ -350,12 +399,6 @@ public class WitchPurificationEvent : CutsceneBase

        // 铁鞋脱离父级，确保在世界坐标系中移动
        ironShoes.transform.SetParent(null);
-
-        // 只显示圣光铁鞋，隐藏黑色铁鞋
-        if (ironShoes.blackShoes != null)
-            ironShoes.blackShoes.SetActive(false);
-        if (ironShoes.holyShoes != null)
-            ironShoes.holyShoes.SetActive(true);
        
        // 强制显示整个铁鞋对象
        ironShoes.gameObject.SetActive(true);
@@ -371,15 +414,15 @@ public class WitchPurificationEvent : CutsceneBase
        }

        // 铁鞋目标位置（女巫脚部，高度为0）
-        Vector3 witchFeetPos = new Vector3(currentWitch.transform.position.x, 0f, currentWitch.transform.position.z) + Vector3.down * 0.3f;
+        Vector3 witchFeetPos = witchController.leg.position;
        Vector3 startPos = ironShoes.transform.position;

        if (debugMode)
            Debug.Log($"[WitchPurificationEvent] 铁鞋飞向女巫脚部，起点: {startPos}, 终点: {witchFeetPos}");

        // 铁鞋先升起
-        ironShoes.transform.DOMove(startPos + Vector3.up * 1f, 0.5f).SetEase(Ease.OutQuad);
-
+        ironShoes.transform.DOMove(startPos + Vector3.up * 0.5f, 0.5f).SetEase(Ease.OutQuad);
+        ironShoes.transform.DOScale(witchController.leg.localScale,0.5f).SetEase(Ease.OutQuad);
        yield return new WaitForSeconds(0.5f);

        // 铁鞋飞向女巫脚部（带弧线）
@@ -397,7 +440,7 @@ public class WitchPurificationEvent : CutsceneBase
        // 铁鞋旋转 - 背对女巫（鞋尖朝向女巫）
        if (currentWitch != null)
        {
-            Vector3 lookDirWitch = ironShoes.transform.position - currentWitch.transform.position;
+            Vector3 lookDirWitch = ironShoes.transform.position - witchController.leg.position;
            lookDirWitch.y = 0;
            if (lookDirWitch != Vector3.zero)
            {
@@ -411,31 +454,43 @@ public class WitchPurificationEvent : CutsceneBase
        // 铁鞋贴合女巫脚部
        ironShoes.transform.DOMove(witchFeetPos, 0.3f).SetEase(Ease.InBack);
        
-        // 保持背对女巫（鞋尖朝向女巫）
+        // 铁鞋旋转 - 与女巫 Y 轴角度一致
        if (currentWitch != null)
        {
-            Vector3 lookDir = ironShoes.transform.position - currentWitch.transform.position;
-            lookDir.y = 0;
-            if (lookDir != Vector3.zero)
-            {
-                ironShoes.transform.DORotateQuaternion(Quaternion.LookRotation(lookDir), 0.3f);
-            }
+            // 获取女巫的 Y 轴旋转角度
+            float witchYRotation = currentWitch.transform.eulerAngles.y;
+            // 铁鞋 Y 轴角度与女巫一致，立即设置
+            ironShoes.transform.rotation = Quaternion.Euler(0, witchYRotation, 0);
        }

        if (debugMode)
-            Debug.Log($"[WitchPurificationEvent] 铁鞋已飞到女巫脚部，最终位置: {ironShoes.transform.position}");
+            Debug.Log($"[WitchPurificationEvent] 铁鞋已飞到女巫脚部，最终位置：{ironShoes.transform.position}, 旋转 Y: {ironShoes.transform.eulerAngles.y}");
+
+        // 铁鞋父级设置为女巫腿部节点
+        if (witchController.leg != null)
+        {
+            // 获取女巫的腿部节点
+            currentWitchLeg = witchController.leg;
+            
+            // 将铁鞋父级设置为女巫腿部节点
+            ironShoes.transform.SetParent(currentWitchLeg);
+            
+            // 设置本地坐标和旋转为 0
+            ironShoes.transform.localPosition = Vector3.zero;
+            ironShoes.transform.localRotation = Quaternion.identity;
+            Debug.LogError("角度："+ironShoes.transform.localPosition);
+            if (debugMode)
+                Debug.Log($"[WitchPurificationEvent] 铁鞋已设置为女巫腿部节点的子对象");
+        }
    }

    /// <summary>
-    /// 女巫飘浮上升
+    /// 女巫飘浮上升（铁鞋作为子对象自动跟随）
    /// </summary>
    private IEnumerator WitchFloatUp()
    {
        if (currentWitch == null) yield break;

-        // 记录铁鞋与女巫的偏移量
-        Vector3 shoesOffset = ironShoes != null ? ironShoes.transform.position - currentWitch.transform.position : Vector3.zero;
-
        // 播放圣光粒子
        if (holyLightParticle != null)
        {
@@ -454,16 +509,6 @@ public class WitchPurificationEvent : CutsceneBase
        Vector3 targetPos = currentWitch.transform.position + Vector3.up * floatHeight;
        currentWitch.transform.DOMove(targetPos, floatUpDuration).SetEase(Ease.OutQuad);

-        // 铁鞋跟随女巫一起升高
-        if (ironShoes != null)
-        {
-            Vector3 shoesTargetPos = targetPos + shoesOffset;
-            ironShoes.transform.DOMove(shoesTargetPos, floatUpDuration).SetEase(Ease.OutQuad);
-            
-            if (debugMode)
-                Debug.Log($"[WitchPurificationEvent] 铁鞋跟随女巫升高，从 {ironShoes.transform.position} 到 {shoesTargetPos}");
-        }
-
        // 女巫旋转面向玩家
        Vector3 playerPos = Camera.main != null ? Camera.main.transform.position : Vector3.zero;
        Vector3 lookDir = playerPos - currentWitch.transform.position;
@@ -486,14 +531,6 @@ public class WitchPurificationEvent : CutsceneBase
        currentWitch.transform.DOMoveY(targetPos.y + 0.1f, 1f)
            .SetLoops(-1, LoopType.Yoyo)
            .SetEase(Ease.InOutSine);
-        
-        // 铁鞋也轻微浮动
-        if (ironShoes != null)
-        {
-            ironShoes.transform.DOMoveY(targetPos.y + shoesOffset.y + 0.1f, 1f)
-                .SetLoops(-1, LoopType.Yoyo)
-                .SetEase(Ease.InOutSine);
-        }
    }

    /// <summary>
@@ -539,21 +576,49 @@ public class WitchPurificationEvent : CutsceneBase
        GameObject lightSphere = GameObject.CreatePrimitive(PrimitiveType.Sphere);
        lightSphere.transform.position = heartPos;
        lightSphere.transform.localScale = Vector3.zero;
-        lightSphere.GetComponent<Renderer>().material = new Material(Shader.Find("Standard"));
-        lightSphere.GetComponent<Renderer>().material.EnableKeyword("_EMISSION");
-        lightSphere.GetComponent<Renderer>().material.SetColor("_EmissionColor", new Color(1f, 0.95f, 0.8f) * 3f);
-        lightSphere.GetComponent<Renderer>().material.SetFloat("_Mode", 3); // Transparent
+        
+        // URP 渲染管线材质 - 使用 Universal Render Pipeline/Lit Shader
+        Shader urpShader = Shader.Find("Universal Render Pipeline/Lit");
+        if (urpShader == null)
+        {
+            // 备用方案：尝试旧的 URP 名称
+            urpShader = Shader.Find("Universal Render Pipeline/Unlit");
+        }
+        
+        Material sphereMat = new Material(urpShader);
+        lightSphere.GetComponent<Renderer>().material = sphereMat;
+        
+        // URP 中设置透明模式
+        sphereMat.SetFloat("_Surface", 1f);        // Transparent 模式
+        sphereMat.SetFloat("_Blend", 0f);          // Alpha Blend
+        sphereMat.SetFloat("_SrcBlend", (float)UnityEngine.Rendering.BlendMode.SrcAlpha);
+        sphereMat.SetFloat("_DstBlend", (float)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
+        sphereMat.SetFloat("_ZWrite", 0f);         // 关闭深度写入
+        sphereMat.DisableKeyword("_ALPHATEST_ON");
+        sphereMat.EnableKeyword("_ALPHABLEND_ON");
+        sphereMat.DisableKeyword("_ALPHAPREMULTIPLY_ON");
+        
+        // 设置发光效果
+        sphereMat.EnableKeyword("_EMISSION");
+        sphereMat.SetColor("_EmissionColor", new Color(1f, 0.95f, 0.8f) * 3f);
+        
+        // 设置基础颜色（包含透明度）
+        sphereMat.SetColor("_BaseColor", new Color(1f, 0.95f, 0.8f, 0.8f));
+        
        lightSphere.GetComponent<Collider>().enabled = false;

        // 圣光球扩展动画
        lightSphere.transform.DOScale(new Vector3(3f, 3f, 3f), purificationDuration)
            .SetEase(Ease.OutQuad);

-        // 圣光球透明度渐变
-        Material sphereMat = lightSphere.GetComponent<Renderer>().material;
+        // 圣光球透明度渐变（URP 使用_BaseColor）
        DOTween.To(
            () => 0.8f,
-            alpha => sphereMat.SetColor("_Color", new Color(1f, 0.95f, 0.8f, alpha)),
+            alpha => {
+                Color baseColor = sphereMat.GetColor("_BaseColor");
+                baseColor.a = alpha;
+                sphereMat.SetColor("_BaseColor", baseColor);
+            },
            0.1f,
            purificationDuration
        );
@@ -615,11 +680,17 @@ public class WitchPurificationEvent : CutsceneBase

        yield return new WaitForSeconds(transformationDuration * 0.5f);

-        // 隐藏女巫
+        // 隐藏女巫（铁鞋作为子对象会跟随一起隐藏）
        if (currentWitch != null)
        {
            currentWitch.SetActive(false);
        }
+        
+        // 隐藏铁鞋（如果还在场景中）
+        if (ironShoes != null)
+        {
+            ironShoes.gameObject.SetActive(false);
+        }

        // 生成母后
        if (queenPrefab != null)
@@ -733,16 +804,130 @@ public class WitchPurificationEvent : CutsceneBase
    /// </summary>
    private IEnumerator PlayNarration()
    {
-        // 播放旁白语音
-        PlayAudio2D(narrationAudio);
-        endGameScene.SetActive(true);
-        // 等待语音播放完成（语音约15秒）
-        yield return StartCoroutine(WaitForAudioComplete(narrationAudio, 20f));
+        // 获取小精灵实例
+        var spirit = SpiritSystem.SpiritController.Instance;
+        
+        // 小精灵飞到玩家面前开始介绍
+        if (spirit != null)
+        {
+            // 显示幸福画框
+            endGameScene.SetActive(true);
+            
+            // 启动画框渐显效果
+            StartCoroutine(ShowFramesFadeIn());
+            
+            // 小精灵飞到介绍位置
+            yield return spirit.FlyToIntroPosition();
+            
+            // 显示介绍 UI
+            spirit.ShowIntroUI("魔力队长的旁白内容");
+            
+            // 播放旁白语音
+            PlayAudio2D(narrationAudio);
+            spirit.StartIntroduction("白雪公主，你瞧！女巫那“邪恶的神情”、“恶毒的双手”以及“嫉妒的心”，皆被纯洁的圣光所驱散。她终于不再受嫉妒的吞噬，你也即将与王子开启幸福的生活。", null, 15);
+            // 等待语音播放完成（语音约 15 秒）
+            yield return StartCoroutine(WaitForAudioComplete(narrationAudio, 15f));
+            
+            // 隐藏介绍 UI
+            spirit.HideIntroUI();
+            
+            // 介绍完成后，小精灵开始跳舞
+            spirit.PlayDance();
+        }
+        else
+        {
+            // 小精灵未找到，直接播放旁白
+            endGameScene.SetActive(true);
+            
+            // 启动画框渐显效果
+            StartCoroutine(ShowFramesFadeIn());
+            
+            PlayAudio2D(narrationAudio);
+            yield return StartCoroutine(WaitForAudioComplete(narrationAudio, 20f));
+        }

        yield return new WaitForSeconds(1f);

-        // 播放胜利BGM
-        PlayAudio2D(victoryBgm);
+        // 播放胜利 BGM
+        //PlayAudio2D(victoryBgm);
+        
+    }
+
+    /// <summary>
+    /// 画框渐显效果 - 6 个画框依次从透明到不透明
+    /// 每个画框的子物体（如镜片）也会一起渐显
+    /// </summary>
+    private IEnumerator ShowFramesFadeIn()
+    {
+        if (endGameFrames == null || endGameFrames.Length == 0)
+        {
+            Debug.LogWarning("[WitchPurificationEvent] 未设置幸福画框数组");
+            yield break;
+        }
+
+        for (int i = 0; i < endGameFrames.Length; i++)
+        {
+            if (endGameFrames[i] != null)
+            {
+                // 获取画框的所有 MeshRenderer（包括子物体）
+                var renderers = endGameFrames[i].GetComponentsInChildren<MeshRenderer>();
+                
+                if (renderers.Length > 0)
+                {
+                    if (debugMode)
+                        Debug.Log($"[WitchPurificationEvent] 画框 {i+1} 开始渐显，找到 {renderers.Length} 个 MeshRenderer");
+                    
+                    // 遍历所有子物体的 MeshRenderer，设置初始透明度为 0
+                    List<Material> materials = new List<Material>();
+                    foreach (var renderer in renderers)
+                    {
+                        // 获取材质实例（避免修改共享材质）
+                        var mat = renderer.material;
+                        
+                        // 保存原始颜色和材质
+                        Color originalColor = mat.color;
+                        Color color = originalColor;
+                        color.a = 0f;
+                        mat.color = color;
+                        
+                        materials.Add(mat);
+                        
+                        if (debugMode)
+                            Debug.Log($"[WitchPurificationEvent]   - {renderer.name} 原始颜色：{originalColor}");
+                    }
+                    
+                    // 渐显到透明度 1（2 秒）- 所有子物体同时进行
+                    for (int j = 0; j < materials.Count; j++)
+                    {
+                        int index = j;
+                        Color startColor = materials[index].color;
+                        
+                        DOTween.To(
+                            () => startColor.a,
+                            alpha => { 
+                                startColor.a = alpha; 
+                                materials[index].color = startColor; 
+                            },
+                            1f,
+                            frameFadeDuration
+                        ).SetEase(Ease.InOutQuad);
+                    }
+                }
+                else
+                {
+                    Debug.LogWarning($"[WitchPurificationEvent] 画框 {i+1} 未找到 MeshRenderer 组件");
+                }
+            }
+            
+            // 等待间隔时间后显示下一个画框（最后一个画框不需要等待）
+            if (i < endGameFrames.Length - 1)
+            {
+                yield return new WaitForSeconds(frameInterval);
+            }
+        }
+        
+        if (debugMode)
+            Debug.Log("[WitchPurificationEvent] 所有画框渐显完成");
    }

    #endregion
--- a/Assets/_SnowWhite/Scripts/DreamEvent/Ghost.cs
+++ b/Assets/_SnowWhite/Scripts/DreamEvent/Ghost.cs
@@ -354,9 +354,11 @@ public class Ghost : MonoBehaviour
    /// </summary>
    private void ApplyScreenEffect()
    {
+        
        // TODO: 调用屏幕特效系统
        if (GameManager.Ins.playerHUD != null)
        {
+            Debug.LogError("UI显示幽灵");
            GameManager.Ins.playerHUD.ShowGhostUI();
        }
    }
--- a/Assets/_SnowWhite/Scripts/ForgeEvent/ColorButton.cs
+++ b/Assets/_SnowWhite/Scripts/ForgeEvent/ColorButton.cs
@@ -39,7 +39,7 @@ public class ColorButton : MonoBehaviour
    
    [Header("交互配置")]
    public LayerMask interactionLayer = -1;   // 可交互的层级
-    public float cooldownTime = 0.3f;         // 冷却时间
+    public float cooldownTime = 1f;           // 冷却时间（1 秒全局间隔）
    
    #endregion
    
--- a/Assets/_SnowWhite/Scripts/ForgeEvent/ForgeHammer.cs
+++ b/Assets/_SnowWhite/Scripts/ForgeEvent/ForgeHammer.cs
@@ -25,6 +25,12 @@ public class ForgeHammer : MonoBehaviour
    public float floatHeight = 0.1f;         // 悬浮高度
    public float floatSpeed = 1f;            // 悬浮速度
    
+    [Header("旋转配置")]
+    public float initialRotationX = -50f;    // 初始 X 轴旋转角度
+    public float strikeRotationX = 0f;       // 敲击时 X 轴旋转角度
+    public float strikePauseDuration = 1.5f; // 停顿时间（1-2 秒）
+    public float rotationDuration = 0.3f;    // 旋转动画时长
+    
    [Header("发光配置")]
    public Color glowColor = Color.red;      // 发光颜色
    public float glowIntensity = 2f;         // 发光强度
@@ -62,7 +68,10 @@ public class ForgeHammer : MonoBehaviour
    {
        propertyBlock = new MaterialPropertyBlock();
        originalPosition = transform.position;
-        originalRotation = transform.rotation;
+        originalRotation = Quaternion.Euler(initialRotationX, transform.localEulerAngles.y, 0);
+        
+        // 设置初始旋转角度
+        transform.localRotation = originalRotation;
        
        // 根据颜色设置材质
        ApplyColorMaterial();
@@ -187,7 +196,7 @@ public class ForgeHammer : MonoBehaviour
    #region 私有方法
    
    /// <summary>
-    /// 敲击动画序列
+    /// 敲击动画序列 - 使用 DOTween 旋转
    /// </summary>
    private System.Collections.IEnumerator StrikeSequence()
    {
@@ -196,33 +205,30 @@ public class ForgeHammer : MonoBehaviour
        // 停止悬浮
        StopFloating();
        
-        // 播放动画
-        if (animator != null)
-        {
-            animator.SetTrigger("Strike");
-        }
+        // 旋转到 0 度（敲击）
+        transform.DORotate(new Vector3(strikeRotationX, transform.localEulerAngles.y, 0), rotationDuration)
+            .SetEase(Ease.OutQuad).OnComplete(() =>
+            {
+                // 播放敲击粒子
+                if (strikeParticle != null)
+                {
+                    strikeParticle.Play();
+                }
+            });
        
-        // 抬起铁锤
-        Vector3 upPos = originalPosition + Vector3.up * strikeDistance;
-        transform.DOMove(upPos, strikeDuration * 0.3f).SetEase(Ease.OutQuad);
-        
-        yield return new WaitForSeconds(strikeDuration * 0.3f);
-        
-        // 快速敲下
-        transform.DOMove(originalPosition, strikeDuration * 0.2f).SetEase(Ease.InQuad);
-        
-        yield return new WaitForSeconds(strikeDuration * 0.2f);
-        
-        // 播放敲击粒子
-        if (strikeParticle != null)
-        {
-            strikeParticle.Play();
-        }
+        yield return new WaitForSeconds(rotationDuration);
        
        // 震动效果
        Camera.main?.DOShakePosition(0.1f, 0.1f);
        
-        yield return new WaitForSeconds(0.5f);
+        // 停顿 1-2 秒
+        yield return new WaitForSeconds(strikePauseDuration);
+        
+        // 旋转回到初始位置 -50 度
+        transform.DORotate(new Vector3(initialRotationX, transform.localEulerAngles.y, 0), rotationDuration)
+            .SetEase(Ease.OutQuad);
+        
+        yield return new WaitForSeconds(rotationDuration);
        
        // 恢复悬浮
        isStriking = false;
--- a/Assets/_SnowWhite/Scripts/ForgeEvent/ForgeShoesEvent.cs
+++ b/Assets/_SnowWhite/Scripts/ForgeEvent/ForgeShoesEvent.cs
@@ -985,33 +985,40 @@ public class ForgeShoesEvent : CutsceneBase
    }
    
    /// <summary>
-    /// 按玩家输入顺序播放铁锤敲击动画
+    /// 输入失败处理
    /// </summary>
-    private IEnumerator PlayHammerSequence()
+    private void OnInputFailure()
    {
-        foreach (var color in playerInputs)
-        {
-            StrikeHammer(color);
-            PlayAudio2D(strikeAudio);
-            yield return new WaitForSeconds(0.5f);
-        }
-    }
-    
-    /// <summary>
-    /// 检查玩家输入序列是否正确
-    /// </summary>
-    private bool IsSequenceCorrect()
-    {
-        if (playerInputs.Count != currentSequence.Count)
-            return false;
+        if (debugMode)
+            Debug.Log("[ForgeShoesEvent] 输入错误！");
        
-        for (int i = 0; i < currentSequence.Count; i++)
+        // 隐藏倒计时 UI
+        HideTimerUI();
+        
+        isWaitingForInput = false;
+        currentState = ForgeEventState.Failure;
+        
+        // 禁用按钮就绪特效（一轮结束后禁止改变数据）
+        SetButtonsReadyEffect(false);
+        
+        // 播放错误音效
+        PlayAudio2D(errorAudio);
+        
+        // 显示失败特效
+        if (forgeEffect != null)
        {
-            if (playerInputs[i] != currentSequence[i])
-                return false;
+            forgeEffect.PlayFailureEffect();
        }
        
-        return true;
+        // 小精灵沮丧
+        var spirit = SpiritSystem.SpiritController.Instance;
+        if (spirit != null)
+        {
+            spirit.PlaySad();
+        }
+        
+        // 重置到第一轮
+        StartCoroutine(ResetGame());
    }
    
    #endregion
@@ -1143,39 +1150,38 @@ public class ForgeShoesEvent : CutsceneBase
        }
        
        yield return new WaitForSeconds(successWaitTime);
-        
        // 标记本轮完成动画处理结束
        isProcessingRoundComplete = false;
    }
    
    /// <summary>
-    /// 输入失败处理
+    /// 检查玩家输入序列是否正确
    /// </summary>
-    private void OnInputFailure()
+    private bool IsSequenceCorrect()
    {
-        if (debugMode)
-            Debug.Log("[ForgeShoesEvent] 输入错误！");
+        if (playerInputs.Count != currentSequence.Count)
+            return false;
        
-        // 隐藏倒计时UI
-        HideTimerUI();
-        
-        isWaitingForInput = false;
-        currentState = ForgeEventState.Failure;
-        
-        // 禁用按钮就绪特效（一轮结束后禁止改变数据）
-        SetButtonsReadyEffect(false);
-        
-        // 播放错误音效
-        PlayAudio2D(errorAudio);
-        
-        // 显示失败特效
-        if (forgeEffect != null)
+        for (int i = 0; i < currentSequence.Count; i++)
        {
-            forgeEffect.PlayFailureEffect();
+            if (playerInputs[i] != currentSequence[i])
+                return false;
        }
        
-        // 重置到第一轮
-        StartCoroutine(ResetGame());
+        return true;
+    }
+    
+    /// <summary>
+    /// 按玩家输入顺序播放铁锤敲击动画
+    /// </summary>
+    private IEnumerator PlayHammerSequence()
+    {
+        foreach (var color in playerInputs)
+        {
+            StrikeHammer(color);
+            PlayAudio2D(strikeAudio);
+            yield return new WaitForSeconds(0.5f);
+        }
    }
    
    /// <summary>
@@ -1198,6 +1204,7 @@ public class ForgeShoesEvent : CutsceneBase
        
        isResetting = false;
        
+        SpiritSystem.SpiritController.Instance.ReturnToFollow();
        if (debugMode)
            Debug.Log("[ForgeShoesEvent] 游戏重置到第1轮");
    }
@@ -1312,10 +1319,6 @@ public class ForgeShoesEvent : CutsceneBase
            if (debugMode)
                Debug.Log("[ForgeShoesEvent] 启动女巫净化事件");
            
-            
-            // 传递铁鞋引用给净化事件
-            purificationEvent.ironShoes = ironShoes;
-            
            purificationEvent.StartCutscene();
        }
        else
@@ -1608,14 +1611,18 @@ public class ForgeShoesEvent : CutsceneBase
    {
        // if (Input.GetKeyDown(KeyCode.Z))
        // {
-        //     redButton.OnPlayerTouch();
+        //     TestInputRed();
        // }
        // if (Input.GetKeyDown(KeyCode.X))
        // {
-        //     yellowButton.OnPlayerTouch();
+        //     TestInputGreen();
        // }
        // if (Input.GetKeyDown(KeyCode.C))
        // {
+        //     TestInputYellow();
+        // }
+        // if (Input.GetKeyDown(KeyCode.E))
+        // {
        //     TestTimeUp();
        // }
    }
--- a/Assets/_SnowWhite/Scripts/UI/HUDPanel.cs
+++ b/Assets/_SnowWhite/Scripts/UI/HUDPanel.cs
@@ -38,7 +38,7 @@ public class HUDPanel : UIBehaviour
    public string ghostSpineAnimationName = "fly"; // Spine动画名称
    
    // 用于存储实例化幽灵UI的Spine动画引用
-    private Dictionary<GameObject, SpineAnimation> _ghostSpineAnimations = new Dictionary<GameObject, SpineAnimation>();
+    //private Dictionary<GameObject, SpineAnimation> _ghostSpineAnimations = new Dictionary<GameObject, SpineAnimation>();
    
    public static void Show()
    {
@@ -54,7 +54,10 @@ public class HUDPanel : UIBehaviour
    }
    void Update()
    {
-        
+        if (Input.GetKeyDown(KeyCode.X))
+        {
+            ShowGhostUI();
+        }
    }
    
    #region 森林猎杀事件
@@ -174,68 +177,39 @@ public class HUDPanel : UIBehaviour
    #region 梦境毒苹果事件
    
    /// <summary>
-    /// 显示幽灵UI（幽灵碰到玩家时调用）
+    /// 显示幽灵 UI（幽灵碰到玩家时调用）
    /// </summary>
    public void ShowGhostUI()
    {
-        if (ghostUIPrefab != null)
+        if (ghostUIPrefab != null && ghostUIContainer != null)
        {
-            Transform container = ghostUIContainer != null ? ghostUIContainer : transform;
-            GameObject ghostUI = Instantiate(ghostUIPrefab, container);
-            ghostUI.SetActive(true);
+            // 实例化幽灵 UI
+            GameObject ghostInstance = Instantiate(ghostUIPrefab, ghostUIContainer);
+            ghostInstance.SetActive(true);
            
-            // 设置随机位置
-            var rectTransform = ghostUI.GetComponent<RectTransform>();
+            var rectTransform = ghostInstance.GetComponent<RectTransform>();
            if (rectTransform != null)
            {
-                int randomX = Random.Range(-150, 150);
-                int randomY = Random.Range(-100, 100);
-                rectTransform.anchoredPosition = new Vector2(randomX, randomY);
-            }
-            
-            // 淡出动画（保留DOTween）
-            var canvasGroup = ghostUI.GetComponent<CanvasGroup>();
-            if (canvasGroup == null)
-                canvasGroup = ghostUI.AddComponent<CanvasGroup>();
-            
-            canvasGroup.alpha = 1f;
-            canvasGroup.DOFade(0, ghostUIDuration).OnComplete(() =>
-            {
-                // 清理Spine动画引用
-                if (_ghostSpineAnimations.ContainsKey(ghostUI))
+                // 设置初始位置 x=752, y=0
+                rectTransform.anchoredPosition = new Vector2(752, 0);
+                
+                // 移动时间
+                float moveDuration = 4f;
+                
+                // 创建动画序列
+                Sequence sequence = DOTween.Sequence();
+                
+                // 从右向左移动 (752 -> -967)，同时上下浮动
+                sequence.Join(rectTransform.DOAnchorPosX(-967, moveDuration));
+                sequence.Join(rectTransform.DOAnchorPosY(50, moveDuration / 4).SetEase(Ease.InOutSine).SetLoops(4, LoopType.Yoyo));
+                
+                // 移动完成后恢复初始位置并隐藏
+                sequence.AppendCallback(() =>
                {
-                    _ghostSpineAnimations[ghostUI].Clear();
-                    _ghostSpineAnimations.Remove(ghostUI);
-                }
-                Destroy(ghostUI);
-            });
-            
-            // 播放Spine动画替代DOTween移动动画
-            var spineGraphic = ghostUI.GetComponent<SkeletonGraphic>();
-            if (spineGraphic != null)
-            {
-                var spineAnim = AnimationUtility.PlaySpineAnimation(spineGraphic, ghostSpineAnimationName, true);
-                if (spineAnim != null)
-                {
-                    _ghostSpineAnimations[ghostUI] = spineAnim;
-                }
+                    rectTransform.anchoredPosition = new Vector2(752, 0);
+                    ghostInstance.SetActive(false);
+                });
            }
-            else
-            {
-                // 如果没有Spine组件，回退到DOTween移动动画
-                if (rectTransform != null)
-                {
-                    rectTransform.DOAnchorPosX(rectTransform.anchoredPosition.x + 50f, 1f)
-                        .SetLoops(-1, LoopType.Yoyo)
-                        .SetEase(Ease.InOutSine);
-                }
-            }
-            
-            Debug.Log("[HUDPanel] 显示幽灵UI");
-        }
-        else
-        {
-            Debug.LogWarning("[HUDPanel] 幽灵UI预制体未设置!");
        }
    }
    
--- a/Assets/_SnowWhite/Spine/gui/gui.png.meta
+++ b/Assets/_SnowWhite/Spine/gui/gui.png.meta
@@ -37,13 +37,13 @@ TextureImporter:
    filterMode: 1
    aniso: 1
    mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
    wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
  spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
@@ -112,7 +112,7 @@ TextureImporter:
    outline: []
    physicsShape: []
    bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
    internalID: 0
    vertices: []
    indices: 
--- a/Particle/Materials/Glow_7.mat
+++ b/Particle/Materials/Glow_7.mat
@@ -8,28 +8,79 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Glow_7
-  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: 050a1819cb9a36e4b8fefcefd0d896f7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 5
+  m_ValidKeywords:
+  - _EMISSION
+  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords:
+  - _FLIPBOOKBLENDING_OFF
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - DepthOnly
+  - SHADOWCASTER
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 34f3faf8380d32d4b9cb8b276e3a543a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 446278e1da330fb478cdb512193b1885, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Ints: []
    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendOp: 0
+    - _CameraFadingEnabled: 0
+    - _CameraFarFadeDistance: 2
+    - _CameraNearFadeDistance: 1
+    - _ColorMode: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DistortionBlend: 0.5
+    - _DistortionEnabled: 0
+    - _DistortionStrength: 1
+    - _DistortionStrengthScaled: 0.1
+    - _DstBlend: 10
+    - _DstBlendAlpha: 10
+    - _FlipbookBlending: 0
+    - _FlipbookMode: 0
    - _InvFade: 1
+    - _Mode: 0
+    - _QueueOffset: 0
+    - _SoftParticlesEnabled: 0
+    - _SoftParticlesFarFadeDistance: 1
+    - _SoftParticlesNearFadeDistance: 0
+    - _SrcBlend: 5
+    - _SrcBlendAlpha: 1
+    - _Surface: 1
+    - _ZWrite: 0
    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
+    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
    - _TintColor: {r: 0.5235849, g: 0.67761576, b: 1, a: 0.5}
  m_BuildTextureStacks: []