添加功法

Assets/Art/HeroTimeLine/gf_1501_timeline.playable

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-7242387571130488237
+--- !u!114 &-7659608799592475919
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -9,8 +9,47 @@ 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: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 98aab8c5d374a1a41a3a660b9108beea
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 4661739171056411748, guid: 95a3f0ba6a5c7d84aa083bc98bae99d8, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 518
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 1
+  active: 1
+  postPlayback: 2
+  targetType: 2
+  LocationType: 2
+  targetSpecialDotName: 
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 1
+  CustomTargetPosIndex: 0
+  intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
+--- !u!114 &-7126401241179638984
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "1501_fashe@\u9EC4\u5C18\u706D\u9B42\u523A (1)"
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
@@ -18,78 +57,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: 6378670992772111471}
+  m_Clips: []
   m_Markers:
     m_Objects: []
 --- !u!114 &-5073625934344026965
@@ -114,7 +85,6 @@ MonoBehaviour:
   m_Children:
   - {fileID: 8106544261917024806}
   - {fileID: -894447145330074657}
-  - {fileID: -7242387571130488237}
   - {fileID: -1223227800801429518}
   m_Clips: []
   m_Markers:
@@ -143,43 +113,6 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
---- !u!114 &-1249931145621353543
-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)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 06f144804f7ec7342a023f1e18a025af
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 4661739171056411748, guid: 95a3f0ba6a5c7d84aa083bc98bae99d8, type: 3}
-  updateParticle: 1
-  particleRandomSeed: 518
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 1
-  active: 1
-  postPlayback: 2
-  targetType: 2
-  LocationType: 2
-  targetSpecialDotName: 
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
 --- !u!114 &-1223227800801429518
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -380,6 +313,7 @@ MonoBehaviour:
   m_Version: 0
   m_Tracks:
   - {fileID: -5073625934344026965}
+  - {fileID: -7126401241179638984}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
@@ -423,6 +357,100 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
+--- !u!114 &6378670992772111471
+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: -7126401241179638984}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.3999999999999999
+    m_ClipIn: 0
+    m_Asset: {fileID: -7659608799592475919}
+    m_Duration: 1
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 6378670992772111471}
+    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_tu_tuci
+  m_Markers:
+    m_Objects: []
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/HeroTimeLine/gf_1504_timeline.playable

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-7242387571130488237
+--- !u!114 &-9059077065224624874
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -18,16 +18,16 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5073625934344026965}
+  m_Parent: {fileID: -4160911494769790219}
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.3999999999999999
+    m_Start: 0.6333333333333333
     m_ClipIn: 0
-    m_Asset: {fileID: -1249931145621353543}
+    m_Asset: {fileID: 8640498369755309592}
     m_Duration: 1
     m_TimeScale: 1
-    m_ParentTrack: {fileID: -7242387571130488237}
+    m_ParentTrack: {fileID: -9059077065224624874}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: 0
@@ -89,98 +89,10 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: fx_zd
-  m_Markers:
-    m_Objects: []
---- !u!114 &-5073625934344026965
-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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
-  m_Name: "1504@\u5927\u77F3\u5934"
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children:
-  - {fileID: 8106544261917024806}
-  - {fileID: -894447145330074657}
-  - {fileID: -7242387571130488237}
-  - {fileID: -1223227800801429518}
-  m_Clips: []
+    m_DisplayName: fx_gf_tu_dashitou
   m_Markers:
     m_Objects: []
---- !u!114 &-4686349789103776704
-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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset(Clone)(Clone)(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
---- !u!114 &-1249931145621353543
-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)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 06f144804f7ec7342a023f1e18a025af
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 763203834398548103, guid: 1808e9bc9c231c34382660204a453079, 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
---- !u!114 &-1223227800801429518
+--- !u!114 &-5313822004190953293
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -198,16 +110,16 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5073625934344026965}
+  m_Parent: {fileID: -4160911494769790219}
   m_Children: []
   m_Clips:
   - m_Version: 1
     m_Start: 0.1
     m_ClipIn: 0
-    m_Asset: {fileID: 4036464651189746888}
+    m_Asset: {fileID: -4099544537863210937}
     m_Duration: 2
     m_TimeScale: 1
