修改bug

Assets/Art/ArtHero/Nanzhu.prefab

@@ -1816,6 +1816,8 @@ PlayableDirector:
     value: {fileID: 8668756859310917473}
   - key: {fileID: -894447145330074657, guid: 303c217ff8abd144fbb3777507f7112d, type: 2}
     value: {fileID: 0}
+  - key: {fileID: 0}
+    value: {fileID: 8668756859310917473}
   m_ExposedReferences:
     m_References: []
 --- !u!1 &2860882066902628615

Assets/Art/HeroTimeLine/gf_lieyanjian_timeline.playable

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-7242387571130488237
+--- !u!114 &-5408356913757677258
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -9,8 +9,8 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
-  m_Name: Control Track (1)
+  m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "lieyanjian_zd@\u70C8\u7130\u5251\u5B50\u5F39\u8868\u73B0"
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
@@ -18,78 +18,10 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5073625934344026965}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0.3999999999999999
-    m_ClipIn: 0
-    m_Asset: {fileID: -1249931145621353543}
-    m_Duration: 1
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -7242387571130488237}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      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
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: fx_gf_lieyanjian
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: -602889773965061612}
+  m_Clips: []
   m_Markers:
     m_Objects: []
 --- !u!114 &-5073625934344026965
@@ -114,8 +46,8 @@ MonoBehaviour:
   m_Children:
   - {fileID: 8106544261917024806}
   - {fileID: -894447145330074657}
-  - {fileID: -7242387571130488237}
   - {fileID: -1223227800801429518}
+  - {fileID: 6674571689149196314}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -143,7 +75,7 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
---- !u!114 &-1249931145621353543
+--- !u!114 &-3353551988853371059
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -152,34 +84,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
-  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)
+  m_Script: {fileID: 11500000, guid: 42b647dab9a3401faf84053d24574f10, type: 3}
+  m_Name: TimeLineTriggerAsset
   m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 06f144804f7ec7342a023f1e18a025af
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 3406478517066756076, guid: ea181fbbeb562ee4ea001111cfa2b819, type: 3}
-  updateParticle: 1
-  particleRandomSeed: 518
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 1
-  active: 1
-  postPlayback: 2
-  targetType: 2
-  LocationType: 0
-  targetSpecialDotName: zdpos9
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
+  targetEntityType: 1
+  tineLineTrigerType: 0
+  tineLineTrigerData: 
 --- !u!114 &-1223227800801429518
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -365,6 +275,98 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
+--- !u!114 &-602889773965061612
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track (1)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -5408356913757677258}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.03333333333333333
+    m_ClipIn: 0
+    m_Asset: {fileID: 3479211134189885673}
+    m_Duration: 1
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -602889773965061612}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      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
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: fx_gf_lieyanjian
+  m_Markers:
+    m_Objects: []
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -380,12 +382,50 @@ MonoBehaviour:
   m_Version: 0
   m_Tracks:
   - {fileID: -5073625934344026965}
+  - {fileID: -5408356913757677258}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
+--- !u!114 &3479211134189885673
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: d0f44458d6eed554aa82dc341cc3bd38
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 3406478517066756076, guid: ea181fbbeb562ee4ea001111cfa2b819, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 518
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 1
+  active: 1
+  postPlayback: 2
+  targetType: 2
+  LocationType: 0
+  targetSpecialDotName: zdpos9
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 1
+  CustomTargetPosIndex: 0
+  intervalTime: 0
 --- !u!114 &4036464651189746888
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -435,6 +475,98 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
   m_Name: ActivationPlayableAsset
   m_EditorClassIdentifier: 
+--- !u!114 &6674571689149196314
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3fc2695741642bd42a34534ca2286500, type: 3}
+  m_Name: Customize Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -5073625934344026965}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.45
+    m_ClipIn: 0
+    m_Asset: {fileID: -3353551988853371059}
+    m_Duration: 0.48333333333333334
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 6674571689149196314}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    m_MixInCurve:
+      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
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: TimeLineTriggerAsset
+  m_Markers:
+    m_Objects: []
 --- !u!114 &8106544261917024806
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Scenes/testCombat.scene

@@ -452,13 +452,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 321
+      y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 321}
+    atlasRectOffset: {x: 0, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 371.5}
+    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -1032,7 +1032,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+    texture: {fileID: 2800000, guid: 20588c0ec15f15142aed3b7ba2b75829, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -1117,8 +1117,8 @@ Sprite:
       width: 208
       height: 208
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 0}
-    settingsRaw: 65
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
     uvTransform: {x: 100, y: 104, z: 100, w: 104}
     downscaleMultiplier: 1
   m_PhysicsShape:
@@ -1877,7 +1877,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -2234,13 +2234,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 321
+      y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 321}
+    atlasRectOffset: {x: 0, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 371.5}
+    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -2488,13 +2488,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 321
+      y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 321}
+    atlasRectOffset: {x: 0, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 371.5}
+    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -3546,14 +3546,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 105
-      y: 303
+      x: 110
+      y: 255
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 105, y: 303}
+    atlasRectOffset: {x: 110, y: 255}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 150, z: 100, w: 348}
+    uvTransform: {x: 100, y: 155, z: 100, w: 300}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -3950,14 +3950,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 105
-      y: 303
+      x: 110
+      y: 255
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 105, y: 303}
+    atlasRectOffset: {x: 110, y: 255}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 150, z: 100, w: 348}
+    uvTransform: {x: 100, y: 155, z: 100, w: 300}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -4177,13 +4177,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 321
+      y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 321}
+    atlasRectOffset: {x: 0, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 371.5}
+    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -5283,13 +5283,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 321
+      y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 321}
+    atlasRectOffset: {x: 0, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 371.5}
+    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -5910,14 +5910,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 105
-      y: 303
+      x: 110
+      y: 255
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 105, y: 303}
+    atlasRectOffset: {x: 110, y: 255}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 150, z: 100, w: 348}
+    uvTransform: {x: 100, y: 155, z: 100, w: 300}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -6302,14 +6302,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 105
-      y: 303
+      x: 110
+      y: 255
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 105, y: 303}
+    atlasRectOffset: {x: 110, y: 255}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 150, z: 100, w: 348}
+    uvTransform: {x: 100, y: 155, z: 100, w: 300}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -6528,14 +6528,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 105
-      y: 303
+      x: 110
+      y: 255
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 105, y: 303}
+    atlasRectOffset: {x: 110, y: 255}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 150, z: 100, w: 348}
+    uvTransform: {x: 100, y: 155, z: 100, w: 300}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -7566,14 +7566,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 105
-      y: 303
+      x: 110
+      y: 255
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 105, y: 303}
+    atlasRectOffset: {x: 110, y: 255}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 150, z: 100, w: 348}
+    uvTransform: {x: 100, y: 155, z: 100, w: 300}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -7887,14 +7887,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 105
-      y: 303
+      x: 110
+      y: 255
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 105, y: 303}
+    atlasRectOffset: {x: 110, y: 255}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 150, z: 100, w: 348}
+    uvTransform: {x: 100, y: 155, z: 100, w: 300}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -8206,14 +8206,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 105
-      y: 303
+      x: 110
+      y: 255
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 105, y: 303}
+    atlasRectOffset: {x: 110, y: 255}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 150, z: 100, w: 348}
+    uvTransform: {x: 100, y: 155, z: 100, w: 300}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -10099,13 +10099,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 321
+      y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 321}
+    atlasRectOffset: {x: 0, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 371.5}
+    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -10384,14 +10384,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 105
-      y: 303
+      x: 110
+      y: 255
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 105, y: 303}
+    atlasRectOffset: {x: 110, y: 255}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 150, z: 100, w: 348}
+    uvTransform: {x: 100, y: 155, z: 100, w: 300}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}

Assets/Scripts/Core/Triiger/ITriggerEntity.cs

@@ -3,5 +3,6 @@ namespace Core.Triiger
     public interface ITriggerEntity
     {
         string tag { get; }
+        
     }
 }

Assets/Scripts/GameLogic/Combat/Buff/b_1005.cs

@@ -6,7 +6,7 @@ using GameLogic.Player;
 namespace GameLogic.Combat.Buff
 {
     /// <summary>
-    /// 灼热：每秒对敌人照成火属性灼烧伤害。5层后对敌人照成火系伤势+1。水洗功法能清除1层
+    /// 灼热：每秒对敌人照成火属性灼烧伤害
     /// </summary>
     public class b_1005 : BuffBasic
     {
@@ -14,7 +14,7 @@ namespace GameLogic.Combat.Buff
 
         protected override void ProInit()
         {
-            CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+           
         }
 
 
@@ -31,24 +31,11 @@ namespace GameLogic.Combat.Buff
                     WuXingType.Fire,HarmType.Buff);
             }
         }
-
-        private void AddUseGongFa(IEventData eventData)
-        {
-            AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
-            if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
-            {
-                switch (data.SkillBasic.wuXingType)
-                {
-                    case WuXingType.Water:
-                        ReduceCount(1);
-                        break;
-                }
-            }
-        }
+     
 
         protected override void ProDormancyObj()
         {
-            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+           
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Buff/b_1010.cs

@@ -0,0 +1,37 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Player;
+
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 灼痛 敌人皮肤和静脉被火焰灼烧溃烂，使用功法时自身受到当前生命2%伤害
+    /// </summary>
+    public class b_1010 : BuffBasic
+    {
+        protected override void ProInit()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+        }
+
+
+        private void AddUseGongFa(IEventData eventData)
+        {
+            AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
+            if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
+            {
+                float harmbl = buffCount * buffInf.BuffConfig.effectValue[0];
+                long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
+                    source.CurrCombatHeroInfo.hp.Value, harmbl);
+                CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
+                    WuXingType.Fire,HarmType.Buff);
+            }
+        }
+
+        protected override void ProDormancyObj()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1010.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d368357a4bf24df4befe106fcb39dc53
+timeCreated: 1747018304

Assets/Scripts/GameLogic/Combat/CombatEvent/CombatEventType.cs

@@ -87,6 +87,10 @@
         /// </summary>
         TaoismSkillAlter,
         /// <summary>
