updat core

2024-10-23 14:56:16 +08:00
parent 61972881b6
commit 4fc0810107
28 changed files with 990 additions and 68 deletions
--- a/Assets/GameRes/AlwaysRes/CameraVcams
+++ b/Assets/GameRes/AlwaysRes/CameraVcams
@@ -17,7 +17,7 @@ MonoBehaviour:
    m_To: CM vcam1_CloseUp
    m_Blend:
      m_Style: 1
-      m_Time: 2
+      m_Time: 1
      m_CustomCurve:
        serializedVersion: 2
        m_Curve: []
--- a/Assets/GameRes/AlwaysRes/FontResource/Fonts
+++ b/Assets/GameRes/AlwaysRes/FontResource/Fonts
--- a/Assets/GameRes/AlwaysRes/Global
+++ b/Assets/GameRes/AlwaysRes/Global
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  active: 1
  intensity:
-    m_OverrideState: 0
+    m_OverrideState: 1
    m_Value: 0
 --- !u!114 &-6361006316563811321
 MonoBehaviour:
@@ -152,7 +152,7 @@ MonoBehaviour:
    m_Value: 0.9
  intensity:
    m_OverrideState: 1
-    m_Value: 6
+    m_Value: 5
  scatter:
    m_OverrideState: 1
    m_Value: 0.6
--- a/Assets/GameRes/AutoSource/Part/Part1.prefab
+++ b/Assets/GameRes/AutoSource/Part/Part1.prefab
@@ -1795,6 +1795,11 @@ Transform:
  - {fileID: 220491040042892233}
  - {fileID: 7964219916702714664}
  - {fileID: 6394864247252592517}
+  - {fileID: 8014801109108419586}
+  - {fileID: 2392090217340061671}
+  - {fileID: 4186635206953373315}
+  - {fileID: 2083149470826426194}
+  - {fileID: 2674638019056407058}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2762688269040569008
@@ -1809,11 +1814,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 2198455a7d46404bab676464cf70ce14, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  mapCacheData: {fileID: 4900000, guid: eb538f7c02817f2448aca956bb0c6050, type: 3}
  cameraCollider: {fileID: 4977006423313078515}
  createPos: {fileID: 25658124931772993}
-  completeConditionNumber: 10
+  completeConditionNumber: 3
  playerBaseSpeed: 4
+  successProp: {fileID: 2048375561032638617}
 --- !u!1 &8878032678881439204
 GameObject:
  m_ObjectHideFlags: 0
@@ -2292,6 +2297,18 @@ PrefabInstance:
      propertyPath: WalkArea.x
      value: 10
      objectReference: {fileID: 0}
+    - target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
+      propertyPath: CreatePos.x
+      value: -5.5600004
+      objectReference: {fileID: 0}
+    - target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
+      propertyPath: CreatePos.y
+      value: 26.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
+      propertyPath: IsDebugDraw
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
      propertyPath: ActiveArea.x
      value: 14
