浏览代码

添加音效

DESKTOP-BGJIU14\ck 2 天之前
父节点
当前提交
d6ad6adcff
共有 69 个文件被更改,包括 1880 次插入30 次删除
  1. 147 0
      Assets/Art/HeroTimeLine/gf_1302_timeline.playable
  2. 127 0
      Assets/Art/HeroTimeLine/gf_1304_timeline.playable
  3. 127 0
      Assets/Art/HeroTimeLine/gf_1305_timeline.playable
  4. 117 0
      Assets/Art/HeroTimeLine/gf_1401_timeline.playable
  5. 147 0
      Assets/Art/HeroTimeLine/gf_1402_timeline.playable
  6. 158 0
      Assets/Art/HeroTimeLine/gf_1403_timeline.playable
  7. 127 0
      Assets/Art/HeroTimeLine/gf_1404_timeline.playable
  8. 127 0
      Assets/Art/HeroTimeLine/gf_1405_timeline.playable
  9. 138 2
      Assets/Art/HeroTimeLine/gf_1501_timeline.playable
  10. 118 1
      Assets/Art/HeroTimeLine/gf_1502_timeline.playable
  11. 136 0
      Assets/Art/HeroTimeLine/gf_1504_timeline.playable
  12. 4 2
      Assets/Art/VFX/FXPrefabs/fx_gf_1302.prefab
  13. 3 1
      Assets/Art/VFX/FXPrefabs/fx_gf_1401.prefab
  14. 6 2
      Assets/Art/VFX/FXPrefabs/fx_gf_1402.prefab
  15. 4 2
      Assets/Art/VFX/FXPrefabs/fx_gf_1403.prefab
  16. 3 1
      Assets/Art/VFX/FXPrefabs/fx_gf_1502.prefab
  17. 9 2
      Assets/Art/VFX/FXPrefabs/fx_gf_huodao.prefab
  18. 9 2
      Assets/Art/VFX/FXPrefabs/fx_gf_huoqiu.prefab
  19. 2 1
      Assets/Art/VFX/FXPrefabs/fx_gf_muci.prefab
  20. 3 1
      Assets/Art/VFX/FXPrefabs/fx_gf_tu_dashitou.prefab
  21. 3 1
      Assets/Art/VFX/FXPrefabs/fx_gf_tu_tuci.prefab
  22. 9 2
      Assets/Art/VFX/FXPrefabs/fx_gf_zhuzi.prefab
  23. 1 1
      Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat
  24. 1 1
      Assets/Art/VFX/Resources/refine.shadergraph.meta
  25. 8 0
      Assets/Res/Aduio/Skill/1302.meta
  26. 二进制
      Assets/Res/Aduio/Skill/1302/1302_hit.wav
  27. 23 0
      Assets/Res/Aduio/Skill/1302/1302_hit.wav.meta
  28. 二进制
      Assets/Res/Aduio/Skill/1302/1302_shifang.wav
  29. 23 0
      Assets/Res/Aduio/Skill/1302/1302_shifang.wav.meta
  30. 8 0
      Assets/Res/Aduio/Skill/1401.meta
  31. 二进制
      Assets/Res/Aduio/Skill/1401/1401_feixing.wav
  32. 23 0
      Assets/Res/Aduio/Skill/1401/1401_feixing.wav.meta
  33. 二进制
      Assets/Res/Aduio/Skill/1401/1401_hit.wav
  34. 23 0
      Assets/Res/Aduio/Skill/1401/1401_hit.wav.meta
  35. 二进制
      Assets/Res/Aduio/Skill/1401/1401_shifa.wav
  36. 23 0
      Assets/Res/Aduio/Skill/1401/1401_shifa.wav.meta
  37. 8 0
      Assets/Res/Aduio/Skill/1402.meta
  38. 二进制
      Assets/Res/Aduio/Skill/1402/1402_shifa.wav
  39. 23 0
      Assets/Res/Aduio/Skill/1402/1402_shifa.wav.meta
  40. 8 0
      Assets/Res/Aduio/Skill/1403.meta
  41. 二进制
      Assets/Res/Aduio/Skill/1403/1403_shifa.wav
  42. 23 0
      Assets/Res/Aduio/Skill/1403/1403_shifa.wav.meta
  43. 8 0
      Assets/Res/Aduio/Skill/1501.meta
  44. 二进制
      Assets/Res/Aduio/Skill/1501/1501_feixing.wav
  45. 23 0
      Assets/Res/Aduio/Skill/1501/1501_feixing.wav.meta
  46. 二进制
      Assets/Res/Aduio/Skill/1501/1501_hit.wav
  47. 23 0
      Assets/Res/Aduio/Skill/1501/1501_hit.wav.meta
  48. 二进制
      Assets/Res/Aduio/Skill/1501/1501_shifa.wav
  49. 23 0
      Assets/Res/Aduio/Skill/1501/1501_shifa.wav.meta
  50. 8 0
      Assets/Res/Aduio/Skill/1502.meta
  51. 二进制
      Assets/Res/Aduio/Skill/1502/1502_feixing.wav
  52. 23 0
      Assets/Res/Aduio/Skill/1502/1502_feixing.wav.meta
  53. 二进制
      Assets/Res/Aduio/Skill/1502/1502_hit.wav
  54. 23 0
      Assets/Res/Aduio/Skill/1502/1502_hit.wav.meta
  55. 二进制
      Assets/Res/Aduio/Skill/1502/1502_shifa.wav
  56. 23 0
      Assets/Res/Aduio/Skill/1502/1502_shifa.wav.meta
  57. 0 0
      Assets/Res/TimeLineAssets/1302_timeline_TD.txt
  58. 1 1
      Assets/Res/TimeLineAssets/1304_timeline_TD.txt
  59. 1 1
      Assets/Res/TimeLineAssets/1305_timeline_TD.txt
  60. 0 0
      Assets/Res/TimeLineAssets/1401_timeline_TD.txt
  61. 0 0
      Assets/Res/TimeLineAssets/1402_timeline_TD.txt
  62. 0 0
      Assets/Res/TimeLineAssets/1403_timeline_TD.txt
  63. 1 1
      Assets/Res/TimeLineAssets/1404_timeline_TD.txt
  64. 1 1
      Assets/Res/TimeLineAssets/1405_timeline_TD.txt
  65. 0 0
      Assets/Res/TimeLineAssets/1501_timeline_TD.txt
  66. 0 0
      Assets/Res/TimeLineAssets/1502_timeline_TD.txt
  67. 0 0
      Assets/Res/TimeLineAssets/1504_timeline_TD.txt
  68. 0 0
      Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt
  69. 3 4
      Assets/Scripts/GameLogic/Combat/Skill/S1501.cs