+        /// 触发技能槽位
+        /// </summary>
+        TriggerSkillSlots,
+        /// <summary>
         /// 补填技能槽位
         /// </summary>
         FillInSkillSlots,
@@ -98,6 +102,10 @@
         /// 添加战斗信息描述
         /// </summary>
         AddCombatMassge,
-        
+        /// <summary>
+        /// 功法碰撞完成
+        /// </summary>
+        GongFaPengZhuangFinish,
+     
     }
 }

Assets/Scripts/GameLogic/Combat/CombatEvent/GongFaPengZhuangFinishEventData.cs

@@ -0,0 +1,17 @@
+using Core.Utility.Event;
+using GameLogic.Combat.Hero.Turntable;
+using GameLogic.Combat.Skill;
+
+namespace Common.Utility.CombatEvent
+{
+    public class GongFaPengZhuangFinishEventData : EventDataBasic<GongFaPengZhuangFinishEventData>
+    {
+        public SkillFeaturesData a;
+        public SkillFeaturesData b;
+        protected override void ProDispose()
+        {
+            a = null;
+            b = null;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/GongFaPengZhuangFinishEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f0aea0b7fa3c4cd7bd2539b17274f61d
+timeCreated: 1747039852

Assets/Scripts/GameLogic/Combat/CombatEvent/TriggerSkillSlotsEventData.cs

@@ -0,0 +1,19 @@
+using Common.Combat.FxAILogic;
+using Core.Utility.Event;
+using GameLogic.Combat.Hero.Turntable;
+using GameLogic.Combat.Skill;
+
+namespace Common.Utility.CombatEvent
+{
+    public class TriggerSkillSlotsEventData: EventDataBasic<TriggerSkillSlotsEventData>
+    {
+        public SkillBasic SkillBasic;
+        public SkillSlots SkillSlots;
+        public int triggerType;
+        protected override void ProDispose()
+        {
+            SkillBasic = null;
+            SkillSlots = null;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/TriggerSkillSlotsEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f3c883ce7c814c7ca3f6d7e5641c07ca
+timeCreated: 1747038142

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -133,6 +133,10 @@ namespace GameLogic.Combat.CombatTool
             startInjuredEventData.HarmReturnInfo = harmReturnInfo;
             CombatEventManager.Instance.Dispatch(CombatEventType.StartInjured, startInjuredEventData);
 
+            if (harmReturnInfo.isInvalid)
+            {
+                return harmReturnInfo;
+            }
 
             target.combatHeroEntity.This<CombatHeroEntity>().HeroHurt(harmReturnInfo);
 
@@ -171,7 +175,7 @@ namespace GameLogic.Combat.CombatTool
             harmReturnInfo.attType = attType;
             harmReturnInfo.harmType = harmType;
             harmReturnInfo.triggerData = triggerData;
-            
+
             if (target.combatHeroEntity.isDie)
             {
                 return harmReturnInfo;
@@ -181,7 +185,7 @@ namespace GameLogic.Combat.CombatTool
             return harmReturnInfo;
         }
 
-        public void ShangSHi(WuXingType wuXingType,ShowBaiscEntity target,int vInjury)
+        public void ShangSHi(WuXingType wuXingType, ShowBaiscEntity target, int vInjury)
         {
             switch (wuXingType)
             {
@@ -194,10 +198,10 @@ namespace GameLogic.Combat.CombatTool
                 case WuXingType.Water:
                     target.CurrCombatHeroInfo.Water_Injury += vInjury;
                     break;
-                case  WuXingType.Fire:
+                case WuXingType.Fire:
                     target.CurrCombatHeroInfo.Fire_Injury += vInjury;
                     break;
-                case  WuXingType.Earth:
+                case WuXingType.Earth:
                     target.CurrCombatHeroInfo.Earth_Injury += vInjury;
                     break;
             }
@@ -258,7 +262,8 @@ namespace GameLogic.Combat.CombatTool
                 default: return 5; // 无效元素
             }
         }
-        public int GetRestrained(WuXingType WuXingType,WuXingType targetWuXingType)
+
+        public int GetRestrained(WuXingType WuXingType, WuXingType targetWuXingType)
         {
             int c = 0;
             if (WuXingType.HasFlag(WuXingType.Gold))
@@ -303,12 +308,13 @@ namespace GameLogic.Combat.CombatTool
 
             return c;
         }
+
         public void FaBaoPengZhuang(CombatMagicWeaponEntity a, CombatMagicWeaponEntity b)
         {
-            CombatHeroEntity heroEntityA= a.RootMagicWeaponControl.combatHeroEntity;
+            CombatHeroEntity heroEntityA = a.RootMagicWeaponControl.combatHeroEntity;
             CombatHeroEntity heroEntityB = b.RootMagicWeaponControl.combatHeroEntity;
             int myRestrained = GetRestrained(a.WuXingType, b.WuXingType);
-            int targetRestrained = GetRestrained(b.WuXingType,a.WuXingType);
+            int targetRestrained = GetRestrained(b.WuXingType, a.WuXingType);
             float lg_a = heroEntityA.CurrCombatHeroInfo.GetWuXingShuXing(a.WuXingType);
             float lg_b = heroEntityB.CurrCombatHeroInfo.GetWuXingShuXing(b.WuXingType);
             int c = myRestrained - targetRestrained;
@@ -349,7 +355,7 @@ namespace GameLogic.Combat.CombatTool
             CombatHeroEntity heroEntityB)
         {
             int myRestrained = GetRestrained(a.WuXingType, b.WuXingType);
-            int targetRestrained = GetRestrained(b.WuXingType,a.WuXingType);
+            int targetRestrained = GetRestrained(b.WuXingType, a.WuXingType);
             float lg_a = heroEntityA.CurrCombatHeroInfo.GetWuXingShuXing(a.WuXingType);
             float lg_b = heroEntityB.CurrCombatHeroInfo.GetWuXingShuXing(b.WuXingType);
             int c = myRestrained - targetRestrained;
@@ -384,6 +390,11 @@ namespace GameLogic.Combat.CombatTool
                 a.hp = 0;
                 b.hp = 0;
             }
+
+            GongFaPengZhuangFinishEventData gongFaPengZhu = GongFaPengZhuangFinishEventData.Create();
+            gongFaPengZhu.a = a;
+            gongFaPengZhu.b = b;
+            CombatEventManager.Instance.Dispatch(CombatEventType.GongFaPengZhuangFinish, gongFaPengZhu);
         }
 
         /// <summary>
@@ -402,7 +413,7 @@ namespace GameLogic.Combat.CombatTool
         }
 
         /// <summary>
-        /// 是否相生
+        /// 是否相克制
         /// </summary>
         /// <returns></returns>
         public bool IsRestrain(WuXingType a, WuXingType b)

Assets/Scripts/GameLogic/Combat/CombatTool/HarmReturnInfo.cs

@@ -17,6 +17,7 @@ namespace GameLogic.Combat.CombatTool
         public long att;
         public long yuanShiAtt;
         public bool isMiss;
+        public bool isInvalid;
         public AttType attType;
         public TriggerData triggerData;
         public HarmType harmType = HarmType.Default;

Assets/Scripts/GameLogic/Combat/CombatTool/MagicWeaponCombatSence.cs

@@ -36,7 +36,7 @@ namespace GameLogic.Combat.CombatTool
             new Map<int, MagicWeaponCollisionInfo>();
 
         private int MagicWeaponCollisionID;
-        
+
         public void CloseSecene()
         {
             magicWeaponCollisionInfoList.Clear();
@@ -44,10 +44,12 @@ namespace GameLogic.Combat.CombatTool
             {
                 _enemyMagicWeaponList[i].CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
             }
+
             for (int i = 0; i < _playerMagicWeaponList.Count; i++)
             {
                 _playerMagicWeaponList[i].CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
             }
+
             _playerMagicWeaponList.Clear();
             _enemyMagicWeaponList.Clear();
         }
@@ -127,6 +129,11 @@ namespace GameLogic.Combat.CombatTool
 
         private void FindCollidingTarget(CombatMagicWeaponEntity combatMagicWeaponEntity)
         {
+            if (combatMagicWeaponEntity.isMagicWeaponTreasureBook)
+            {
+                return;
+            }
+
             bool isEnemy = combatMagicWeaponEntity.IsEnemy;
             BetterList<CombatMagicWeaponEntity> magicWeaponList =
                 isEnemy ? _playerMagicWeaponList : _enemyMagicWeaponList;
@@ -148,6 +155,10 @@ namespace GameLogic.Combat.CombatTool
                 // {
                 //     return magicWeaponList[i];
                 // }
+                if (magicWeaponList[i].isMagicWeaponTreasureBook)
+                {
+                    continue;
+                }
 
                 if (magicWeaponList[i].MagicWeaponCollisionId < 0)
                 {
@@ -161,7 +172,7 @@ namespace GameLogic.Combat.CombatTool
                 CombatMagicWeaponEntity target = nullTarget[index];
                 MagicWeaponCollisionInfo magicWeaponCollisionInfo =
                     CObjectPool.Instance.Fetch<MagicWeaponCollisionInfo>();
-                
+
                 magicWeaponCollisionInfo.Init(combatMagicWeaponEntity, target, MagicWeaponCollisionID);
                 magicWeaponCollisionInfoList.Add(MagicWeaponCollisionID, magicWeaponCollisionInfo);
                 MagicWeaponCollisionID++;
@@ -170,7 +181,6 @@ namespace GameLogic.Combat.CombatTool
             return;
         }
 
-  
 
         public void RemoveCollisionMagicWeapon(int id)
         {

Assets/Scripts/GameLogic/Combat/Hero/Barrier/BarrierEntityMono.cs

@@ -5,5 +5,6 @@ namespace GameLogic.Combat.Hero
     public class BarrierEntityMono : MonoBehaviour
     {
         public IBarrier Barrier;
+      
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/Barrier/BarrierTriggerData.cs

@@ -0,0 +1,13 @@
+namespace GameLogic.Combat.Hero
+{
+    /// <summary>
+    /// 障碍碰撞到的信息
+    /// </summary>
+    public class BarrierTriggerData
+    {
+        /// <summary>
+        /// 这是碰撞是否可以穿透
+        /// </summary>
+        public bool isPenetrate;
+    }
+}

Assets/Scripts/GameLogic/Combat/Hero/Barrier/BarrierTriggerData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1c9d5235b4e74fb48b6f3e7e997952b7
+timeCreated: 1747019953

Assets/Scripts/GameLogic/Combat/Hero/Barrier/IBarrier.cs

@@ -11,6 +11,8 @@ namespace GameLogic.Combat.Hero
         /// </summary>
         ShowBaiscEntity Own { get; set; }
 
+        BarrierTriggerData BarrierTriggerData { get; set; }
+
         /// <summary>
         /// 碰撞信息,释放拦截
         /// </summary>
@@ -18,6 +20,7 @@ namespace GameLogic.Combat.Hero
         /// <returns></returns>
         bool CollideTriiger(ITriggerEntity triggerEntity);
 
-        void Harm(HarmReturnInfo harmReturnInfo);
+        long Harm(HarmReturnInfo harmReturnInfo);
+        
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/Barrier/ShieldsBarrier.cs

@@ -10,6 +10,7 @@ namespace GameLogic.Combat.Hero
     public class ShieldsBarrier : IBarrier
     {
         public ShowBaiscEntity Own { get; set; }
+        public BarrierTriggerData BarrierTriggerData { get; set; }
         public GameObjectPool ShieldsFx;
 
         private ParticleSystem[] allParticleSystem;
@@ -69,7 +70,7 @@ namespace GameLogic.Combat.Hero
             return true;
         }
 
-        public void Harm(HarmReturnInfo harmReturnInfo)
+        public long Harm(HarmReturnInfo harmReturnInfo)
         {
             Play();
             harmReturnInfo.target.combatHeroEntity.CurrCombatHeroInfo.Shield -= harmReturnInfo.att;
@@ -77,6 +78,8 @@ namespace GameLogic.Combat.Hero
             {
                 Rupture();
             }
+
+            return 0;
         }
 
         public void Dispose()

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -313,18 +313,19 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
             return;
         }
 
+        long att = harmReturnInfo.att;
         IBarrier shieldsBarrier = harmReturnInfo.triggerData.IBarrier as IBarrier;
         if (shieldsBarrier != null)
         {
-            shieldsBarrier.Harm(harmReturnInfo);
+            att = shieldsBarrier.Harm(harmReturnInfo);
             harmReturnInfo.harmType |= HarmType.Shields;
         }
-        else
+
+        if (att > 0)
         {
-            CurrCombatHeroInfo.hp -= harmReturnInfo.att;
+            CurrCombatHeroInfo.hp -= att;
         }
 
-
         UpdateHarmText(harmReturnInfo);
         if (combatHeroGameObject.HeroGPUMono != null)
         {
@@ -397,7 +398,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         _isDis = true;
         BuffControl.Dispose();
         _isDis = true;
-       
+
         CombatHeroSkillControl.Dispose();
         CombatAIBasic.Dispose();
         combatHeroTimeLineControl.Dispose();
@@ -440,7 +441,6 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
     }
 
 
-
     public override void DormancyObj()
     {
         Dispose();

Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -22,9 +22,12 @@ namespace GameLogic.Combat.Hero
         public int MagicWeaponCollisionId = -1;
         protected FabaoConfig _magicWeaponConfig;
         public float cd = 2;
-
         public WuXingType WuXingType;
 
+        /// <summary>
+        /// 是否拥有法宝宝典
+        /// </summary>
+        public bool isMagicWeaponTreasureBook = false;
         public FaBaoInfo FaBaoInfo
         {
             get { return _faBaoInfo; }

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs

@@ -1,6 +1,7 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Common.Utility.CombatEvent;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Skill;
 using UnityEngine;
 using Utility.CTween;
 
@@ -28,8 +29,7 @@ namespace GameLogic.Combat.Hero.State
         protected override void ProEnter()
         {
             myCombatMagicWeaponEntity.CloseLoopFx();
-            timeLineEventLogicGroup =
-                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("jihuo");
+
 
             myCombatMagicWeaponEntity.GameObject.transform.eulerAngles = Vector3.zero;
             myCombatMagicWeaponEntity.GameObject.transform.localScale = Vector3.one;
@@ -40,13 +40,25 @@ namespace GameLogic.Combat.Hero.State
             float y = myCombatMagicWeaponEntity.IsEnemy ? 5 : 5;
             float x = xOff[myCombatMagicWeaponEntity.useIndex];
 
-            endPos = myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GameObject.transform.TransformPoint(
-                new Vector3(x, y, 0));
+            endPos = myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GameObject.transform
+                .TransformPoint(
+                    new Vector3(x, y, 0));
             // endPos = startPos +  Vector3(x-3, y, 0);
             _addTime = 1.0f / (Vector3.Distance(startPos, endPos) /
                                CustomTweenManager.AnimationCurveLibrary.fabaoMoveTopSpeed);
-            _currTime = 0;
+          
             isUpdate = true;
+
+            if (myCombatMagicWeaponEntity.isMagicWeaponTreasureBook)
+            {
+                _currTime = 1;
+              
+            }
+            else
+            {
+                _currTime = 0;
+                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("jihuo");
+            }
         }
 
 
@@ -67,8 +79,10 @@ namespace GameLogic.Combat.Hero.State
                 {
                     timeLineEventLogicGroup.CloseLoopFx();
                 }
+
                 UseMagicWeaponEventData useMagicWeaponEventData = UseMagicWeaponEventData.Create();
-                useMagicWeaponEventData.combatHeroEntity = myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity;
+                useMagicWeaponEventData.combatHeroEntity =
+                    myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity;
                 useMagicWeaponEventData.combatMagicWeaponEntity = myCombatMagicWeaponEntity;
                 CombatEventManager.Instance.Dispatch(CombatEventType.ShowUseMagicWeaponName, useMagicWeaponEventData);
                 // myCombatMagicWeaponEntity.GameObject.SetActive(true);

Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillSlots.cs

@@ -176,6 +176,12 @@ namespace GameLogic.Combat.Hero.Turntable
         {
             if (SkillBasic != null)
             {
+                
+                TriggerSkillSlotsEventData triggerSkillSlotsEventData= TriggerSkillSlotsEventData.Create();
+                triggerSkillSlotsEventData.SkillBasic = SkillBasic;
+                triggerSkillSlotsEventData.SkillSlots = this;
+                triggerSkillSlotsEventData.triggerType= triggerType;
+                CombatEventManager.Instance.Dispatch(CombatEventType.TriggerSkillSlots, triggerSkillSlotsEventData);
                 switch (SkillBasic.wuXingType)
                 {
                     case WuXingType.Gold:

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/MagicSkillBasic.cs

@@ -71,6 +71,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             this.magicAttShowBasic = magicAttShowBasic;
         }
 
+
         protected override void ProCombatUpdate(float time)
         {
             if (magicAttShowBasic != null)

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901003.cs

@@ -37,6 +37,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
         }
 
         public ShowBaiscEntity Own { get; set; }
+        public BarrierTriggerData BarrierTriggerData { get; set; }
 
         private void Finish()
         {
@@ -84,7 +85,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             }
         }
 
-        public void Harm(HarmReturnInfo harmReturnInfo)
+        public long Harm(HarmReturnInfo harmReturnInfo)
         {
             _currHp -= harmReturnInfo.att;
             if (_currHp <= 0) //盾破
@@ -94,6 +95,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
                 pengZhuang.SetActive(false);
                 Debug.Log("盾破了，做表现的时候一起做");
             }
+            return 0;
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901006.cs

@@ -0,0 +1,71 @@
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill.MagicSkill
+{
+    /// <summary>
+    /// 混沌珠 使用后短时间内大幅提升所有灵根{0}%，一场战斗有使用{1}次
+    /// 使用后额外对敌人照成的功法伤害提升10%
+    /// </summary>
+    public class S901006 : MagicSkillBasic
+    {
+        private CombatHeroEntity target;
+
+        private bool isUpdate = false;
+        private float _currTime;
+        private int _useCount;
+
+
+        protected override void ProMagicUseSkill()
+        {
+            _useCount++;
+            isUpdate = true;
+            _currTime = 0;
+            float v = SelfSkillConfig.effectValue[0];
+            CombatHeroEntity.CurrCombatHeroInfo.Metal += v;
+            CombatHeroEntity.CurrCombatHeroInfo.Wood += v;
+            CombatHeroEntity.CurrCombatHeroInfo.Water += v;
+            CombatHeroEntity.CurrCombatHeroInfo.Fire += v;
+            CombatHeroEntity.CurrCombatHeroInfo.Earth += v;
+        }
+
+        public override bool IsCanUse()
+        {
+            if (_useCount >= SelfSkillConfig.effectValue[1])
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        protected override void MagicSkillUpdate(float time)
+        {
+            if (!isUpdate)
+            {
+                return;
+            }
+
+            _currTime += time;
+            if (_currTime >= SelfSkillConfig.effectValue[2])
+            {
+                isUpdate = false;
+                float v = SelfSkillConfig.effectValue[0];
+                CombatHeroEntity.CurrCombatHeroInfo.Metal -= v;
+                CombatHeroEntity.CurrCombatHeroInfo.Wood -= v;
+                CombatHeroEntity.CurrCombatHeroInfo.Water -= v;
+                CombatHeroEntity.CurrCombatHeroInfo.Fire -= v;
+                CombatHeroEntity.CurrCombatHeroInfo.Earth -= v;
+            }
+        }
+
+        protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
+            TimeLineEventLogicBasic timeLineEventLogicBasic)
+        {
+            ILifetCycleHitPoint[] lifetCycleHitPoints = new ILifetCycleHitPoint[1];
+            lifetCycleHitPoints[0] = target.GetMainHotPoin<ILifetCycleHitPoint>();
+            return lifetCycleHitPoints;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901006.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 590d7adff5994aed916698da5b57bf20
+timeCreated: 1747041759

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901007.cs

@@ -0,0 +1,118 @@
+using System.Collections.Generic;
+using Common.Combat.FxAILogic;
+using Core.Triiger;
+using Fort23.Core;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill.MagicSkill
+{
+    public class S901007FxMove : CObject
+    {
+        public Vector3 endPos;
+        public FxAILogicBasic fxAILogicBasic;
+        public float moveSpeed = 8;
+
+        private System.Action finishCallBack;
+        private bool isUpdate;
+
+        public void InitActive(System.Action finishCallBack)
+        {
+            this.finishCallBack = finishCallBack;
+            isUpdate = true;
+        }
+
+        public override void ActiveObj()
+        {
+        }
+
+        public override void DormancyObj()
+        {
+            fxAILogicBasic = null;
+            isUpdate = false;
+        }
+
+        public void Update(float t)
+        {
+            if (!isUpdate)
+            {
+                return;
+            }
+
+            Vector3 pos = fxAILogicBasic.gameObject.transform.position;
+            Vector3 dir = endPos - pos;
+            float distance = dir.magnitude;
+            float addT = 1.0f / (distance / moveSpeed);
+            float moveTime = t * addT;
+            Vector3 d = Vector3.Lerp(pos, endPos, moveTime);
+            fxAILogicBasic.gameObject.transform.position = d;
+            if (moveTime >= 1)
+            {
+                fxAILogicBasic.Dispose();
+                finishCallBack?.Invoke();
+            }
+        }
+    }
+
+    /// <summary>
+    /// 宝塔在英雄的头顶前往位置旋转，形成一个扇形区域，敌人的功法如果进入这个扇形区域有很大的概率被法宝吸收
+    ///(飞到玩家头顶持续施法)
+    /// 100%吸收，切吸收后临时增加玩家对于吸收功法的灵根
+    /// </summary>
+    public class S901007 : MagicSkillBasic
+    {
+        private List<S901007FxMove> _currTriggerFx = new List<S901007FxMove>();
+        private float _currTime;
+        private bool _isUpdae;
+
+        protected override void ProMagicUseSkill()
+        {
+        }
+
+
+        protected override void MagicSkillUpdate(float time)
+        {
+            if (!_isUpdae)
+            {
+                return;
+            }
+
+            _currTime += time;
+            for (int i = 0; i < _currTriggerFx.Count; i++)
+            {
+                S901007FxMove fxMove = _currTriggerFx[i];
+                fxMove.Update(time);
+            }
+        }
+
+        protected override void ProSkillPlayFinish()
+        {
+            _isUpdae = false;
+            for (int i = 0; i < _currTriggerFx.Count; i++)
+            {
+                S901007FxMove fxMove = _currTriggerFx[i];
+                CObjectPool.Instance.Recycle(fxMove);
+            }
+
+            _currTriggerFx.Clear();
+        }
+
+        private void OnTriggerExitEvent(Collider collider, ITriggerEntity triggerEntity)
+        {
+            if (triggerEntity == null)
+            {
+                return;
+            }
+
+            FxAILogicBasic fxAILogicBasic = triggerEntity as FxAILogicBasic;
+            if (fxAILogicBasic != null && fxAILogicBasic.CombatHeroEntity.IsEnemy != CombatHeroEntity.IsEnemy)
+            {
+                fxAILogicBasic.isNotMove = true;
+                S901007FxMove fxMove = CObjectPool.Instance.Fetch<S901007FxMove>();
+                fxMove.fxAILogicBasic = fxAILogicBasic;
+                fxMove.InitActive(null);
+                _currTriggerFx.Add(fxMove);
+            }
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901007.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1c77aa094fa9482ca79834cdd48e1823
+timeCreated: 1747043113

Assets/Scripts/GameLogic/Combat/Skill/S2001.cs

@@ -2,6 +2,7 @@ using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
+using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace GameLogic.Combat.Skill
@@ -9,31 +10,62 @@ namespace GameLogic.Combat.Skill
     /// <summary>
     /// 烈焰剑  向前方发出一柄剑，对敌人造成火系伤害，对敌人施加一层灼热，比有10%概率对敌人造成1火伤势
     /// </summary>
-    public class S2001: SkillBasic
+    public class S2001 : SkillBasic
     {
+        private static int[] zdPosIndex = new int[] { 9, 8, 7, 6, 5, 4, 3, 2, 1 };
+
         protected override void ProUseSkill()
         {
+            this.AddTriggerCallBack("lieyanjian_zd", ProDefaultTimeLineTrigger_ZD);
             ActivationTimeLineData("lieyanjian");
         }
 
-        protected override void ProTimelineFxLogicInit(string groupName, ITimelineFxLogic timelineFxLogic, TriggerData triggerData)
+        protected override void ProTimelineFxLogicInit(string groupName, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
         {
-          
         }
 
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity, ITimelineFxLogic timelineFxLogic,
+        protected void ProDefaultTimeLineTrigger_ZD(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                effectValue[0]);
-            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,wuXingType,
+                effectValue[1]);
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,
                 HarmType.Default);
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-            if (odds <= effectValue[1])
+            if (odds <= effectValue[2])
             {
                 BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
+
+            if (SelfSkillConfig.level >= 5) //每个烈焰剑将会对敌人照成爆燃，爆燃额外受到100%伤害
+            {
+                long v2 = CombatCalculateTool.Instance.GetVlaueRatioForLong(
+                    CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                    effectValue[3]);
+                CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v2, AttType.Skill, triggerData,
+                    wuXingType,
+                    HarmType.Default);
+            }
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>(1);
+                currTarget.Add(combatHeroHitPoint);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + zdPosIndex[i]);
+                ActivationTimeLineData("lieyanjian_zd", currTarget: currTarget,
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+            }
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/S2002.cs

@@ -0,0 +1,79 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 飞出{0}道巨龙，对敌人照成{1}火系伤害
+    /// 如果敌人处于灼痛中对敌人照成胆摄，眩晕敌人2秒
+    /// 飞龙数量+1，并对敌人施加1层灼烧
+    ///飞龙命中目标后引发天雷，对敌人额外照成100%伤害
+    /// </summary>
+    public class S2002 : SkillBasic
+    {
+        private static int[] zdPosIndex = new int[] { 9, 8, 7, 6, 5, 4, 3, 2, 1 };
+
+        protected override void ProUseSkill()
+        {
+            this.AddTriggerCallBack("lieyanjian_zd", ProDefaultTimeLineTrigger_ZD);
+            ActivationTimeLineData("lieyanjian");
+        }
+
+        protected override void ProTimelineFxLogicInit(string groupName, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+        }
+
+        protected void ProDefaultTimeLineTrigger_ZD(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                effectValue[1]);
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,
+                HarmType.Default);
+
+            b_1010 b1010 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1010>();
+            if (b1010 != null)
+            {
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10061, 1);//眩晕敌人
+                targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+            }
+            //
+            //     BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1);
+            //     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+            //
+            //
+            // if (SelfSkillConfig.level >= 5) //每个烈焰剑将会对敌人照成爆燃，爆燃额外受到100%伤害
+            // {
+            //     long v2 = CombatCalculateTool.Instance.GetVlaueRatioForLong(
+            //         CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+            //         effectValue[3]);
+            //     CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v2, AttType.Skill, triggerData,
+            //         wuXingType,
+            //         HarmType.Default);
+            // }
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>(1);
+                currTarget.Add(combatHeroHitPoint);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + zdPosIndex[i]);
+                ActivationTimeLineData("lieyanjian_zd", currTarget: currTarget,
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+            }
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/S2002.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6093026e7ccf43bfa505fd158d91f819
+timeCreated: 1747017577

Assets/Scripts/GameLogic/Combat/Skill/S501001.cs

@@ -5,6 +5,8 @@ namespace GameLogic.Combat.Skill
 {
     /// <summary>
     /// 法宝秘籍：后方槽位第一个技能在击中目前时为法宝提供0.1%充能
+    ///
+    /// 法宝可以瞬间释放，切不在进入对拼状态
     /// </summary>
     public class S501001 : SkillBasic
     {
@@ -34,7 +36,7 @@ namespace GameLogic.Combat.Skill
                     return;
                 }
 
-                if (skillBasic.index - 1 == index)
+                if (skillBasic.index + 1 == index)
                 {
                     CombatHeroEntity.heroMagicWeaponControl.ReduceMagicCd(SelfSkillConfig.effectValue[0]);
                 }

Assets/Scripts/GameLogic/Combat/Skill/S501101.cs

@@ -4,7 +4,8 @@ using GameLogic.Combat.Hero;
 namespace GameLogic.Combat.Skill
 {
     /// <summary>
-    /// 双生面具 前后方法宝如果相生则双发效果增强（10%），（具体效果值取决于技能）
+    /// 两仪决 前后方法宝如果相生则双发效果增强（10%），（具体效果值取决于技能）
+    /// 不相生的功法也会有效果，效果减少50%，相克的功法效果减少70%
     /// </summary>
     public class S501101 : SkillBasic
     {
@@ -16,7 +17,7 @@ namespace GameLogic.Combat.Skill
         {
             if (index <= 0)
             {
-                return; 
+                return;
             }
 
             SkillBasic a = CombatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>()
@@ -34,6 +35,21 @@ namespace GameLogic.Combat.Skill
                 a.IntensifyingEffect(SelfSkillConfig.effectValue[0]);
                 b.IntensifyingEffect(SelfSkillConfig.effectValue[0]);
             }
+            else if (SelfSkillConfig.level >= 5)
+            {
+                float v = SelfSkillConfig.effectValue[0];
+                bool IsRestrain = CombatCalculateTool.Instance.IsRestrain(a.wuXingType, b.wuXingType);
+                if (IsRestrain)
+                {
+                    v *= 0.5f;
+                }
+                else
+                {
+                    v *= 0.7f;
+                }
+                a.IntensifyingEffect(v);
+                b.IntensifyingEffect(v);
+            }
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/S501201.cs

@@ -2,11 +2,13 @@
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Player;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 
 namespace GameLogic.Combat.Skill
 {
     /// <summary>
-    /// 火灵丹 每层经过火经脉时使火系功法伤害提升1%，最多叠加20层
+    /// 火焰决 每层经过火经脉时使火系功法伤害提升1%，最多叠加20层
+    /// 跌到满层后火系功法对敌人照成的伤害都会让敌人灼烧1层
     /// </summary>
     public class S501201 : SkillBasic
     {
@@ -23,6 +25,8 @@ namespace GameLogic.Combat.Skill
         {
             _currAddCount = 0;
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.StartInjured, StartInjured);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
+            
         }
 
         protected override void ProActiveSkill()
@@ -37,19 +41,21 @@ namespace GameLogic.Combat.Skill
             // }
 
             CombatEventManager.Instance.AddEventListener(CombatEventType.StartInjured, StartInjured);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
         }
 
-        protected override void ProCombatUpdate(float time)
+     
+
+        private void TriggerSkillSlots(IEventData iEventData)
         {
-            // float jd = angle % 360;
-            // if (angle >= lastJingGuo)
-            // {
-            //     lastJingGuo += 360;
-            //     if (_currAddCount < SelfSkillConfig.effectValue[1])
-            //     {
-            //         _currAddCount++;
-            //     }
-            // }
+            TriggerSkillSlotsEventData triggerSkillSlotsEventData = iEventData as TriggerSkillSlotsEventData;
+            if (triggerSkillSlotsEventData.SkillBasic == this)
+            {
+                if (triggerSkillSlotsEventData.triggerType == 3)//触发到火的位置
+                {
+                    _currAddCount++;
+                }
+            }
         }
 
         private void StartInjured(IEventData iEventData)

Assets/Scripts/GameLogic/Combat/Skill/S501301.cs

@@ -4,7 +4,8 @@ using Fort23.Core;
 namespace GameLogic.Combat.Skill
 {
     /// <summary>
-    /// 巨大化 后方槽位第一个技能体型巨大化，且在对碰中受到伤害减少20%
+    /// 乾坤巨灵诀 后方槽位第一个技能体型巨大化，且在对碰中受到伤害减少20%
+    /// 受影响的功法被碰撞摧毁时不在消失，并且恢复30%以损失的强度
     /// </summary>
     public class S501301 : SkillBasic
     {
@@ -15,11 +16,34 @@ namespace GameLogic.Combat.Skill
         protected override void ProReplace()
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.TimelineFxLogicInit, TimelineFxLogicInit);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.GongFaPengZhuangFinish,
+                GongFaPengZhuangFinish);
         }
 
         protected override void ProActiveSkill()
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.TimelineFxLogicInit, TimelineFxLogicInit);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.GongFaPengZhuangFinish,
+                GongFaPengZhuangFinish);
+        }
+
+        private void GongFaPengZhuangFinish(IEventData iEventData)
+        {
+            GongFaPengZhuangFinishEventData gongFaPengZhuangFinishEventData =
+                iEventData as GongFaPengZhuangFinishEventData;
+            if (gongFaPengZhuangFinishEventData.a.SkillBasic.CombatHeroEntity == CombatHeroEntity &&
+                gongFaPengZhuangFinishEventData.a.hp <= 0 &&
+                gongFaPengZhuangFinishEventData.a.SkillBasic.index + 1 == index)
+            {
+                gongFaPengZhuangFinishEventData.a.hp = (long)(gongFaPengZhuangFinishEventData.a.maxHp * 0.3f);
+            }
+
+            if (gongFaPengZhuangFinishEventData.b.SkillBasic.CombatHeroEntity == CombatHeroEntity &&
+                gongFaPengZhuangFinishEventData.b.hp <= 0 &&
+                gongFaPengZhuangFinishEventData.b.SkillBasic.index + 1 == index)
+            {
+                gongFaPengZhuangFinishEventData.b.hp = (long)(gongFaPengZhuangFinishEventData.b.maxHp * 0.3f);
+            }
         }
 
         private void TimelineFxLogicInit(IEventData iEventData)
@@ -29,6 +53,7 @@ namespace GameLogic.Combat.Skill
                 timelineFxLogicInitEventData.SkillBasic.index + 1 == index)
             {
                 timelineFxLogicInitEventData.timelineFxLogic.size *= 2;
+
                 // timelineFxLogicInitEventData.timelineFxLogic.SkillFeaturesData.
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S501401.cs

@@ -1,11 +1,13 @@
 using Common.Utility.CombatEvent;
 using Fort23.Core;
+using GameLogic.Combat.CombatTool;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 
 namespace GameLogic.Combat.Skill
 {
     /// <summary>
-    /// 极速齿轮 后槽位技能在催动时获得转盘加速10%,持续2秒
+    /// 天风迅灵 后槽位技能在催动时获得转盘加速10%,持续2秒
+    /// 加速期间伤害提升10%
     /// </summary>
     public class S501401 : SkillBasic
     {
@@ -20,11 +22,13 @@ namespace GameLogic.Combat.Skill
         protected override void ProReplace()
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.StartInjured, StartInjured);
             Finish();
         }
 
         protected override void ProActiveSkill()
         {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.StartInjured, StartInjured);
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
         }
 
@@ -48,11 +52,28 @@ namespace GameLogic.Combat.Skill
             _isUpdate = false;
         }
 
+        private void StartInjured(IEventData iEventData)
+        {
+            if (SelfSkillConfig.level < 5||!_isUpdate)
+            {
+                return;
+            }
+
+            StartInjuredEventData heroInjuredEventData = iEventData as StartInjuredEventData;
+            HarmReturnInfo harmReturnInfo = heroInjuredEventData.HarmReturnInfo;
+            if (harmReturnInfo.source == CombatHeroEntity)
+            {
+                harmReturnInfo.att +=
+                    CombatCalculateTool.Instance.GetVlaueRatioForLong(harmReturnInfo.att,
+                        SelfSkillConfig.effectValue[2]);
+            }
+        }
+
         private void AddUseGongFa(IEventData iEventData)
         {
             AddUseGongFaEventData addUseGongFaEventData = iEventData as AddUseGongFaEventData;
             if (addUseGongFaEventData.SkillBasic.CombatHeroEntity == CombatHeroEntity &&
-                addUseGongFaEventData.SkillBasic.index - 1 == index)
+                addUseGongFaEventData.SkillBasic.index + 1 == index)
             {
                 _addTime = 0;
                 _isUpdate = true;

Assets/Scripts/GameLogic/Combat/Skill/S501501.cs

@@ -6,7 +6,7 @@ using GameLogic.Player;
 namespace GameLogic.Combat.Skill
 {
     /// <summary>
-    /// 前方功法照成伤害时有5%概率施加一层对应属性的伤势
+    /// 崩脉决 前方功法照成伤害时有5%概率施加一层对应属性的伤势
     /// </summary>
     public class S501501 : SkillBasic
     {

Assets/Scripts/GameLogic/Combat/Skill/S501601.cs

@@ -0,0 +1,52 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 天衍星辰诀  引星辰之力入体，增强玩家体魄，让后方槽位的功法无视护盾
+    /// </summary>
+    public class S501601 : SkillBasic
+    {
+        protected override void ProUseSkill()
+        {
+        }
+
+        protected override void ProReplace()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.StartInjured, StartInjured);
+        }
+
+        protected override void ProActiveSkill()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.StartInjured, StartInjured);
+        }
+
+        private void StartInjured(IEventData iEventData)
+        {
+            StartInjuredEventData heroInjuredEventData = iEventData as StartInjuredEventData;
+            HarmReturnInfo harmReturnInfo = heroInjuredEventData.HarmReturnInfo;
+            if (harmReturnInfo.source == CombatHeroEntity)
+            {
+                SkillBasic skillBasic = harmReturnInfo.triggerData.Source as SkillBasic;
+                IBarrier barrier = harmReturnInfo.triggerData.IBarrier as IBarrier;
+                if (barrier == null)
+                {
+                    return;
+                }
+
+                if (skillBasic != null)
+                {
+                    int index = skillBasic.index;
+                    if (index + 1 == this.index)
+                    {
+                        harmReturnInfo.isInvalid = true;
+                        barrier.BarrierTriggerData.isPenetrate = true;
+                    }
+                }
+            }
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/S501601.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 891c12fe2bd24eb1a303f4b2bc23d9f8
+timeCreated: 1747019235

Assets/Scripts/GameLogic/Combat/Skill/S501701.cs

@@ -0,0 +1,52 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 太虚剑意 后方槽位如果是剑功法，在释放功法时额外释放一道剑气，对敌人照成100%伤害，并无视护盾类效果
+    /// </summary>
+    public class S501701 : SkillBasic
+    {
+        protected override void ProUseSkill()
+        {
+        }
+
+        protected override void ProReplace()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkill, UseSkill);
+        }
+
+        protected override void ProActiveSkill()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, UseSkill);
+        }
+
+        private void UseSkill(IEventData iEventData)
+        {
+            // StartInjuredEventData heroInjuredEventData = iEventData as StartInjuredEventData;
+            // HarmReturnInfo harmReturnInfo = heroInjuredEventData.HarmReturnInfo;
+            // if (harmReturnInfo.source == CombatHeroEntity)
+            // {
+            //     SkillBasic skillBasic = harmReturnInfo.triggerData.Source as SkillBasic;
+            //     IBarrier barrier = harmReturnInfo.triggerData.IBarrier as IBarrier;
+            //     if (barrier == null)
+            //     {
+            //         return;
+            //     }
+            //
+            //     if (skillBasic != null)
+            //     {
+            //         int index = skillBasic.index;
+            //         if (index + 1 == this.index)
+            //         {
+            //             harmReturnInfo.isInvalid = true;
+            //             barrier.BarrierTriggerData.isPenetrate = true;
+            //         }
+            //     }
+            // }
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/S501701.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 98f7cd05d8b543a480fed42f6380cd78
+timeCreated: 1747040591

Assets/Scripts/GameLogic/Combat/Skill/S89012.cs

@@ -75,13 +75,14 @@ namespace GameLogic.Combat.Skill
         }
 
         public ShowBaiscEntity Own { get; set; }
+        public BarrierTriggerData BarrierTriggerData { get; set; }
 
         public bool CollideTriiger(ITriggerEntity triggerEntity)
         {
             return !isTrgger || shel <= 0;
         }
 
-        public void Harm(HarmReturnInfo harmReturnInfo)
+        public long Harm(HarmReturnInfo harmReturnInfo)
         {
             shel -= harmReturnInfo.att;
             if (shel <= 0)
@@ -89,6 +90,8 @@ namespace GameLogic.Combat.Skill
                 _timeLineEventLogicGroupBasic?.CloseLoopFx();
                 _timeLineEventLogicGroupBasic = null;
             }
+
+            return 0;
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -276,6 +276,7 @@ namespace GameLogic.Combat.Skill
             SkillFeaturesData.isEnemy = combatHeroEntity.IsEnemy;
 
             SkillFeaturesData.WuXingType = wuXingType;
+            SkillFeaturesData.SkillBasic = this;
             SkillFeaturesData.hp = skillInfo.qiangDu;
 
             UseCount = SelfSkillConfig.SkillType * 100000;

Assets/Scripts/GameLogic/Combat/Skill/SkillFeaturesData.cs

@@ -1,4 +1,5 @@
 using System;
+using Common.Combat.FxAILogic;
 using Fort23.Core;
 using GameLogic.Player;
 
@@ -16,17 +17,17 @@ namespace GameLogic.Combat.Skill
         public long maxHp;
         
         public bool isEnemy;
-
-
+        
         public WuXingType WuXingType;
-
-      
+        
+        public SkillBasic SkillBasic;
+        public FxAILogicBasic FxAILogicBasic;
 
         public SkillFeaturesData CapyFeaturesData()
         {
             SkillFeaturesData skillFeaturesData = CObjectPool.Instance.Fetch<SkillFeaturesData>();
             skillFeaturesData.hp = hp;
-
+            skillFeaturesData.SkillBasic=SkillBasic;
             skillFeaturesData.isEnemy = isEnemy;
             skillFeaturesData.WuXingType = WuXingType;
             return skillFeaturesData;
@@ -38,6 +39,8 @@ namespace GameLogic.Combat.Skill
 
         public override void DormancyObj()
         {
+            SkillBasic = null;
+            FxAILogicBasic = null;
         }
     }
 }

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs

@@ -5,6 +5,7 @@ using Fort23.Common;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
 using GameLogic.Combat.Skill;
 
 #if !COMBAT_SERVER
@@ -27,11 +28,18 @@ namespace Common.Combat.FxAILogic
         [Header("碰撞时的特效")] public string hitFxName;
         [Header("碰撞音效")] public string hitAudioName;
 
+        public BarrierTriggerData BarrierTriggerData;
+
         /// <summary>
         /// 额外移动速度 <0 减速 >0加速
         /// </summary>
         [HideInInspector] public float extraMoveSpeed;
 
+        /// <summary>
+        /// 不能移动
+        /// </summary>
+        public bool isNotMove;
+
         public ILifetCycleHitPoint AttTarget
         {
             get { return _attTarget; }
@@ -98,6 +106,7 @@ namespace Common.Combat.FxAILogic
                 return;
             }
 
+            isNotMove = false;
             extraMoveSpeed = 0;
             size = 1;
             _currAllDelayTime = delayTime + timeLineEventParticleLogicBasic.indexCount * multipleTargetDelayTime;
@@ -118,6 +127,7 @@ namespace Common.Combat.FxAILogic
                     triggerData);
                 SkillBasic skillBasic = trigger as SkillBasic;
                 SkillFeaturesData = skillBasic.GetSkillFeaturesData();
+                SkillFeaturesData.FxAILogicBasic = this;
             }
 
 

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -244,10 +244,15 @@ namespace Common.Combat.FxAILogic
                 return;
             }
 
+
             bool isOk = barrierEntityMono.Barrier.CollideTriiger(this);
+
             if (!isOk) //被主档
             {
+                BarrierTriggerData.isPenetrate = false;
+                barrierEntityMono.Barrier.BarrierTriggerData = BarrierTriggerData;
                 triggerData.IBarrier = barrierEntityMono.Barrier;
+
                 ITimeLineTriggerEvent timeLineTriggerEvent =
                     TimeLineEventParticleLogicBasic.ITimeLineTriggerEntity as ITimeLineTriggerEvent;
                 if (timeLineTriggerEvent != null)
@@ -255,17 +260,19 @@ namespace Common.Combat.FxAILogic
                     timeLineTriggerEvent.TimeLineTrigger(
                         TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
                         target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData);
-
-                    if (!string.IsNullOrEmpty(hitFxName))
+                    if (!BarrierTriggerData.isPenetrate)
                     {
-                        FinishHit(collision.ClosestPoint(gameObject.transform.position), hitFxName);
-                    }
+                        if (!string.IsNullOrEmpty(hitFxName))
+                        {
+                            FinishHit(collision.ClosestPoint(gameObject.transform.position), hitFxName);
+                        }
 
-                    AudioManager.Instance.PlayAudio(hitAudioName, false);
+                        AudioManager.Instance.PlayAudio(hitAudioName, false);
 
-                    if (!isPenetrate)
-                    {
-                        Dispose();
+                        if (!isPenetrate)
+                        {
+                            Dispose();
+                        }
                     }
                 }
             }
@@ -321,19 +328,21 @@ namespace Common.Combat.FxAILogic
 
         protected override void ProCombatUpdate(float time)
         {
-            switch (parabolaCurveType)
+            if (!isNotMove)
             {
-                case CurveType.Beeline:
-                    Beeline(time);
-                    break;
-                case CurveType.DynamicCurve:
-                    DynamicCurve(time);
-                    break;
-                case CurveType.CustomizeCurve:
-                    CustomizeCurve(time);
-                    break;
+                switch (parabolaCurveType)
+                {
+                    case CurveType.Beeline:
+                        Beeline(time);
+                        break;
+                    case CurveType.DynamicCurve:
+                        DynamicCurve(time);
+                        break;
+                    case CurveType.CustomizeCurve:
+                        CustomizeCurve(time);
+                        break;
+                }
             }
-
             // if (Vector3.Distance(endPos, _currPos) < 0.5f)
             // {
             //     Dispose();

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -14,21 +14,241 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 3}
-  - {fileID: 5}
-  - {fileID: 7}
-  - {fileID: 9}
+  - {fileID: 8}
+  - {fileID: 10}
+  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2544
-    height: 1283
-  m_MinSize: {x: 400, y: 50}
-  m_MaxSize: {x: 32384, y: 8096}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 100}
+  m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 10531
+  controlID: -1
   draggingID: 0
 --- !u!114 &2
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1292
+    height: 1032
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 569, y: 1011}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 0b000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -284.5
+    m_HBaseRangeMax: 284.5
+    m_VBaseRangeMin: -505.5
+    m_VBaseRangeMax: 505.5
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 0
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 1292
+      height: 1011
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 646, y: 505.5}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -646
+      y: -505.5
+      width: 1292
+      height: 1011
+    m_MinimalGUI: 1
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 1292, y: 1032}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000001000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 4}
+  - {fileID: 6}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1293
+    height: 1299
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: -1
+  draggingID: 0
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1293
+    height: 1053
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 2}
+  m_Panes:
+  - {fileID: 2}
+  - {fileID: 5}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !u!114 &5
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1292
+    height: 663
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_Preferences:
+    editType: 0
+    timeReferenceMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_SequenceHierarchy: {fileID: 0}
+  m_SequencePath:
+    m_SelectionRoot: 0
+    m_SubElements: []
+--- !u!114 &6
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 1053
+    width: 1293
+    height: 246
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 7}
+  m_Panes:
+  - {fileID: 7}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -48,10 +268,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -2552
-    y: 81
-    width: 1200
-    height: 1262
+    x: 0
+    y: 1126
+    width: 1292
+    height: 225
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -66,7 +286,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -164, y: -26}
+      snapOffset: {x: -169, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -106,7 +326,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -144,9 +364,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
+      snapOffset: {x: 67.5, y: -123}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 2
       id: Orientation
       index: 0
       layout: 4
@@ -158,7 +378,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -184,7 +404,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -197,7 +417,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -249,7 +469,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -262,7 +482,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -275,7 +495,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -287,8 +507,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffset: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
       index: 8
@@ -399,20 +619,33 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: UnityEditor.SceneViewCameraOverlay
+      index: 12
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
   m_Gizmos: 1
-  m_OverrideSceneCullingMask: 0
-  m_SceneIsLit: 0
+  m_OverrideSceneCullingMask: 6917529027641081856
+  m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 166.69078, y: 927.2751, z: -3.57187}
+    m_Target: {x: -27.319029, y: 150.55057, z: 34.94878}
     speed: 2