@@ -2460,6 +2477,130 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 7339428864581003236, guid: 1c8e271e41b3258479397cadaec9bb3a, type: 3}
  m_PrefabInstance: {fileID: 514546274851753650}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1019928919859107880
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7896263081528720634}
+    m_Modifications:
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -3.03
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 22.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8854647579728768609, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_Name
+      value: normalProp (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+--- !u!4 &4186635206953373315 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+  m_PrefabInstance: {fileID: 1019928919859107880}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1234074673736352953
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7896263081528720634}
+    m_Modifications:
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.86
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 21.22
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8854647579728768609, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_Name
+      value: normalProp (2)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+--- !u!4 &2674638019056407058 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+  m_PrefabInstance: {fileID: 1234074673736352953}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1360302683753427566
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -2554,6 +2695,145 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
  m_PrefabInstance: {fileID: 1360302683753427566}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1516587294339748172
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7896263081528720634}
+    m_Modifications:
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.06
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 9.45
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8854647579728768609, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_Name
+      value: normalProp
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+--- !u!4 &2392090217340061671 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+  m_PrefabInstance: {fileID: 1516587294339748172}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2003556469079023104
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7896263081528720634}
+    m_Modifications:
+    - target: {fileID: 8209694557750501125, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_Name
+      value: completeProp
+      objectReference: {fileID: 0}
+    - target: {fileID: 8209694557750501125, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 5.37
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+--- !u!114 &2048375561032638617 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 550359746873736857, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+  m_PrefabInstance: {fileID: 2003556469079023104}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 08b0720d3833493da90838afadab7e8a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &8014801109108419586 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8427436508884267522, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
+  m_PrefabInstance: {fileID: 2003556469079023104}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2186677351104497131
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -2738,6 +3018,68 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
  m_PrefabInstance: {fileID: 2846737534670508510}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2942746196330347001
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7896263081528720634}
+    m_Modifications:
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.87
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 34.68
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8854647579728768609, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+      propertyPath: m_Name
+      value: normalProp (3)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+--- !u!4 &2083149470826426194 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
+  m_PrefabInstance: {fileID: 2942746196330347001}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3096214354061779869
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/GameRes/AutoSource/scene_prop/completeProp.prefab
+++ b/Assets/GameRes/AutoSource/scene_prop/completeProp.prefab
@@ -0,0 +1,275 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &136432915379253346
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 583289613701687816}
+  - component: {fileID: 3442328184467762397}
+  - component: {fileID: 3457745100578203335}
+  - component: {fileID: 948931270075449026}
+  m_Layer: 0
+  m_Name: Square
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &583289613701687816
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 136432915379253346}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.74, y: 0.74, z: 0.74}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 8427436508884267522}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &3442328184467762397
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 136432915379253346}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  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: 0
+  m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &3457745100578203335
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 136432915379253346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d290fa098c494eaf9b9d621a8a925fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  IsAutoPlay: 1
+  MintPlayer:
+    TweenOptions:
+      Duration: 0.35
+      IsBack: 0
+      IsFlip: 0
+      IsLoop: 0
+      LoopCount: -1
+      IsCustomEase: 0
+      EaseType: 0
+      TimeCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 0
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0
+        - serializedVersion: 3
+          time: 1
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      UpdaterTypeEnum: 2
+      TweenType: 1
+    IsLocal: 0
+    IsAutoStartValue: 0
+    StartValue: {r: 1, g: 1, b: 1, a: 0}
+    EndValue: {r: 1, g: 1, b: 1, a: 1}
+--- !u!114 &948931270075449026
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 136432915379253346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eb9f1e25cbc46e0ad6235587f9e6fe6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  IsAutoPlay: 1
+  MintPlayer:
+    TweenOptions:
+      Duration: 1.5
+      IsBack: 0
+      IsFlip: 0
+      IsLoop: 1
+      LoopCount: -1
+      IsCustomEase: 0
+      EaseType: 7
+      TimeCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 0
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0
+        - serializedVersion: 3
+          time: 1
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      UpdaterTypeEnum: 2
+      TweenType: 1
+    IsLocal: 0
+    IsAutoStartValue: 0
+    StartValue: {x: 0, y: 0, z: 0}
+    EndValue: {x: 0, y: 0, z: 360}
+--- !u!1 &8209694557750501125
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8427436508884267522}
+  - component: {fileID: 697030219601562553}
+  - component: {fileID: 550359746873736857}
+  m_Layer: 0
+  m_Name: completeProp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8427436508884267522
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8209694557750501125}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.01, y: 5.37, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 583289613701687816}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!58 &697030219601562553
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8209694557750501125}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 0.48
+--- !u!114 &550359746873736857
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8209694557750501125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 08b0720d3833493da90838afadab7e8a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _invalidTime: 0
+  HasOnce: 1
--- a/Assets/GameRes/AutoSource/scene_prop/completeProp.prefab.meta
+++ b/Assets/GameRes/AutoSource/scene_prop/completeProp.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c13d9ff1ea3ccee468b549ef9b80b878
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/GameRes/AutoSource/scene_prop/normalProp.prefab
+++ b/Assets/GameRes/AutoSource/scene_prop/normalProp.prefab
@@ -0,0 +1,169 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3421194263901588496
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8934092677024438432}
+  - component: {fileID: 778124367643651699}
+  m_Layer: 0
+  m_Name: Circle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8934092677024438432
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3421194263901588496}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3764562316046112427}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &778124367643651699
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3421194263901588496}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  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: 0
+  m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &8854647579728768609
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3764562316046112427}
+  - component: {fileID: 8444638917169782258}
+  - component: {fileID: 3174786863779365803}
+  m_Layer: 0
+  m_Name: normalProp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3764562316046112427
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8854647579728768609}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.06, y: 8.48, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8934092677024438432}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8444638917169782258
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8854647579728768609}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b0556f3ae8f4cdd9e0f9dfc239b5e5a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _invalidTime: 0
+  HasOnce: 1
+--- !u!58 &3174786863779365803
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8854647579728768609}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 0.4
--- a/Assets/GameRes/AutoSource/scene_prop/normalProp.prefab.meta
+++ b/Assets/GameRes/AutoSource/scene_prop/normalProp.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4ca287cb936f39840b70bbbf05e3d6b4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/GameRes/Scenes/InitScene.unity
+++ b/Assets/GameRes/Scenes/InitScene.unity
@@ -1094,7 +1094,6 @@ GameObject:
  - component: {fileID: 1201757651}
  - component: {fileID: 1201757650}
  - component: {fileID: 1201757652}