+ 147 - 0
Assets/Art/HeroTimeLine/gf_1302_timeline.playable

@@ -26,6 +26,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -157,6 +168,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -196,6 +218,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -232,6 +265,7 @@ MonoBehaviour:
   - {fileID: -2619250345888704379}
   - {fileID: 5651971833199858375}
   - {fileID: -2369211992482019178}
+  - {fileID: -1484327419090902122}
   - {fileID: -7262251359332933895}
   - {fileID: 197522664633190907}
   m_Clips: []
@@ -358,6 +392,102 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-1484327419090902122
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -3287993412395920561}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 7099199193721951948}
+    m_Duration: 1.913174603174603
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -1484327419090902122}
+    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: 1302_shifang
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -601,6 +731,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
   m_Name: ActivationPlayableAsset
   m_EditorClassIdentifier: 
+--- !u!114 &7099199193721951948
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: 6423bfa272d1bf441b46d3f50e35bbff, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &7192609876556129792
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 127 - 0
Assets/Art/HeroTimeLine/gf_1304_timeline.playable

@@ -1,5 +1,22 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8180686440984462818
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-5773345672998817970
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -44,6 +61,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: 8300055032453701575}
   - {fileID: -894447145330074657}
   m_Clips: []
   m_Markers:
@@ -98,6 +116,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -109,6 +138,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-4071160049415015395
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -463,3 +494,99 @@ 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 &8300055032453701575
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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
+    m_ClipIn: 0
+    m_Asset: {fileID: -8180686440984462818}
+    m_Duration: 0.8656462585034014
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 8300055032453701575}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0