-    m_ParentTrack: {fileID: -1223227800801429518}
+    m_ParentTrack: {fileID: -5313822004190953293}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: 0
@@ -269,9 +181,122 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: fx_self
+    m_DisplayName: fx_gf_tu_dashitou_chuxian
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-5073625934344026965
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "1504@\u5927\u77F3\u5934"
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 8106544261917024806}
+  - {fileID: -894447145330074657}
+  m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-4686349789103776704
+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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
+--- !u!114 &-4160911494769790219
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "1504_fashe@\u5927\u77F3\u5934 (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: 11400000}
+  m_Children:
+  - {fileID: -9059077065224624874}
+  - {fileID: -5313822004190953293}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-4099544537863210937
+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)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: c0bddbe307e8aa04c9fb404a6a61629c
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 6888923829218698599, guid: 6335254a92b14714db0254ca315d7b6d, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 2432
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 0
+  active: 1
+  postPlayback: 2
+  targetType: 1
+  LocationType: 5
+  targetSpecialDotName: zdpos9
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 1
+  CustomTargetPosIndex: 0
+  intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-894447145330074657
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -380,49 +405,13 @@ MonoBehaviour:
   m_Version: 0
   m_Tracks:
   - {fileID: -5073625934344026965}
+  - {fileID: -4160911494769790219}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
---- !u!114 &4036464651189746888
-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
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 5ca15d59ee2b619418c577e96b4fe134
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 6888923829218698599, guid: 6335254a92b14714db0254ca315d7b6d, type: 3}
-  updateParticle: 1
-  particleRandomSeed: 2432
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 0
-  active: 1
-  postPlayback: 2
-  targetType: 1
-  LocationType: 5
-  targetSpecialDotName: zdpos9
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -545,3 +534,42 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
+--- !u!114 &8640498369755309592
+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: 91a21b1e898151a4b9ebc0543ff468e1
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 763203834398548103, guid: 1808e9bc9c231c34382660204a453079, 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
+  isRoat: 0
+  roatIndex: 0

Assets/Art/HeroTimeLine/gf_1505_timeline.playable

@@ -1,6 +1,118 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-7242387571130488237
+--- !u!114 &-6155292676102373765
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "1505_fashe@\u5C0F\u77F3\u5934 (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: 11400000}
+  m_Children:
+  - {fileID: -2419467102410064251}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-6105229194439621245
+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: 6ed6bd2654caf8a40a05dd25fe8be28f
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 1799151367647923245, guid: 5c653512924133c42b0486a8c65f50ae, 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
+  isRoat: 0
+  roatIndex: 0
+--- !u!114 &-5073625934344026965
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "1505@\u5C0F\u77F3\u5934"
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 8106544261917024806}
+  - {fileID: -894447145330074657}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-4686349789103776704
+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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
+--- !u!114 &-2419467102410064251
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -18,16 +130,16 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5073625934344026965}
+  m_Parent: {fileID: -6155292676102373765}
   m_Children: []
   m_Clips:
   - m_Version: 1
     m_Start: 0.3999999999999999
     m_ClipIn: 0
-    m_Asset: {fileID: -1249931145621353543}
+    m_Asset: {fileID: -6105229194439621245}
     m_Duration: 1
     m_TimeScale: 1
-    m_ParentTrack: {fileID: -7242387571130488237}
+    m_ParentTrack: {fileID: -2419467102410064251}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: 0
@@ -89,118 +201,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: fx_zd
-  m_Markers:
-    m_Objects: []
---- !u!114 &-5073625934344026965
-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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
-  m_Name: "1505@\u5C0F\u77F3\u5934"
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children:
-  - {fileID: 8106544261917024806}
-  - {fileID: -894447145330074657}
-  - {fileID: -7242387571130488237}
-  - {fileID: -1223227800801429518}
-  m_Clips: []
-  m_Markers:
-    m_Objects: []
---- !u!114 &-4686349789103776704
-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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset(Clone)(Clone)(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
---- !u!114 &-1249931145621353543
-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)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 06f144804f7ec7342a023f1e18a025af
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 1799151367647923245, guid: 5c653512924133c42b0486a8c65f50ae, 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
---- !u!114 &-1223227800801429518
-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: -5073625934344026965}
-  m_Children: []
-  m_Clips: []
+    m_DisplayName: fx_gf_tu_xiaoshitou
   m_Markers:
     m_Objects: []
 --- !u!114 &-894447145330074657