-    m_Value: {x: 163.48517, y: 929.2294, z: -3.7405863}
+    m_Value: {x: -27.319029, y: 150.55057, z: 34.94878}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -423,7 +656,7 @@ MonoBehaviour:
   m_SceneViewState:
     m_AlwaysRefresh: 0
     showFog: 1
-    showSkybox: 0
+    showSkybox: 1
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -440,17 +673,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -458,17 +691,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: 0.73881626, y: 0.008303762, z: -0.0090856645, w: 0.6739128}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.73881626, y: -0.008303762, z: 0.0090856645, w: -0.6739128}
   m_Size:
-    m_Target: 358.05344
+    m_Target: 121.540215
     speed: 2
-    m_Value: 374.92505
+    m_Value: 121.540215
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -477,146 +710,21 @@ MonoBehaviour:
     m_EasingEnabled: 1
     m_EasingDuration: 0.4
     m_AccelerationEnabled: 1
-    m_FieldOfViewHorizontalOrVertical: 60
+    m_FieldOfViewHorizontalOrVertical: 36
     m_NearClip: 0.03
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: 0.012349642, y: -0.9849505, z: 0.15370718, w: 0.079066426}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &3
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1201
-    height: 1283
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 2}
-  m_Panes:
-  - {fileID: 4}
-  - {fileID: 2}
-  m_Selected: 1
-  m_LastSelected: 0
---- !u!114 &4
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -2552
-    y: 81
-    width: 1200
-    height: 1262
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1624}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -375
-    m_HBaseRangeMax: 375
-    m_VBaseRangeMin: -812
-    m_VBaseRangeMax: 812
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 1200
-      height: 1241
-    m_Scale: {x: 0.76416254, y: 0.76416254}
-    m_Translation: {x: 600, y: 620.5}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -785.1733
-      y: -812
-      width: 1570.3466
-      height: 1624
-    m_MinimalGUI: 1
-  m_defaultScale: 0.76416254
-  m_LastWindowPixelSize: {x: 1200, y: 1262}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000001000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
---- !u!114 &5
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -631,18 +739,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1201
+    x: 1293
     y: 0