+ 127 - 0
Assets/Art/HeroTimeLine/gf_1305_timeline.playable

@@ -21,6 +21,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: 2630832717580449216}
   - {fileID: -894447145330074657}
   m_Clips: []
   m_Markers:
@@ -75,6 +76,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -86,6 +98,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-894447145330074657
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -201,6 +215,119 @@ MonoBehaviour:
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
+--- !u!114 &66656039435687836
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
+--- !u!114 &2630832717580449216
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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
+    m_ClipIn: 0
+    m_Asset: {fileID: 66656039435687836}
+    m_Duration: 0.8656462585034014
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 2630832717580449216}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &2811424835076340321
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 117 - 0
Assets/Art/HeroTimeLine/gf_1401_timeline.playable

@@ -118,6 +118,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
     x: 2
@@ -212,11 +213,108 @@ MonoBehaviour:
   m_Children:
   - {fileID: 8106544261917024806}
   - {fileID: -894447145330074657}
+  - {fileID: -3459465816887609173}
   - {fileID: -8041341778034734623}
   - {fileID: 6066676420339436833}
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-3459465816887609173
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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
+    m_ClipIn: 0
+    m_Asset: {fileID: 6673237405255462657}
+    m_Duration: 2.274829931972789
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -3459465816887609173}
+    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: 1401_shifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-3189740574693877493
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -243,6 +341,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -499,6 +598,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -758,6 +858,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
   m_Name: ActivationPlayableAsset
   m_EditorClassIdentifier: 
+--- !u!114 &6673237405255462657
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: 1516ed24b64ff5948a8779a94fdb6614, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &8106544261917024806
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 147 - 0
Assets/Art/HeroTimeLine/gf_1402_timeline.playable

@@ -140,6 +140,7 @@ MonoBehaviour:
   - {fileID: -894447145330074657}
   - {fileID: -5266457318080299583}
   - {fileID: 1705070753404374807}
+  - {fileID: 7046993596422382009}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -169,6 +170,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -208,6 +220,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -221,6 +244,23 @@ MonoBehaviour:
   intervalTime: 0
   isRoat: 0
   roatIndex: 0
+--- !u!114 &-2421309954002424428
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: 14b87bf16e903bf48b933e4a65821624, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-1961705670254758766
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -456,6 +496,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -595,6 +646,102 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
   m_Name: ActivationPlayableAsset
   m_EditorClassIdentifier: 
+--- !u!114 &7046993596422382009
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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
+    m_ClipIn: 0
+    m_Asset: {fileID: -2421309954002424428}
+    m_Duration: 2.618049886621315
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 7046993596422382009}
+    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: 1402_shifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &8106544261917024806
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 158 - 0
Assets/Art/HeroTimeLine/gf_1403_timeline.playable

@@ -26,6 +26,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -65,6 +76,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: fxpos00
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -100,6 +122,7 @@ MonoBehaviour:
   m_Children:
   - {fileID: 8106544261917024806}
   - {fileID: -894447145330074657}
+  - {fileID: 8625368967701265486}
   - {fileID: -1853147012880950275}
   - {fileID: 3709123347064332188}
   m_Clips: []