@@ -311,6 +312,7 @@ MonoBehaviour:
   m_Version: 0
   m_Tracks:
   - {fileID: -5073625934344026965}
+  - {fileID: -6155292676102373765}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60

Assets/Art/VFX/FXPrefabs/fx_gf_1302.prefab

@@ -25221,7 +25221,7 @@ MonoBehaviour:
   speed: 20
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 0
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1502.prefab

@@ -34335,7 +34335,7 @@ MonoBehaviour:
   hitAudioName: 
   extraMoveSpeed: 0
   isNotMove: 0
-  isPenetrate: 0
+  isPenetrate: 1
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
@@ -34351,7 +34351,7 @@ MonoBehaviour:
     isActive: 0
     controlPoints: []
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &6358413138534834805
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_tu_dashitou.prefab

@@ -9827,16 +9827,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
-  multipleTargetDelayTime: 0.2
+  multipleTargetDelayTime: 0.4
   hitFxName: fx_gf_tu_dashitou_hit
   hitAudioName: 
   extraMoveSpeed: 0
+  isNotMove: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
+  isInit: 0
   speed: 15
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 2
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -9849,7 +9854,7 @@ MonoBehaviour:
     - {x: 0.3307275, y: -0.0420354, z: 3.1231074}
     - {x: 0, y: 0, z: 5}
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &7449908463811249131
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_tu_tuci.prefab

@@ -5073,17 +5073,22 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
-  multipleTargetDelayTime: 0.2
+  multipleTargetDelayTime: 0
   hitFxName: fx_gf_tu_tuci_hit
   hitAudioName: 
   extraMoveSpeed: 0
+  isNotMove: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
-  speed: 9
-  parabolaCurveType: 2
+  isInit: 0
+  speed: 15
+  roatRoot: {fileID: 0}
+  raotIndex: 0
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 1
@@ -5095,7 +5100,7 @@ MonoBehaviour:
     - {x: 0.3307275, y: -0.0420354, z: 3.1231074}
     - {x: 0, y: 0, z: 5}
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &4615429022670180858
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_tu_xiaoshitou.prefab

@@ -5073,16 +5073,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
-  multipleTargetDelayTime: 0.2
+  multipleTargetDelayTime: 0
   hitFxName: fx_gf_tu_xiaoshitou_hit
   hitAudioName: 
   extraMoveSpeed: 0
+  isNotMove: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
+  isInit: 0
   speed: 9
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 2
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -5095,7 +5100,7 @@ MonoBehaviour:
     - {x: 0.3307275, y: -0.0420354, z: 3.1231074}
     - {x: 0, y: 0, z: 5}
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &3065948445854131182
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Res/Config/SkillConfig.json

@@ -3432,7 +3432,7 @@
       "icon": "icon_s1501",
       "scriptName": "S1501",
       "IDGroup": 1501,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1501_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3457,7 +3457,7 @@
       "icon": "icon_s1501",
       "scriptName": "S1501",
       "IDGroup": 1501,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1501_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3485,7 +3485,7 @@
       "icon": "icon_s1501",
       "scriptName": "S1501",
       "IDGroup": 1501,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1501_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3519,7 +3519,7 @@
       "icon": "icon_s1501",
       "scriptName": "S1501",
       "IDGroup": 1501,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1501_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3553,7 +3553,7 @@
       "icon": "icon_s1501",
       "scriptName": "S1501",
       "IDGroup": 1501,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1501_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3587,7 +3587,7 @@
       "icon": "icon_s1501",
       "scriptName": "S1501",
       "IDGroup": 1501,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1501_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3621,7 +3621,7 @@
       "icon": "icon_s1502",
       "scriptName": "S1502",
       "IDGroup": 1502,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1502_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3646,7 +3646,7 @@
       "icon": "icon_s1502",
       "scriptName": "S1502",
       "IDGroup": 1502,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1502_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3674,7 +3674,7 @@
       "icon": "icon_s1502",
       "scriptName": "S1502",
       "IDGroup": 1502,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1502_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3708,7 +3708,7 @@
       "icon": "icon_s1502",
       "scriptName": "S1502",
       "IDGroup": 1502,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1502_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3742,7 +3742,7 @@
       "icon": "icon_s1502",
       "scriptName": "S1502",
       "IDGroup": 1502,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1502_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3776,7 +3776,7 @@
       "icon": "icon_s1502",
       "scriptName": "S1502",
       "IDGroup": 1502,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1502_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3810,7 +3810,7 @@
       "icon": "icon_s1504",
       "scriptName": "S1504",
       "IDGroup": 1504,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1504_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3834,7 +3834,7 @@
       "icon": "icon_s1504",
       "scriptName": "S1504",
       "IDGroup": 1504,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1504_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3867,7 +3867,7 @@
       "icon": "icon_s1504",
       "scriptName": "S1504",
       "IDGroup": 1504,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1504_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3900,7 +3900,7 @@
       "icon": "icon_s1504",
       "scriptName": "S1504",
       "IDGroup": 1504,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1504_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3933,7 +3933,7 @@
       "icon": "icon_s1504",
       "scriptName": "S1504",
       "IDGroup": 1504,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1504_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3966,7 +3966,7 @@
       "icon": "icon_s1504",
       "scriptName": "S1504",
       "IDGroup": 1504,