-    width: 287
-    height: 1283
+    width: 458
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 6}
+  m_ActualView: {fileID: 9}
   m_Panes:
-  - {fileID: 6}
+  - {fileID: 9}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &6
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -662,10 +770,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1351
-    y: 81
-    width: 285
-    height: 1262
+    x: 1293
+    y: 73
+    width: 456
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -679,9 +787,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 8a78ffff
-      m_LastClickedID: -34678
-      m_ExpandedIDs: ec99ffff38a5ffffceb7ffffd8e7ffffece7ffff4ac3000050c3000066c30000a6c30000cac30000dcc30000
+      m_SelectedIDs: a650ffff
+      m_LastClickedID: -44890
+      m_ExpandedIDs: b05bffffb45bffffbe5bffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -697,7 +805,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 5}
+        m_ClientGUIView: {fileID: 8}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -705,7 +813,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &7
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -720,18 +828,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1488
+    x: 1751
     y: 0
-    width: 613
-    height: 1283
+    width: 538
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 8}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 8}
+  - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -751,10 +859,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1064
-    y: 81
-    width: 611
-    height: 1262
+    x: 1751
+    y: 73
+    width: 536
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -776,7 +884,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/UIAssets/decorate
+    - Assets/Scripts/GameLogic/Combat/CombatType
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -784,16 +892,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/UIAssets/decorate
+  - Assets/Scripts/GameLogic/Combat/CombatType
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\FB\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 5acf0000
-    m_LastClickedID: 53082
-    m_ExpandedIDs: 000000006abc00006cbc00006ebc000070bc000072bc0000debe00005ccf000000ca9a3b
+    scrollPos: {x: 0, y: 806}
+    m_SelectedIDs: 36d20000
+    m_LastClickedID: 53814
+    m_ExpandedIDs: 00000000dccb0000decb0000e0cb0000e2cb0000e4cb0000e6cb0000e8cb0000eacb0000eccb0000eecb0000f0cb0000f2cb0000f4cb0000f6cb0000f8cb0000facb0000fccb0000fecb000000cc000002cc000004cc000006cc000008cc00000acc00000ccc00000ecc00005ecf000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -809,7 +917,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 10}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -821,7 +929,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000006abc00006cbc00006ebc000070bc000072bc000000ca9a3b
+    m_ExpandedIDs: 00000000dccb0000decb0000e0cb0000e2cb0000e4cb0000e6cb0000e8cb0000eacb0000eccb0000eecb0000f0cb0000f2cb0000f4cb0000f6cb0000f8cb0000facb0000fccb0000fecb000000cc000002cc000004cc000006cc000008cc00000acc00000ccc00000ecc000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -846,10 +954,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 8a78ffff
-    m_LastClickedInstanceID: -34678
+    m_SelectedInstanceIDs: a650ffff
+    m_LastClickedInstanceID: -44890
     m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: 