@@ -431,6 +454,23 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
+--- !u!114 &-413732425704315838
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: 939800140ba53554c962da73e9458e99, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -479,6 +519,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: fxpos00
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -714,6 +765,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -837,3 +899,99 @@ 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 &8625368967701265486
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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
+    m_ClipIn: 0
+    m_Asset: {fileID: -413732425704315838}
+    m_Duration: 2.700408163265306
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 8625368967701265486}
+    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: 1403_shifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0

+ 127 - 0
Assets/Art/HeroTimeLine/gf_1404_timeline.playable

@@ -21,10 +21,28 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: -103529428172289177}
   - {fileID: -894447145330074657}
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-5004887358677703316
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: 1516ed24b64ff5948a8779a94fdb6614, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-4686349789103776704
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -142,6 +160,102 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
+--- !u!114 &-103529428172289177
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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
+    m_ClipIn: 0
+    m_Asset: {fileID: -5004887358677703316}
+    m_Duration: 2.1556916099773242
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -103529428172289177}
+    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: 1401_shifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -238,6 +352,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -249,6 +374,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &4763726869281620867
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 127 - 0
Assets/Art/HeroTimeLine/gf_1405_timeline.playable

@@ -51,6 +51,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -62,6 +73,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-5073625934344026965
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -83,6 +96,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: 5013336567670490806}
   - {fileID: -894447145330074657}
   m_Clips: []
   m_Markers:
@@ -341,6 +355,119 @@ MonoBehaviour:
     m_DisplayName: fx_gf_huodao
   m_Markers:
     m_Objects: []
+--- !u!114 &5013336567670490806
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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
+    m_ClipIn: 0
+    m_Asset: {fileID: 5671738132080268482}
+    m_Duration: 0.5170975056689342
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 5013336567670490806}
+    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: 1401_shifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
+--- !u!114 &5671738132080268482
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: 6a0389d19e064f74498d3ca891d55b4c, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 138 - 2
Assets/Art/HeroTimeLine/gf_1501_timeline.playable

@@ -1,5 +1,101 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8106860943724561688
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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.11606922745704651
+    m_ClipIn: 0
+    m_Asset: {fileID: -644044793812257047}
+    m_Duration: 1.001156462585034
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -8106860943724561688}
+    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: 1501_shifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-7659608799592475919
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -24,9 +120,20 @@ MonoBehaviour:
   active: 1
   postPlayback: 2
   targetType: 2
-  LocationType: 2
+  LocationType: 0
   targetSpecialDotName: 
-  hitPointGroupName: 
+  randomGroup: 0
+  isUseRandom: 1
+  xoff:
+    x: -1
+    y: 1
+  yoff:
+    x: 0
+    y: 1
+  zoff:
+    x: 0
+    y: 1
+  hitPointGroupName: zdpos1
   isGround: 0
   isFollowTarget: 0
   isNotRotate: 0
@@ -84,6 +191,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: -8106860943724561688}
   - {fileID: -894447145330074657}
   - {fileID: -1223227800801429518}
   m_Clips: []
@@ -298,6 +406,23 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
+--- !u!114 &-644044793812257047
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: a6e9c16b9c72d9b4498f0ebc4e4720b4, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -346,6 +471,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 2
   targetSpecialDotName: 
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0

+ 118 - 1
Assets/Art/HeroTimeLine/gf_1502_timeline.playable

@@ -26,6 +26,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -75,6 +76,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos9
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -205,7 +207,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 0
+  m_Muted: 1
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -236,6 +238,7 @@ MonoBehaviour:
   m_Children:
   - {fileID: 8106544261917024806}
   - {fileID: -894447145330074657}
+  - {fileID: 3996403403132278053}
   - {fileID: -7242387571130488237}
   - {fileID: -1223227800801429518}
   m_Clips: []
@@ -566,6 +569,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -589,6 +593,119 @@ MonoBehaviour:
   intervalTime: 0
   isRoat: 0
   roatIndex: 0