-  - component: {fileID: 1201757653}
  m_Layer: 0
  m_Name: CM vcam1_player_Far
  m_TagString: Untagged
@@ -1180,21 +1179,6 @@ MonoBehaviour:
    m_FrequencyGain: 0
    m_Duration: 0
    m_NoiseOffsets: {x: -683.2471, y: -735.84265, z: -704.9739}
--- !u!114 &1201757653
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1201757649}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_BoundingShape2D: {fileID: 1944799163}
-  m_Damping: 0.5
-  m_MaxWindowSize: -1
 --- !u!1 &1230494199
 GameObject:
  m_ObjectHideFlags: 0
@@ -1728,7 +1712,7 @@ MonoBehaviour:
  m_BlendUpdateMethod: 1
  m_DefaultBlend:
    m_Style: 1
-    m_Time: 2
+    m_Time: 0.5
    m_CustomCurve:
      serializedVersion: 2
      m_Curve: []
--- a/Assets/GameRes/View/GamePanel.prefab
+++ b/Assets/GameRes/View/GamePanel.prefab
@@ -948,8 +948,8 @@ Canvas:
  m_VertexColorAlwaysGammaSpace: 1
  m_AdditionalShaderChannelsFlag: 25
  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: 591389233
+  m_SortingOrder: 5
  m_TargetDisplay: 0
 --- !u!114 &3591917537107701271
 MonoBehaviour:
--- a/Assets/Scripts/Game/Component/CameraManager.cs
+++ b/Assets/Scripts/Game/Component/CameraManager.cs
@@ -37,10 +37,12 @@ namespace Game.Component
            var lastState = this.cameraState;
            this.closeUpTarget.position = target.position;
            SetCameraState (CameraState.CloseUp);
+            MapContent.Instance.IsPause = true;
            this._closeUpTimeHandler = GameUpdateMgr.Instance.CreateTimer (duration , () =>
            {
                SetCameraState (lastState);
-                this._closeUpTimeHandler = null;
+                this._closeUpTimeHandler    = null;
+                MapContent.Instance.IsPause = false;
            });
        }