-      "timelineName": "bingqiu_timeline_TD",
+      "timelineName": "1504_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -3999,7 +3999,7 @@
       "icon": "icon_s1505",
       "scriptName": "S1505",
       "IDGroup": 1505,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1505_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -4023,7 +4023,7 @@
       "icon": "icon_s1505",
       "scriptName": "S1505",
       "IDGroup": 1505,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1505_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -4056,7 +4056,7 @@
       "icon": "icon_s1505",
       "scriptName": "S1505",
       "IDGroup": 1505,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1505_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -4089,7 +4089,7 @@
       "icon": "icon_s1505",
       "scriptName": "S1505",
       "IDGroup": 1505,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1505_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -4122,7 +4122,7 @@
       "icon": "icon_s1505",
       "scriptName": "S1505",
       "IDGroup": 1505,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1505_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,
@@ -4155,7 +4155,7 @@
       "icon": "icon_s1505",
       "scriptName": "S1505",
       "IDGroup": 1505,
-      "timelineName": "bingzhui_timeline_TD",
+      "timelineName": "1505_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 1,

Assets/Res/HeroAnimtion/Nanzhu.asset

@@ -104,6 +104,8 @@ MonoBehaviour:
     - {fileID: -4718902783258376847}
     - {fileID: 4162791575905085679}
     - {fileID: -6171717114427328642}
+    - {fileID: 2764144266529134920}
+    - {fileID: 6157797931657719434}
     _Modifiers:
     - _From: 0
       _To: 0
@@ -213,6 +215,90 @@ MonoBehaviour:
     - _From: 5
       _To: 1
       _Fade: 0
+    - _From: 6
+      _To: 0
+      _Fade: 0
+    - _From: 6
+      _To: 1
+      _Fade: 0
+    - _From: 6
+      _To: 2
+      _Fade: 0
+    - _From: 6
+      _To: 3
+      _Fade: 0
+    - _From: 6
+      _To: 4
+      _Fade: 0
+    - _From: 6
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 6
+      _Fade: 0
+    - _From: 4
+      _To: 6
+      _Fade: 0
+    - _From: 3
+      _To: 6
+      _Fade: 0
+    - _From: 2
+      _To: 6
+      _Fade: 0
+    - _From: 1
+      _To: 6
+      _Fade: 0
+    - _From: 0
+      _To: 6
+      _Fade: 0
+    - _From: 6
+      _To: 6
+      _Fade: 0
+    - _From: 7
+      _To: 0
+      _Fade: 0
+    - _From: 7
+      _To: 1
+      _Fade: 0
+    - _From: 7
+      _To: 2
+      _Fade: 0
+    - _From: 7
+      _To: 3
+      _Fade: 0
+    - _From: 7
+      _To: 4
+      _Fade: 0
+    - _From: 7
+      _To: 5
+      _Fade: 0
+    - _From: 7
+      _To: 6
+      _Fade: 0
+    - _From: 7
+      _To: 7
+      _Fade: 0
+    - _From: 6
+      _To: 7
+      _Fade: 0
+    - _From: 5
+      _To: 7
+      _Fade: 0
+    - _From: 4
+      _To: 7
+      _Fade: 0
+    - _From: 3
+      _To: 7
+      _Fade: 0
+    - _From: 2
+      _To: 7
+      _Fade: 0
+    - _From: 1
+      _To: 7
+      _Fade: 0
+    - _From: 0
+      _To: 7
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &1485322484274848399
@@ -243,6 +329,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 669eef23799d5b84ca0df43cd5aadfd5, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &2764144266529134920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: attack7
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3899372336603201536
+  references:
+    version: 2
+    RefIds:
+    - rid: 3899372336603201536
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 80ee11b7a19d33a41844c35bd52b9614, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &4162791575905085679
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -313,3 +427,31 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _Library: {fileID: 11400000}
   _TransitionSortMode: 0