+--- !u!114 &1792634877229559650
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: 33df1eefc7e82e540a3cd9b69f2cbbb3, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
+--- !u!114 &3996403403132278053
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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
+    m_ClipIn: 0
+    m_Asset: {fileID: 1792634877229559650}
+    m_Duration: 2.394285714285714
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 3996403403132278053}
+    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: 1502_shifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 136 - 0
Assets/Art/HeroTimeLine/gf_1504_timeline.playable

@@ -205,6 +205,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: -204364582155322864}
   - {fileID: -894447145330074657}
   m_Clips: []
   m_Markers:
@@ -284,6 +285,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -390,6 +402,102 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
+--- !u!114 &-204364582155322864
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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.1708744764328003
+    m_ClipIn: 0
+    m_Asset: {fileID: 9214389994294174862}
+    m_Duration: 1.001156462585034
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -204364582155322864}
+    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: 1501_shifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -560,6 +668,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -573,3 +692,20 @@ MonoBehaviour:
   intervalTime: 0
   isRoat: 0
   roatIndex: 0
+--- !u!114 &9214389994294174862
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: a6e9c16b9c72d9b4498f0ebc4e4720b4, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1

+ 4 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_1302.prefab

@@ -25210,7 +25210,9 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1302_hit
-  hitAudioName: 
+  startAudioName: 
+  hitAudioName: 1302_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -25229,7 +25231,7 @@ MonoBehaviour:
     isActive: 0
     controlPoints: []
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &7787953479833012104
 Rigidbody:
   m_ObjectHideFlags: 0

+ 3 - 1
Assets/Art/VFX/FXPrefabs/fx_gf_1401.prefab

@@ -14727,7 +14727,9 @@ MonoBehaviour:
   delayTime: 0.5
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_1401_hit
-  hitAudioName: 
+  startAudioName: 1401_feixing.wav
+  hitAudioName: 1401_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

+ 6 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_1402.prefab

@@ -1003,7 +1003,9 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1402_hit
-  hitAudioName: 
+  startAudioName: 
+  hitAudioName: 1401_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -1012,6 +1014,8 @@ MonoBehaviour:
   size: 1
   isInit: 0
   speed: 20
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 2
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -1024,7 +1028,7 @@ MonoBehaviour:
     - {x: 6.483411, y: -1.7293668, z: 6.2406206}
     - {x: 0, y: 0, z: 22.48019}
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!114 &677279902485292160
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 4 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_1403.prefab

@@ -19766,7 +19766,9 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1403_hit
-  hitAudioName: 
+  startAudioName: 1401_feixing.wav
+  hitAudioName: 1401_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -19785,7 +19787,7 @@ MonoBehaviour:
     isActive: 0
     controlPoints: []
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &6173720329783401279
 Rigidbody:
   m_ObjectHideFlags: 0

+ 3 - 1
Assets/Art/VFX/FXPrefabs/fx_gf_1502.prefab

@@ -34332,7 +34332,9 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1502_hit
-  hitAudioName: 
+  startAudioName: 1502_feixing.wav
+  hitAudioName: 1502_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 1

+ 9 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_huodao.prefab

@@ -4932,16 +4932,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0.5
   multipleTargetDelayTime: 0.2
   hitFxName: fx_gf_huoqiu_hit
-  hitAudioName: 
+  startAudioName: 1401_feixing.wav
+  hitAudioName: 1401_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
+  isNotMove: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
+  isInit: 0
   speed: 17
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 2
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -4954,7 +4961,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 &524253616770666635
 Rigidbody:
   m_ObjectHideFlags: 0

+ 9 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_huoqiu.prefab

@@ -19583,16 +19583,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_huoqiu_hit
-  hitAudioName: 
+  startAudioName: 1401_feixing.wav
+  hitAudioName: 1401_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
+  isNotMove: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
+  isInit: 0
   speed: 20
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -19601,7 +19608,7 @@ MonoBehaviour:
     isActive: 0
     controlPoints: []
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &72171431563227670
 Rigidbody:
   m_ObjectHideFlags: 0