+    m_ExpandedInstanceIDs: 66bd0200ee820000000000004ac800000c000100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -865,7 +973,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 7}
+      m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -876,8 +984,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 351
---- !u!114 &9
+  m_DirectoriesAreaWidth: 151
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -892,18 +1000,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2101
+    x: 2289
     y: 0
-    width: 443
-    height: 1283
+    width: 271
+    height: 1299
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 10}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 10}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -923,13 +1031,13 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -451
-    y: 81
-    width: 442
-    height: 1262
+    x: 2289
+    y: 73
+    width: 270
+    height: 1278
   m_SerializedDataModeController:
-    m_DataMode: 1
-    m_PreferredDataMode: 1
+    m_DataMode: 3
+    m_PreferredDataMode: 3
     m_SupportedDataModes: 010000000200000003000000
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}
@@ -940,7 +1048,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 266
+    m_CachedPref: 186
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1

UserSettings/Layouts/default-2022.dwlt

@@ -15,12 +15,12 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 36.57143
-    width: 2194.286
-    height: 1156.5715
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
-  m_RootView: {fileID: 6}
+  m_Title: Project
+  m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
@@ -32,24 +32,26 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
   m_EditorClassIdentifier: 
-  m_Children: []
+  m_Children:
+  - {fileID: 3}
+  - {fileID: 5}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
-    x: 582.2857
+    x: 0
     y: 0