+--- !u!114 &6157797931657719434
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: attack8
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3899372336603201537
+  references:
+    version: 2
+    RefIds:
+    - rid: 3899372336603201537
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: fa8eaa81a2d059a458d848e2c054b0ba, type: 3}
+        _NormalizedStartTime: NaN

Assets/Res/TimeLineAssets/1501_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1501_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_tuci\",\"randomSeed\":518,\"locationType\":2,\"targetSpecialDotName\":\"\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_tuci_chuxian\",\"randomSeed\":2432,\"locationType\":2,\"targetSpecialDotName\":\"\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0.1,\"endTime\":2.1,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1501_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1501_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_tuci_chuxian\",\"randomSeed\":2432,\"locationType\":2,\"targetSpecialDotName\":\"\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0.1,\"endTime\":2.1,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_tuci\",\"randomSeed\":518,\"locationType\":2,\"targetSpecialDotName\":\"\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1501_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1502_timeline_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CnsX4SmlUX3jWfxkq8jk9ZHz735DmuTj0H7sw6yoUYDeCGVrxibnW3KKq5JN
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/TimeLineAssets/1504_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1504_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_dashitou\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_dashitou_chuxian\",\"randomSeed\":2432,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0.1,\"endTime\":2.1,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1504_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1504_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_dashitou\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504_fashe\",\"isActivity\":false,\"startTime\":0.6333333,\"endTime\":1.633333,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_dashitou_chuxian\",\"randomSeed\":2432,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504_fashe\",\"isActivity\":false,\"startTime\":0.1,\"endTime\":2.1,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1504_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1505_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1505_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_xiaoshitou\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1505_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1505_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_xiaoshitou\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1505_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Scenes/testCombat.scene

@@ -2241,7 +2241,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 352
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].level
@@ -2317,7 +2317,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameLogic/Combat/Hero/SubStatus/FightIdleSubState.cs

@@ -33,12 +33,12 @@ namespace GameLogic.Combat.Hero.SubStatus
 
         protected override void ProUpdate(float t)
         {
-            return;
+            // return;
             allTime += t * 2f;
             allTimeX += t * 1f;
             Vector3 p = Vector3.Lerp(startPos, targetPos, allTime);
             float y = Mathf.Sin(allTime) * (CombatHeroEntity.IsEnemy ? 0.1f : -0.1f);
-            float x = Mathf.Cos(allTimeX) * (CombatHeroEntity.IsEnemy ? 0.8f : -0.8f);
+            float x = Mathf.Cos(allTimeX) * (CombatHeroEntity.IsEnemy ? 0.1f : -0.1f);
             p = initPos + new Vector3(x, y, 0);
 
             CombatHeroEntity.combatHeroGameObject.SetPosition(p);

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

@@ -31,11 +31,9 @@ namespace GameLogic.Combat.Skill
                     .GetMainHotPoin<CombatHeroHitPoint>();
                 BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
                 currTarget.Add(combatHeroHitPoint);
-                Vector3 p = CombatHeroEntity.GameObject.transform.TransformPoint(new Vector3(Random.Range(-1f, 2f),
-                    Random.Range(2f, 3f), Random.Range(0.5f, 1f)));
-
-                ActivationTimeLineData("1302_fashe", currTarget: currTarget,
-                    customizePos: new Vector3[] { p }, indexCount: i);
+                int index = Random.Range(3, 9);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + index);
+                ActivationTimeLineData("1302_fashe", currTarget: currTarget,customizePos:new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i, startTime: i * -0.1f);
             }
         }
 