+ 2 - 1
Assets/Art/VFX/FXPrefabs/fx_gf_muci.prefab

@@ -19649,7 +19649,8 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_muci_hit
-  hitAudioName: 
+  startAudioName: feijian.wav
+  hitAudioName: feijian_hit.wav
   pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0

+ 3 - 1
Assets/Art/VFX/FXPrefabs/fx_gf_tu_dashitou.prefab

@@ -9831,7 +9831,9 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0.4
   hitFxName: fx_gf_tu_dashitou_hit
-  hitAudioName: 
+  startAudioName: 1501_feixing.wav
+  hitAudioName: 1501_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

+ 3 - 1
Assets/Art/VFX/FXPrefabs/fx_gf_tu_tuci.prefab

@@ -5077,7 +5077,9 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_tu_tuci_hit
-  hitAudioName: 
+  startAudioName: 1501_feixing.wav
+  hitAudioName: 1501_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

+ 9 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_zhuzi.prefab

@@ -4932,16 +4932,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0.5
   multipleTargetDelayTime: 0.2
   hitFxName: fx_gf_zhuzi_hit
-  hitAudioName: 
+  startAudioName: feijian.wav
+  hitAudioName: feijian_hit.wav
+  pengZhuangHitFxName: 
   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: 
@@ -4954,7 +4961,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 &3321899013234357490
 Rigidbody:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.3
+    - _MainTexOffsetV: 0.21366626
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

+ 1 - 1
Assets/Art/VFX/Resources/refine.shadergraph.meta

@@ -7,4 +7,4 @@ ScriptedImporter:
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
+  script: {instanceID: 0}

+ 8 - 0
Assets/Res/Aduio/Skill/1302.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: W3pNtHmrAHsVwuP6s0rNIxFfXEpK3Ung6SCGv1J+qtsQBx2qCE377F777DIg
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1302/1302_hit.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1302/1302_hit.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XSlLsSv5BS2+fFcKYfhI/cTov27v5ILL+vNunVN1ByOgzUbE0WTaTxzgEckk
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1302/1302_shifang.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1302/1302_shifang.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CX4dtnj7AnmMVRYbauxcfvwDyVKRvLLEyq8uFamnCjpPE6mDXvEUEli4nu+7
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Res/Aduio/Skill/1401.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CH9OvH6uAi68/SzCX7IcXQyJON45DI8keq0ljxcjgMbwLcZvDaC5yDtsdapT
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1401/1401_feixing.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1401/1401_feixing.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: By8X4X//VnJUXazEDKaVzbXL/LHsUEvnhfywLPFtM+Xaady+LUZGHBccRMIu
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1401/1401_hit.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1401/1401_hit.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: W3JJt3utUy9BNajOM4dCSy5DxiImmB2UYaL+C7DVPOsb+yla9jbLs+9yr1JF
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1401/1401_shifa.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1401/1401_shifa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: Dn8es3/5UX8hXzz9otDGEGB8u/8Lbl8GQrW9UC5IOaJdXmckP9SQ+McbXMfI
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Res/Aduio/Skill/1402.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Di4Zsn6oUn7Q8ux3CQ3+qKVudwJuURhhOlJBIqFid9JEleehErvSeeuvomsp
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1402/1402_shifa.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1402/1402_shifa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: Dn5NvS3/BXrOrcf1zML209dRj57tf2WA/TSc/W+5yhZ54wfg0+n3Jkj744SW
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Res/Aduio/Skill/1403.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CXlNsSj7W3yFY86wmgKsqDG1+na1IgIy7reOz8iKrB3eQO0FbzxX9W1gQKM7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1403/1403_shifa.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1403/1403_shifa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: BnkWvSqtUn+uxzz+cPqykrpBrpXE/M/8RKWUTvuNKDhLXXVw5s/MDvRYRfeu
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Res/Aduio/Skill/1501.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WnlL5nusUXhIlJZLuWhi6cyytT5AnFHphu5WWfXigpkcYv+OWNB1DKxMhJgp
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1501/1501_feixing.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1501/1501_feixing.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WnkZvSqkVX/1RWBZzbJawUyQWkdA2DNv22+abkAz1ZQtQ3Dae2rbZGs4Zvtb
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1501/1501_hit.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1501/1501_hit.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: DH8c4yv5UHiT5+s1+b/cHaecHaivtTzrqkW1sDUs9aFETh39op/Y3DouOk8o
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1501/1501_shifa.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1501/1501_shifa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XnxKvHmsVSmn4P/xb02vMb6KxjRGQlPWp2ZPGftdP2hfSar/yS84MIQlaXGI
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Res/Aduio/Skill/1502.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CikXtXz/V3Mn7B5c1YfR4CONLsP7skxEzkNnvgFsL9xfCd+3v8Y+pBOtA6dT
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1502/1502_feixing.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1502/1502_feixing.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CHIZsi2sWin/jjevXM0RjYZ6wSN8xiWoCoI2sKC7C+KmVX1iehFlKENZBllK
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1502/1502_hit.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1502/1502_hit.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CXhOsH//W3zmQudsLOcHO/IktNIzLQFWD6ryvjhACQb3eG82hCgaUDmAYGTg
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Res/Aduio/Skill/1502/1502_shifa.wav