-    width: 523.4285
-    height: 1106.5715
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 16}
-  m_Panes:
-  - {fileID: 16}
-  m_Selected: 0
-  m_LastSelected: 0
+    width: 2560
+    height: 1349
+  m_MinSize: {x: 875, y: 300}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_UseTopView: 1
+  m_TopViewHeight: 30
+  m_UseBottomView: 1
+  m_BottomViewHeight: 20
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -58,24 +60,20 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneHierarchyWindow
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1105.7142
+    x: 0
     y: 0
-    width: 257.71436
-    height: 1106.5715
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 12}
-  m_Panes:
-  - {fileID: 12}
-  m_Selected: 0
-  m_LastSelected: 0
+    width: 2560
+    height: 30
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
+  m_LastLoadedLayoutName: 
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -84,25 +82,19 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 11}
-  - {fileID: 2}
-  - {fileID: 3}
+  m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 0
-    width: 1363.4286
-    height: 1106.5715
-  m_MinSize: {x: 300, y: 50}
-  m_MaxSize: {x: 24288, y: 8096}
-  vertical: 0
-  controlID: 56789
-  draggingID: 0
+    y: 1329
+    width: 2560
+    height: 20
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -111,24 +103,26 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
   m_EditorClassIdentifier: 
-  m_Children: []
+  m_Children:
+  - {fileID: 6}
+  - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
-    x: 1363.4286
-    y: 0
-    width: 466.28564
-    height: 1106.5715
-  m_MinSize: {x: 277, y: 71}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 13}
-  m_Panes:
-  - {fileID: 13}
-  m_Selected: 0
-  m_LastSelected: 0
+    x: 0
+    y: 30
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 100}
+  m_MaxSize: {x: 32384, y: 16192}
+  vertical: 0
+  controlID: 2926
+  draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -137,26 +131,24 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 7}
   - {fileID: 8}