@@ -62,7 +60,8 @@ namespace GameLogic.Combat.Skill
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[1]);
-            HarmReturnInfo harmReturnInfo=    CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
+            HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
+                AttType.Skill, triggerData,
                 wuXingType, skillFeatures,
                 HarmType.Default);
 

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

@@ -0,0 +1,76 @@
+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}伤害，并有概率施加1层细尘，
+    /// </summary>
+    public class S1501: SkillBasic
+    {
+        private int currCount;
+        private Vector3 startPos;
+        private Vector3 fangXiang;
+
+        protected override void ProUseSkill()
+        {
+            currCount = 0;
+
+            ActivationTimeLineData("1501");
+            ballisticsCount = (int)effectValue[0];
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+                currTarget.Add(combatHeroHitPoint);
+                Vector3 p = CombatHeroEntity.GameObject.transform.TransformPoint(new Vector3(Random.Range(-1f, 2f),
+                    Random.Range(2f, 3f), Random.Range(0.5f, 1f)));
+
+                ActivationTimeLineData("1501_fashe", currTarget: currTarget,
+                    customizePos: new Vector3[] { p }, indexCount: i,startTime:i*-0.1f);
+            }
+        }
+
+        // private void Launch()
+        // {
+        //     CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+        //         .GetThis<CombatHeroEntity>()
+        //         .GetMainHotPoin<CombatHeroHitPoint>();
+        //     BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+        //     currTarget.Add(combatHeroHitPoint);
+        //     // SpecialDotInfo specialDotInfo=  CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+        //     ActivationTimeLineData("duzhen_fashe", currTarget: currTarget,
+        //         customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+        // }
+
+        protected override void ProTimelineFxLogicInit(string groupName, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData, ISkillFeatures skillFeatures)
+        {
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                effectValue[1]);
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
+                wuXingType, skillFeatures,
+                HarmType.Default);
+
+            // int odds = Random.Range(0, 100);
+            // if (odds < effectValue[2])
+            // {
+            //     BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
+            //     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+            // }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9258f41c68c64fb68e6ec69318b89e49
+timeCreated: 1750666631

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

@@ -0,0 +1,76 @@
+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>
+    /// 地裂屠龙斩
+    /// 一丙虚空形成的大刀，横空挥砍形成一个刀气，对敌人照成伤害，并叠加1层破甲
+    /// </summary>
+    public class S1502 : SkillBasic
+    {
+        private int currCount;
+        private Vector3 startPos;
+        private Vector3 fangXiang;
+
+        protected override void ProUseSkill()
+        {
+            currCount = 0;
+
+            ActivationTimeLineData("1502");
+            ballisticsCount = (int)effectValue[0];
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+                currTarget.Add(combatHeroHitPoint);
+                Vector3 p = CombatHeroEntity.GameObject.transform.TransformPoint(new Vector3(Random.Range(-1f, 2f),
+                    Random.Range(2f, 3f), Random.Range(0.5f, 1f)));
+
+                ActivationTimeLineData("1502_fashe", currTarget: currTarget,
+                    customizePos: new Vector3[] { p }, indexCount: i);
+            }
+        }
+
+        // private void Launch()
+        // {
+        //     CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+        //         .GetThis<CombatHeroEntity>()
+        //         .GetMainHotPoin<CombatHeroHitPoint>();
+        //     BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+        //     currTarget.Add(combatHeroHitPoint);
+        //     // SpecialDotInfo specialDotInfo=  CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+        //     ActivationTimeLineData("duzhen_fashe", currTarget: currTarget,
+        //         customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+        // }
+
+        protected override void ProTimelineFxLogicInit(string groupName, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData, ISkillFeatures skillFeatures)
+        {
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                effectValue[1]);
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
+                wuXingType, skillFeatures,
+                HarmType.Default);
+
+            int odds = Random.Range(0, 100);
+            if (odds < effectValue[2])
+            {
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
+                targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 26be718979b740c7be359292a14dab0d
+timeCreated: 1750665144

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

@@ -0,0 +1,75 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 大石头
+    /// 发射{0}个大点的石头。对敌人照成{1}伤害
+    /// </summary>
+    public class S1504: SkillBasic
+    {
+        private int currCount;
+        private Vector3 startPos;
+        private Vector3 fangXiang;
+
+        protected override void ProUseSkill()
+        {
+            currCount = 0;
+
+            ActivationTimeLineData("1504");
+            ballisticsCount = (int)effectValue[0];
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+                currTarget.Add(combatHeroHitPoint);
+                Vector3 p = CombatHeroEntity.GameObject.transform.TransformPoint(new Vector3(Random.Range(-1f, 2f),
+                    Random.Range(2f, 3f), Random.Range(0.2f, 0.5f)));
+
+                ActivationTimeLineData("1504_fashe", currTarget: currTarget,
+                    customizePos: new Vector3[] { p }, indexCount: i,startTime:i*-0.1f);
+            }
+        }
+
+        // private void Launch()
+        // {
+        //     CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+        //         .GetThis<CombatHeroEntity>()
+        //         .GetMainHotPoin<CombatHeroHitPoint>();
+        //     BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+        //     currTarget.Add(combatHeroHitPoint);
+        //     // SpecialDotInfo specialDotInfo=  CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+        //     ActivationTimeLineData("duzhen_fashe", currTarget: currTarget,
+        //         customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+        // }
+
+        protected override void ProTimelineFxLogicInit(string groupName, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData, ISkillFeatures skillFeatures)
+        {
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                effectValue[1]);
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
+                wuXingType, skillFeatures,
+                HarmType.Default);
+
+            // int odds = Random.Range(0, 100);
+            // if (odds < effectValue[2])
+            // {
+            //     BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
+            //     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+            // }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ef4e563953414871a2ebc7d5820c0e26
+timeCreated: 1750666705

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