+ 23 - 0
Assets/Res/Aduio/Skill/1502/1502_shifa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: DHlL4yv4Bi1umioEfM3JKYOTFFRd2Y72InJnJQBZaHdhOHVA0d9SUHGFSZrc
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

文件差异内容过多而无法显示
+ 0 - 0
Assets/Res/TimeLineAssets/1302_timeline_TD.txt


+ 1 - 1
Assets/Res/TimeLineAssets/1304_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1304_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_zhuzi\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1304_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1304_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_zhuzi\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1304_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

+ 1 - 1
Assets/Res/TimeLineAssets/1305_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1305_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_muci\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1305_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1305_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_muci\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1305_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

文件差异内容过多而无法显示
+ 0 - 0
Assets/Res/TimeLineAssets/1401_timeline_TD.txt


文件差异内容过多而无法显示
+ 0 - 0
Assets/Res/TimeLineAssets/1402_timeline_TD.txt


文件差异内容过多而无法显示
+ 0 - 0
Assets/Res/TimeLineAssets/1403_timeline_TD.txt


+ 1 - 1
Assets/Res/TimeLineAssets/1404_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1404_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huoqiu\",\"randomSeed\":518,\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1404_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1404_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"1401_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":2.155692,\"continuedTime\":2.155692,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huoqiu\",\"randomSeed\":518,\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1404_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

+ 1 - 1
Assets/Res/TimeLineAssets/1405_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1405_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huodao\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1405_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1405_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"feijian_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.5170975,\"continuedTime\":0.5170975,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huodao\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1405_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

文件差异内容过多而无法显示
+ 0 - 0
Assets/Res/TimeLineAssets/1501_timeline_TD.txt


文件差异内容过多而无法显示
+ 0 - 0
Assets/Res/TimeLineAssets/1502_timeline_TD.txt


文件差异内容过多而无法显示
+ 0 - 0
Assets/Res/TimeLineAssets/1504_timeline_TD.txt


文件差异内容过多而无法显示
+ 0 - 0
Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt


+ 3 - 4
Assets/Scripts/GameLogic/Combat/Skill/S1501.cs

@@ -30,11 +30,10 @@ 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)));
+                // 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);
+                ActivationTimeLineData("1501_fashe", currTarget: currTarget, indexCount: i,startTime:i*-0.1f);
             }
         }
 

部分文件因为文件数量过多而无法显示