-  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2194.286
-    height: 1156.5715
-  m_MinSize: {x: 875, y: 300}
-  m_MaxSize: {x: 10000, y: 10000}
-  m_UseTopView: 1
-  m_TopViewHeight: 30
-  m_UseBottomView: 1
-  m_BottomViewHeight: 20
+    width: 1293
+    height: 1299
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 2863
+  draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -166,19 +158,24 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2194.286
-    height: 30
-  m_MinSize: {x: 0, y: 0}
-  m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: 
+    width: 1293
+    height: 1053
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 12}
+  m_Panes:
+  - {fileID: 12}
+  - {fileID: 13}
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -187,25 +184,24 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 4}
-  - {fileID: 5}
-  - {fileID: 10}
+  m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 30
-    width: 2194.286
-    height: 1106.5715
-  m_MinSize: {x: 500, y: 50}
-  m_MaxSize: {x: 40480, y: 8096}
-  vertical: 0
-  controlID: 56788
-  draggingID: 0
+    y: 1053
+    width: 1293
+    height: 246
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 14}
+  m_Panes:
+  - {fileID: 14}
+  m_Selected: 0
+  m_LastSelected: 0
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -215,18 +211,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
-    y: 1136.5715
-    width: 2194.286
-    height: 20
-  m_MinSize: {x: 0, y: 0}
-  m_MaxSize: {x: 0, y: 0}
+    x: 1293
+    y: 0
+    width: 458
+    height: 1299
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 15}
+  m_Panes:
+  - {fileID: 15}
+  m_Selected: 0
+  m_LastSelected: 0
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -242,15 +243,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1829.7142
+    x: 1751
     y: 0
-    width: 364.57166
-    height: 1106.5715
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 14}
+    width: 538
+    height: 1299
+  m_MinSize: {x: 232, y: 271}
+  m_MaxSize: {x: 10002, y: 10021}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &11
@@ -263,279 +264,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 2289
     y: 0