@@ -0,0 +1,71 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    public class S1505: SkillBasic
+    {
+        private int currCount;
+        private Vector3 startPos;
+        private Vector3 fangXiang;
+
+        protected override void ProUseSkill()
+        {
+            currCount = 0;
+
+            ActivationTimeLineData("1505");
+            ballisticsCount = (int)effectValue[0];
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+                currTarget.Add(combatHeroHitPoint);
+                Vector3 p = CombatHeroEntity.GameObject.transform.TransformPoint(new Vector3(Random.Range(-0.5f, 0.5f),
+                    Random.Range(0.5f, 1f), Random.Range(0f, 0.3f)));
+
+                ActivationTimeLineData("1505_fashe", currTarget: currTarget,
+                    customizePos: new Vector3[] { p }, indexCount: i,startTime:i*-0.05f);
+            }
+        }
+
+        // private void Launch()
+        // {
+        //     CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+        //         .GetThis<CombatHeroEntity>()
+        //         .GetMainHotPoin<CombatHeroHitPoint>();
+        //     BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+        //     currTarget.Add(combatHeroHitPoint);
+        //     // SpecialDotInfo specialDotInfo=  CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+        //     ActivationTimeLineData("duzhen_fashe", currTarget: currTarget,
+        //         customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+        // }
+
+        protected override void ProTimelineFxLogicInit(string groupName, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData, ISkillFeatures skillFeatures)
+        {
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                effectValue[1]);
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
+                wuXingType, skillFeatures,
+                HarmType.Default);
+
+            // int odds = Random.Range(0, 100);
+            // if (odds < effectValue[2])
+            // {
+            //     BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
+            //     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+            // }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f2988f27a85446e8bb149eacb8c7a5cb
+timeCreated: 1750666759

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

@@ -61,7 +61,7 @@ namespace Common.Combat.FxAILogic
         public IGObjectPoolInterface ObjectPoolInterface;
 
 
-        public bool isPenetrate;
+        [Header("是否可以穿透")] public bool isPenetrate;
 
         [Header("是否使用自定义目标结束点")] public bool isUseCustomTargetEndPos;
         [Header("结束点的下标")] public int customTargetEndPosIndex;

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