--- a/Assets/Scripts/Game/Component/EnemyEntity.cs
+++ b/Assets/Scripts/Game/Component/EnemyEntity.cs
@@ -162,20 +162,34 @@ namespace Game.Component
                return true;
            }
        }
-
+#if UNITY_EDITOR
        public bool HasRunaway => MapContent.Instance?.IsRunaway ?? false;

-        public float CurMoveSpeed => this._curMoveSpeedOffset * (this.MaxMoveSpeed *
-                                                                 (1 + 
-                                                                  ( this._expTimeHandler?.IsPlaying ?? false
-                                                                     ? (1 - this._expTimeHandler.CurProgress) * this._expSpeedOffset
-                                                                     : 0f)
-                                                                  )
-                                                                 );
+        public float CurMoveSpeed => (MapContent.Instance?.MoveGlobalOffset ?? 0) * this._curMoveSpeedOffset * (this.MaxMoveSpeed *
+                (1 +
+                 ( this._expTimeHandler?.IsPlaying ?? false
+                     ? (1 - this._expTimeHandler.CurProgress) * this._expSpeedOffset
+                     : 0f)
+                )
+            );
+#else
+        public bool HasRunaway => MapContent.Instance.IsRunaway ?? false;
+
+        public float CurMoveSpeed => (MapContent.Instance.MoveGlobalOffset) * this._curMoveSpeedOffset * (this.MaxMoveSpeed *
+                (1 +
+                 ( this._expTimeHandler?.IsPlaying ?? false
+                     ? (1 - this._expTimeHandler.CurProgress) * this._expSpeedOffset
+                     : 0f)
+                )
+            );
+#endif
+

        public void ResetState ()
        {
+            this.transform.position = this.CreatePos;
            this.AnimState.SetState (EnemyAnimStateType.Idle);
+            EndAttack ();
            this.UpdateSpeedState (false , false);
            _curAttackingTime  = 0;
            _curAttackCDTime   = 0;
@@ -267,10 +281,11 @@ namespace Game.Component

        public void CheckUpdateFsmData (bool isUpdate = false)
        {
-            isUpdate |= _fsmData.HasAttack   != this.HasAttack;
-            isUpdate |= _fsmData.HasSafeArea != this.HasSafeArea;
-            isUpdate |= _fsmData.HasRunaway  != this.HasRunaway;
-            isUpdate |= _fsmData.HasActive   != MapContent.Instance.IsActiveGame;
+            this._aiLerp.speed =  this.CurMoveSpeed;
+            isUpdate           |= _fsmData.HasAttack   != this.HasAttack;
+            isUpdate           |= _fsmData.HasSafeArea != this.HasSafeArea;
+            isUpdate           |= _fsmData.HasRunaway  != this.HasRunaway;
+            isUpdate           |= _fsmData.HasActive   != MapContent.Instance.IsActiveGame;

            this._fsmData.HasAttack   = HasAttack;
            this._fsmData.HasSafeArea = HasSafeArea;
@@ -294,9 +309,8 @@ namespace Game.Component
            this._expSpeedOffset = offset;
            this._expTimeHandler?.Kill ();
            this._expTimeHandler = GameUpdateMgr.Instance.CreateTimer (duration , null);
-            
        }
-        
+
        public void EndAttack ()
        {
            this._hasAtkState      = false;
--- a/Assets/Scripts/Game/Component/EnemyFSM_AI/FollowFore.cs
+++ b/Assets/Scripts/Game/Component/EnemyFSM_AI/FollowFore.cs
@@ -13,11 +13,11 @@ namespace Game.Component.EnemyFSM_AI
        public override void OnUpdate ()
        {
            var playerEntityTransform = MapContent.Instance.PlayerEntity.transform;
-            // if (Vector2.Distance (playerEntityTransform.position , this.Entity.transform.position) <= this.Entity.TriggerDistance)
-            // {
-            //     this.SetAiTarget (playerEntityTransform.position);
-            // }
-            // else
+            if (Vector2.Distance (playerEntityTransform.position , this.Entity.transform.position) <= this.Entity.TriggerDistance * 0.5f)
+            {
+                this.SetAiTarget (playerEntityTransform.position);
+            }
+            else
            {
                var forward = playerEntityTransform.up;
                this.SetAiTarget (playerEntityTransform.position + forward * this.Entity.TriggerDistance);
--- a/Assets/Scripts/Game/Component/MapContent.cs
+++ b/Assets/Scripts/Game/Component/MapContent.cs
@@ -15,9 +15,18 @@ namespace Game.Component

        public bool IsActiveGame;

+        private float _moveGlobalOffset = 1;
+
        //玩家位置
        public Vector2 PlayerPosition { private set; get; }
        public bool    IsRunaway      { get ;        private   set ; }
+        public float MoveGlobalOffset => this._moveGlobalOffset;
+
+        public bool IsPause
+        {
+            get => this._moveGlobalOffset <= 0;
+            set => this._moveGlobalOffset = value ? 0 :  1;
+        }

        private TimeHandler _RunawayTimeHandler;

@@ -71,19 +80,21 @@ namespace Game.Component

        public void ResetGame ()
        {
+            this.IsPause = false;
            this._RunawayTimeHandler?.Kill ();
            this.IsRunaway = false;
            this.ScenePart.RefreshInit ();
+            this.PlayerEntity.speed              = this.ScenePart.playerBaseSpeed;
            this.PlayerEntity.transform.position = this.ScenePart.createPos.position;
            this.PlayerEntity.gameObject.SetActive (true);
            this.PlayerEntity.RefreshInit ();
            //播放特效
        }

-        public void OverlyCoin (int messageOverlyCoin)
+        public bool OverlyCoin (int messageOverlyCoin)
        {
            // ReSharper disable once Unity.NoNullPropagation
-            this.ScenePart?.AddConditionNumber (messageOverlyCoin);
+            return this.ScenePart?.AddConditionNumber (messageOverlyCoin) ?? false;
        }

        private void OnRunaway (IEventMessage message)
--- a/Assets/Scripts/Game/Component/PlayerEntity.cs
+++ b/Assets/Scripts/Game/Component/PlayerEntity.cs
@@ -14,7 +14,7 @@ namespace Game.Component
        private float       speedBuffOffset;
        private TimeHandler speedBuffTimer;

-        public float CurSpeed => this.speed *
+        public float CurSpeed => MapContent.Instance.MoveGlobalOffset * this.speed *
                                 (1 + (this.speedBuffTimer?.IsPlaying ?? false ? this.speedBuffOffset * (1 - this.speedBuffTimer.CurProgress) : 0));

        public void AddSpeedBuff (float duration = 3 , float offset = 0.5f)
@@ -27,7 +27,6 @@ namespace Game.Component
        public void OnMove (Vector2 vector)
        {
            
-            
            var t = this.transform;
            // 获取前方方向的世界坐标
            Vector3 forward = (Vector3)vector;
--- a/Assets/Scripts/Game/Component/ScenePart.cs
+++ b/Assets/Scripts/Game/Component/ScenePart.cs
@@ -1,27 +1,31 @@
 using System.Collections.Generic;
+using Game.Component.SceneProp;
 using Sirenix.OdinInspector;
 using UnityEngine;
+using UnityEngine.Serialization;

 namespace Game.Component
 {
    public class ScenePart : MonoBehaviour
    {
-        public TextAsset         mapCacheData;
        public PolygonCollider2D cameraCollider;
        public Transform         createPos;

        public int   completeConditionNumber = 10;
        public float playerBaseSpeed         = 4f;

+        [FormerlySerializedAs ("completeProp")] public SuccessProp successProp;
+
        [LabelText ("当前完成数：")] private int _currentConditionNumber = 0;

        public int CurrentConditionNumber => this._currentConditionNumber;

        private List<EnemyEntity> _enemyEntities;
+        private List<BaseProp>    _baseProps;

        public float CurProgress => this._currentConditionNumber * 1f / completeConditionNumber;

-        public bool IsComplete => _currentConditionNumber >= completeConditionNumber;
+        public bool IsCondition => _currentConditionNumber >= completeConditionNumber;

        public bool AddConditionNumber (int number = 1)
        {
@@ -36,12 +40,18 @@ namespace Game.Component
            {
                enemyEntity.ResetState ();
            }
+            foreach (var baseProp in this._baseProps)
+            {
+                baseProp.ResetProp ();
+            }
+            this.successProp.gameObject.SetActive (false);
        }

        public void InitPart ()
        {
            this._enemyEntities = new List<EnemyEntity> ();
            this._enemyEntities = new List<EnemyEntity> (transform.GetComponentsInChildren<EnemyEntity> (true));
+            this._baseProps     = new List<BaseProp> (transform.GetComponentsInChildren<BaseProp> (true));
        }

    }
--- a/Assets/Scripts/Game/Component/SceneProp/BaseProp.cs
+++ b/Assets/Scripts/Game/Component/SceneProp/BaseProp.cs
@@ -15,7 +15,12 @@ namespace Game.Component.SceneProp
        private                                    TimeHandler _timeHandler;
        protected                                    bool        isReady => this._timeHandler == null || this._timeHandler.IsDone;

-        
+        public void ResetProp ()
+        {
+            this.gameObject.SetActive (true);
+            RefreshInvalidTime ();
+        }
+
        protected virtual void OnTriggerEnter2D (Collider2D other)
        {
            if (other.gameObject.CompareTag ("Player"))
--- a/Assets/Scripts/Game/Component/SceneProp/Editor/GameSceneTools.cs
+++ b/Assets/Scripts/Game/Component/SceneProp/Editor/GameSceneTools.cs
@@ -117,6 +117,23 @@ namespace Game.Component.SceneProp.Editor
            Selection.activeTransform = prop.transform;
        }
        
+        [MenuItem("GameObject/场景道具/创建通关触发器" , false, 10)]
+        public static void CreateCompleteProp (MenuCommand menuCommand)
+        {
+            var prefab = LoadPrefab ("Assets/GameRes/AutoSource/scene_prop/completeProp.prefab");
+            var pos    = CreatePos ();
+            var prop   = (GameObject)PrefabUtility.InstantiatePrefab(prefab);
+            prop.transform.position = pos;
+            var target = Selection.activeTransform;
+            if (target != null)
+            {
+                prop.transform.SetParent (target);
+            }
+            Undo.RegisterCreatedObjectUndo(prop, "Create " + prop.name);
+            Selection.activeObject    = prop;
+            Selection.activeTransform = prop.transform;
+        }
+        
        //创建敌人a
        [MenuItem("GameObject/场景敌人/创建敌人a" , false, 10)]
        public static void CreateEnemyA (MenuCommand menuCommand)
--- a/Assets/Scripts/Game/Component/SceneProp/SuccessProp.cs
+++ b/Assets/Scripts/Game/Component/SceneProp/SuccessProp.cs
@@ -0,0 +1,32 @@
+using System;
+using Game.EventDefine;
+using UnityEngine;
+
+namespace Game.Component.SceneProp
+{
+    /// <summary>
+    /// 游戏成功触发器
+    /// </summary>
+    public class SuccessProp : BaseProp
+    {
+        protected override void OnReady ()
+        {
+            
+        }
+
+        protected override void OnTrigger (PlayerEntity entity)
+        {
+            // GameEventDefine.GameComplete.SendMessage ();
+            GameEventDefine.ChangeGameFsm.SendMessage (GameState.SuccessGame);
+        }
+
+#if UNITY_EDITOR
+        private void OnDrawGizmos ()
+        {
+            Gizmos.color = Color.yellow;
+            Gizmos.DrawSphere (transform.position , 0.5f);
+            UnityEditor.Handles.Label (transform.position, "通关点");
+        }
+#endif
+    }
+}
--- a/Assets/Scripts/Game/Component/SceneProp/SuccessProp.cs.meta
+++ b/Assets/Scripts/Game/Component/SceneProp/SuccessProp.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 08b0720d3833493da90838afadab7e8a
+timeCreated: 1729604454
--- a/Assets/Scripts/Game/Component/SceneProp/WhiteProp.cs
+++ b/Assets/Scripts/Game/Component/SceneProp/WhiteProp.cs
@@ -8,7 +8,6 @@ namespace Game.Component.SceneProp
        [SerializeField] private float _duration = 1.5f;
        protected override void OnTrigger (PlayerEntity entity)
        {
-            Debug.Log ("wtf？");
            GameEventDefine.GlobalRunaway.SendMessage (this._duration);
        }
    }
--- a/Assets/Scripts/Game/EventDefine/GameEventDefine.cs
+++ b/Assets/Scripts/Game/EventDefine/GameEventDefine.cs
@@ -32,6 +32,13 @@ namespace Game.EventDefine
            public static void SendMessage (float duration) => UniEvent.SendMessage (new GlobalRunaway () { Duration = duration });
        }

+        public class CompleteGame : IEventMessage
+        {
+            private CompleteGame ()
+            {}
+            public static void SendMessage () => UniEvent.SendMessage (new CompleteGame ());
+        }
+
        /// <summary>
        ///  改变游戏状态
        /// </summary>
--- a/Assets/Scripts/Game/FsmNode/GameField.cs
+++ b/Assets/Scripts/Game/FsmNode/GameField.cs
@@ -4,6 +4,7 @@ using Framework.Audio;
 using Framework.FSMLite;
 using Framework.UI;
 using Game.Component;
+using Game.EventDefine;
 using UnityEngine;
 using Views;

@@ -13,12 +14,13 @@ namespace Game.FsmNode
    {
        protected override async void OnEnter (params object[] args)
        {
-            CameraManager.Instance.SetCloseUpTarget (MapContent.Instance.PlayerEntity.transform , 2f);
+            CameraManager.Instance.SetCloseUpTarget (MapContent.Instance.PlayerEntity.transform , 3f);
            CameraImpulseUtils.Instance.ExplosionImpulseCamera (1 , 0.5f , 0.5f , 0.5f);
            CameraEffectUtils.Instance.SetAberration (1f , 0.5f);
            CameraEffectUtils.Instance.SetGameCamBlur (0.35f , 0.5f , null);
            AudioManager.Instance.PlaySoundEffect (SeAudio.OverGame_Fail);
-            await   UniTask.Delay (2000);
+            GameEventDefine.GlobalRunaway.SendMessage (10);
+            await   UniTask.Delay (3000);
            
            this.stateMachineRunner.OpenState (GameState.StartGame);
        }
--- a/Assets/Scripts/Game/FsmNode/GameFight.cs
+++ b/Assets/Scripts/Game/FsmNode/GameFight.cs
@@ -28,13 +28,12 @@ namespace Game.FsmNode
            MapContent.Instance.IsActiveGame = true;
            // MapContent.Instance.Pathfinder.
            AudioManager.Instance.PlayBGM (BgmAudio.FightingBgm);
-            var globalData = RoomManager.Instance.RoomGlobalData;
        }
        
        protected override void OnExit ()
        {
            UIManager.Instance.CloseView (UIPanel.GamePanel);
-            MapContent.Instance.IsActiveGame = false;
+            // MapContent.Instance.IsActiveGame = false;
            // MapContent.Instance.Pathfinder.PausePathfinding ();
        }
    }
--- a/Assets/Scripts/Game/FsmNode/GameSuccess.cs
+++ b/Assets/Scripts/Game/FsmNode/GameSuccess.cs
@@ -1,5 +1,6 @@
 using System;
 using System.RandomPool;
+using Cysharp.Threading.Tasks;
 using FJson.Core;
 using Framework.Audio;
 using Framework.FSMLite;
@@ -18,10 +19,13 @@ namespace Game.FsmNode
    {
        protected override async void OnEnter (params object[] args)
        {
+            // GameEventDefine.GlobalRunaway.SendMessage (10);
+            MapContent.Instance.IsPause   = true;
            AudioManager.Instance.PlaySoundEffect (SeAudio.OverGame_Success);
            if (RoomManager.Instance.PartIndex < 3)
            {
-                
+                await UniTask.Delay (500);
+                UIManager.Instance.OpenView (UIPanel.SuccessPanel , new IC_ViewData (RoomManager.Instance.PartIndex));
            }
        }

--- a/Assets/Scripts/Game/RoomManager.cs
+++ b/Assets/Scripts/Game/RoomManager.cs
@@ -134,16 +134,21 @@ namespace Game
            this._gameFsm.OpenState (message.State , message.Args);
        }

-        private void OverlyCoin (IEventMessage obj)
+        private async void OverlyCoin (IEventMessage obj)
        {
            if (obj is GameEventDefine.OverlyCoin message)
            {
                AudioManager.Instance.PlaySoundEffect (SeAudio.Gaming_GetCoin);
                MapContent.Instance.OverlyCoin (message.overlyCoin);
                GlobalEventDefine.RefreshView.SendMessage ();
-                if (MapContent.Instance.ScenePart.IsComplete)
+                if (MapContent.Instance.ScenePart.IsCondition)
                {
-                    this._gameFsm.OpenState (GameState.SuccessGame);
+                    if (!MapContent.Instance.ScenePart.successProp.gameObject.activeSelf)
+                    {
+                        CameraManager.Instance.SetCloseUpTarget (MapContent.Instance.ScenePart.successProp.transform);
+                        await UniTask.Delay (1000);
+                        MapContent.Instance.ScenePart.successProp.gameObject.SetActive (true);
+                    }
                }
            }
        }
--- a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
+++ b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
@@ -46,7 +46,7 @@ Material:
    m_Ints: []
    m_Floats:
    - Vector1_c9f2135c9d254951b22c018d295f8558: 0.003
-    - _blurOffset: 0.08123708
+    - _blurOffset: 0.008341772
    m_Colors: []
  m_BuildTextureStacks: []
 --- !u!114 &268278646524644520
--- a/Assets/Scripts/Views/SuccessPanel.cs
+++ b/Assets/Scripts/Views/SuccessPanel.cs
@@ -28,7 +28,7 @@ namespace Views{
        public ObjectShake Shake;

        
-        public override void OnOpenView(IC_ViewData parameters)
+        public override async void OnOpenView(IC_ViewData parameters)
        {
            var index = parameters.GetValue<int> ();
            this.lastFragment.SetActive (false);
@@ -47,6 +47,8 @@ namespace Views{
            {
                rightFragment.effectFactor = 1;
            }
+
+            await UniTask.Delay (500);
            UpdateAnim (index);
        }

@@ -136,7 +138,7 @@ namespace Views{
        private async UniTask AnimOpen (UIDissolve[] effects , GameObject point)
        {
            var taskTracker = GameUpdateMgr.Instance.CreateTask ();
-            GameUpdateMgr.Instance.CreateTimer (0.75f , taskTracker.ListenerAction , progress =>
+            GameUpdateMgr.Instance.CreateTimer (1.25f , taskTracker.ListenerAction , progress =>
            {
                var f = MintEaseAction.InQuart  (0 , 1 ,progress);
                foreach (var uiEffect in effects)