-    width: 582.2857
-    height: 1106.5715
-  m_MinSize: {x: 201, y: 221}
+    width: 271
+    height: 1299
+  m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &12
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Hierarchy
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 1105.7144
-    y: 66.85715
-    width: 255.71436
-    height: 1085.5715
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SceneHierarchy:
-    m_TreeViewState:
-      scrollPos: {x: 0, y: 183.42847}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 5ae9f8ff4c09f9ff0079fbff7ef0fcffd806fdff7660fdff6ebbfeff2e1fffffe0beffffaedfffff8ce8ffff9ef6ffffa6f6ffffbcf6ffff3af8ffff3ef8ffff38f9ffff7efaffff7cb4000030b60000
-      m_RenameOverlay:
-        m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
-        m_EditFieldRect:
-          serializedVersion: 2
-          x: 0
-          y: 0
-          width: 0
-          height: 0
-        m_UserData: 0
-        m_IsWaitingForDelay: 0
-        m_IsRenaming: 0
-        m_OriginalEventType: 11
-        m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 3}
-      m_SearchString: 
-    m_ExpandedScenes: []
-    m_CurrenRootInstanceID: 0
-    m_LockTracker:
-      m_IsLocked: 0
-    m_CurrentSortingName: TransformSorting
-  m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &13
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Inspector
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 1363.4286
-    y: 66.85715
-    width: 464.28564
-    height: 1085.5715
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_ObjectsLockedBeforeSerialization: []
-  m_InstanceIDsLockedBeforeSerialization: 
-  m_PreviewResizer:
-    m_CachedPref: 266
-    m_ControlHash: -371814159
-    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
-  m_GlobalObjectId: 
-  m_InspectorMode: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_PreviewWindow: {fileID: 0}
---- !u!114 &14
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 230, y: 250}
-  m_MaxSize: {x: 10000, y: 10000}
-  m_TitleContent:
-    m_Text: Project
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 1829.7144
-    y: 66.85715
-    width: 363.57166
-    height: 1085.5715
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SearchFilter:
-    m_NameFilter: 
-    m_ClassNames: []
-    m_AssetLabels: []
-    m_AssetBundleNames: []
-    m_ReferencingInstanceIDs: 
-    m_SceneHandles: 
-    m_ShowAllHits: 0
-    m_SkipHidden: 0
-    m_SearchArea: 1
-    m_Folders:
-    - Assets/Art/ArtHero
-    m_Globs: []
-    m_OriginalText: 
-    m_ImportLogFlags: 0
-    m_FilterByTypeIntersection: 0
-  m_ViewMode: 1
-  m_StartGridSize: 16
-  m_LastFolders:
-  - Assets/Art/ArtHero
-  m_LastFoldersGridSize: 16
-  m_LastProjectPath: H:\XY002\XiuXianGame
-  m_LockTracker:
-    m_IsLocked: 0
-  m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 6a040100
-    m_LastClickedID: 66666
-    m_ExpandedIDs: 00000000026400005a0401005c0401005e04010060040100620401006404010066040100680401006a0401006c0401006e04010070040100720401007404010076040100780401007a0401007c0401007e0401008004010000ca9a3b
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 10}
-    m_SearchString: 
-    m_CreateAssetUtility:
-      m_EndAction: {fileID: 0}
-      m_InstanceID: 0
-      m_Path: 
-      m_Icon: {fileID: 0}
-      m_ResourceFile: 
-  m_AssetTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 
-    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000026400005a0401005c0401005e04010060040100620401006404010066040100680401006a0401006c0401006e04010070040100720401007404010076040100780401007a0401007c0401007e04010080040100
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
-    m_CreateAssetUtility:
-      m_EndAction: {fileID: 0}
-      m_InstanceID: 0
-      m_Path: 
-      m_Icon: {fileID: 0}
-      m_ResourceFile: 
-  m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 66bd0200ee82000000000000d0090100a40c0100860c0100a80c0100a60c010006c50000c6070100ec050100d6060100d605010086dd02001e600300
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 10}
-    m_CreateAssetUtility:
-      m_EndAction: {fileID: 0}
-      m_InstanceID: 0
-      m_Path: 
-      m_Icon: {fileID: 0}
-      m_ResourceFile: 
-    m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 16
-  m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 188.52382
---- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -551,14 +296,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Game
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 66.85715
-    width: 581.2857
-    height: 1085.5715
+    y: 73
+    width: 1292
+    height: 1032
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -575,7 +320,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1624}
+  m_TargetSize: {x: 569, y: 1011}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -584,16 +329,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 0b000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -214.28572
-    m_HBaseRangeMax: 214.28572
-    m_VBaseRangeMin: -464.00003
-    m_VBaseRangeMax: 464.00003
+    m_HBaseRangeMin: -284.5
+    m_HBaseRangeMax: 284.5
+    m_VBaseRangeMin: -505.5
+    m_VBaseRangeMax: 505.5
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -611,29 +356,72 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 581.2857
-      height: 1064.5715
+      width: 1292
+      height: 1011
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 290.64285, y: 532.28577}
+    m_Translation: {x: 646, y: 505.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -290.64285
-      y: -532.28577
-      width: 581.2857
-      height: 1064.5715
+      x: -646
+      y: -505.5
+      width: 1292
+      height: 1011
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1017.25, y: 1899.7502}
+  m_LastWindowPixelSize: {x: 1292, y: 1032}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &16
+--- !u!114 &13
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1292
+    height: 663
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_Preferences:
+    editType: 0
+    timeReferenceMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_SequenceHierarchy: {fileID: 0}
+  m_SequencePath:
+    m_SelectionRoot: 0
+    m_SubElements: []
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -649,14 +437,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 582.28577
-    y: 66.85715
-    width: 521.4285
-    height: 1085.5715
+    x: 0
+    y: 1126
+    width: 1292
+    height: 225
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -671,7 +459,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -169, y: -26.666626}
+      snapOffset: {x: -169, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -697,7 +485,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 25.142857}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-scene-view-toolbar
@@ -749,9 +537,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -215.92859, y: -123.333374}
-      snapOffsetDelta: {x: 0, y: -0.095214844}
-      snapCorner: 3
+      snapOffset: {x: 67.5, y: -123}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 2
       id: Orientation
       index: 0
       layout: 4
@@ -887,16 +675,16 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
-    - dockPosition: 0
-      containerId: Floating
-      floating: 1
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: -231.42859, y: -393.14282}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 3
+      snapCorner: 0
       id: Scene View/Particles
-      index: 1
+      index: 8
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -974,7 +762,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Path
-      index: 8
+      index: 9
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -987,20 +775,20 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: APV Overlay
-      index: 9
+      index: 10
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
-    - dockPosition: 0
-      containerId: Floating
-      floating: 1
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: -268.57147, y: -266.2857}
+      snapOffset: {x: 48, y: 48}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 3
+      snapCorner: 0
       id: Scene View/TrailRenderer
-      index: 0
+      index: 11
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1009,17 +797,17 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 10}
+      snapOffset: {x: 48, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: UnityEditor.SceneViewCameraOverlay
-      index: 10
+      index: 12
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
-  m_Gizmos: 0
+  m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
@@ -1028,9 +816,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 2.4434528, y: 19.874956, z: 1.9335173}
+    m_Target: {x: -27.319029, y: 150.55057, z: 34.94878}
     speed: 2
-    m_Value: {x: 2.4434528, y: 19.874956, z: 1.9335173}
+    m_Value: {x: -27.319029, y: 150.55057, z: 34.94878}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1039,7 +827,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -1058,9 +846,9 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -1072,17 +860,17 @@ MonoBehaviour:
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
-    m_ShowGrid: 0
+    m_ShowGrid: 1
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.34599036, y: -0.4965471, z: 0.22614327, w: 0.7634557}
+    m_Target: {x: 0.73881626, y: 0.008303762, z: -0.0090856645, w: 0.6739128}
     speed: 2
-    m_Value: {x: 0.345943, y: -0.49647915, z: 0.22611232, w: 0.7633512}
+    m_Value: {x: -0.73881626, y: -0.008303762, z: 0.0090856645, w: -0.6739128}
   m_Size:
-    m_Target: 4.95595
+    m_Target: 121.540215
     speed: 2
-    m_Value: 4.95595
+    m_Value: 121.540215
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1102,10 +890,266 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.2906279, y: -0.15244809, z: 0.046956092, w: 0.9435029}
+  m_LastSceneViewRotation: {x: 0.012349642, y: -0.9849505, z: 0.15370718, w: 0.079066426}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
+--- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 1293
+    y: 73
+    width: 456
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SceneHierarchy:
+    m_TreeViewState:
+      scrollPos: {x: 0, y: 0}
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: b05bffffb45bffffbe5bffff78faffff
+      m_RenameOverlay:
+        m_UserAcceptedRename: 0
+        m_Name: 
+        m_OriginalName: 
+        m_EditFieldRect:
+          serializedVersion: 2
+          x: 0
+          y: 0
+          width: 0
+          height: 0
+        m_UserData: 0
+        m_IsWaitingForDelay: 0
+        m_IsRenaming: 0
+        m_OriginalEventType: 11
+        m_IsRenamingFilename: 0
+        m_ClientGUIView: {fileID: 9}
+      m_SearchString: 
+    m_ExpandedScenes: []
+    m_CurrenRootInstanceID: 0
+    m_LockTracker:
+      m_IsLocked: 0
+    m_CurrentSortingName: TransformSorting
+  m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
+--- !u!114 &16
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 230, y: 250}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_TitleContent:
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 1751
+    y: 73
+    width: 536
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SearchFilter:
+    m_NameFilter: 
+    m_ClassNames: []
+    m_AssetLabels: []
+    m_AssetBundleNames: []
+    m_ReferencingInstanceIDs: 
+    m_SceneHandles: 
+    m_ShowAllHits: 0
+    m_SkipHidden: 0
+    m_SearchArea: 1
+    m_Folders:
+    - Assets/Scripts/GameLogic/Combat/CombatType
+    m_Globs: []
+    m_OriginalText: 
+    m_ImportLogFlags: 0
+    m_FilterByTypeIntersection: 0
+  m_ViewMode: 1
+  m_StartGridSize: 16
+  m_LastFolders:
+  - Assets/Scripts/GameLogic/Combat/CombatType
+  m_LastFoldersGridSize: 16
+  m_LastProjectPath: D:\unityProject\XiuXianGame
+  m_LockTracker:
+    m_IsLocked: 0
+  m_FolderTreeState:
+    scrollPos: {x: 0, y: 806}
+    m_SelectedIDs: 36d20000
+    m_LastClickedID: 53814
+    m_ExpandedIDs: 00000000dccb0000decb0000e0cb0000e2cb0000e4cb0000e6cb0000e8cb0000eacb0000eccb0000eecb0000f0cb0000f2cb0000f4cb0000f6cb0000f8cb0000facb0000fccb0000fecb000000cc000002cc000004cc000006cc000008cc00000acc00000ccc00000ecc00005ecf000000ca9a3bffffff7f
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 10}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_AssetTreeState:
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 
+    m_LastClickedID: 0
+    m_ExpandedIDs: 00000000dccb0000decb0000e0cb0000e2cb0000e4cb0000e6cb0000e8cb0000eacb0000eccb0000eecb0000f0cb0000f2cb0000f4cb0000f6cb0000f8cb0000facb0000fccb0000fecb000000cc000002cc000004cc000006cc000008cc00000acc00000ccc00000ecc000000ca9a3bffffff7f
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_ListAreaState:
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: 66bd0200ee820000000000004ac800000c000100
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 10}
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+    m_NewAssetIndexInList: -1
+    m_ScrollPosition: {x: 0, y: 0}
+    m_GridSize: 16
+  m_SkipHiddenPackages: 0
+  m_DirectoriesAreaWidth: 151
+--- !u!114 &17
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 2289
+    y: 73
+    width: 270
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ObjectsLockedBeforeSerialization: []
+  m_InstanceIDsLockedBeforeSerialization: 
+  m_PreviewResizer:
+    m_CachedPref: 186
+    m_ControlHash: -371814159
+    m_PrefName: Preview_InspectorPreview
+  m_LastInspectedObjectInstanceID: -1
+  m_LastVerticalScrollValue: 0
+  m_GlobalObjectId: 
+  m_InspectorMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_PreviewWindow: {fileID: 0}