@@ -15,13 +15,12 @@ namespace Common.Combat.FxAILogic
     [AddComponentMenu("特效脚本/弹道/功法通用弹道")]
     public class FxParabolaBulletLogic : FxAILogicBasic
     {
-      
         public float speed;
         public Transform roatRoot;
         public int raotIndex;
         private IUnRegister UnRegister = null;
 
-
+        
         public enum CurveType
         {
             DynamicCurve,
@@ -38,9 +37,11 @@ namespace Common.Combat.FxAILogic
 
         private Vector3 endPos;
         private Vector3 dir;
-        public float maxDis = 20;
 
-        protected float maxDisSpr;
+        [Header("存在最长时间")] public float maxTime = 10;
+        // [Header("是否可以穿透")] public bool isPenetrate;
+        //
+        // protected float maxDisSpr;
 
         // private BesselPath _besselPath;
 
@@ -50,12 +51,15 @@ namespace Common.Combat.FxAILogic
         protected Vector3 startDir;
         private float dirLerpTime;
 
+        private float _currRunTime;
+        private bool isUpdateDir;
 
         protected override void ProInit()
         {
-            maxDisSpr = maxDis * maxDis;
-
-            if (roatRoot!=null&&TimeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.isRoat)
+            // maxDisSpr = maxDis * maxDis;
+            _currRunTime = 0;
+            isUpdateDir = true;
+            if (roatRoot != null && TimeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.isRoat)
             {
                 roatRoot.transform.eulerAngles = TimeLineEventParticleLogicBasic.customizePos[raotIndex];
             }
@@ -114,7 +118,7 @@ namespace Common.Combat.FxAILogic
                     Vector3 p = BesselPath.controlPoints[i];
                     if (isUseX)
                     {
-                        if (i == 1||i==2)
+                        if (i == 1 || i == 2)
                         {
                             p.x = pos.x > 0 ? p.x * -1 : p.x;
                         }
@@ -272,14 +276,15 @@ namespace Common.Combat.FxAILogic
                     timeLineTriggerEvent.TimeLineTrigger(
                         TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
                         target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData, SkillFeaturesData);
+                    if (!string.IsNullOrEmpty(hitFxName))
+                    {
+                        FinishHit(collision.ClosestPoint(moveTarget.transform.position), hitFxName);
+                    }
+                    AudioManager.Instance.PlayAudio(hitAudioName, false);
+                    
                     if (!BarrierTriggerData.isPenetrate)
                     {
-                        if (!string.IsNullOrEmpty(hitFxName))
-                        {
-                            FinishHit(collision.ClosestPoint(moveTarget.transform.position), hitFxName);
-                        }
-
-                        AudioManager.Instance.PlayAudio(hitAudioName, false);
+              
 
                         if (!isPenetrate)
                         {
@@ -313,6 +318,7 @@ namespace Common.Combat.FxAILogic
                 TimeLineEventParticleLogicBasic.ITimeLineTriggerEntity as ITimeLineTriggerEvent;
             if (timeLineTriggerEvent != null)
             {
+                isUpdateDir = false;
                 timeLineTriggerEvent.TimeLineTrigger(TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
                     target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData, SkillFeaturesData);
                 if (!string.IsNullOrEmpty(hitFxName))
@@ -342,12 +348,19 @@ namespace Common.Combat.FxAILogic
         {
             if (roatRoot != null)
             {
-                obj.transform.rotation=  roatRoot.rotation;
+                obj.transform.rotation = roatRoot.rotation;
             }
         }
 
         protected override void ProCombatUpdate(float time)
         {
+            _currRunTime+=time;
+            if (_currRunTime > maxTime)
+            {
+                Dispose();
+                return;
+            }
+
             if (!isNotMove)
             {
                 switch (parabolaCurveType)
@@ -372,11 +385,15 @@ namespace Common.Combat.FxAILogic
         private void Beeline(float time)
         {
             GetTargetPos();
-            Vector3 dir = (endPos - _currPos).normalized;
-            // dir = Vector3.Lerp(startDir, dir, dirLerpTime).normalized;
-            // startDir= dir;
+            if (isUpdateDir)
+            {
+                Vector3 dir = (endPos - _currPos).normalized;
+                // dir = Vector3.Lerp(startDir, dir, dirLerpTime).normalized;
+                startDir = dir;
+            }
+
             Vector3 lasetPos = _currPos;
-            _currPos += dir * GetMoveSpeed() * time;
+            _currPos += startDir * GetMoveSpeed() * time;
             moveTarget.transform.position = _currPos;
 
             moveTarget.transform.rotation = Quaternion.LookRotation(dir);