Browse Source

修改部分功法

LT 1 week ago
parent
commit
a15332a7fb
86 changed files with 191 additions and 465 deletions
  1. 12 12
      Assets/Art/HeroTimeLine/gf_1204_timeline.playable
  2. 12 12
      Assets/Art/HeroTimeLine/gf_1205_timeline.playable
  3. 13 13
      Assets/Art/HeroTimeLine/gf_1304_timeline.playable
  4. 13 37
      Assets/Art/HeroTimeLine/gf_1305_timeline.playable
  5. 1 1
      Assets/Art/HeroTimeLine/gf_1404_timeline.playable
  6. 1 1
      Assets/Art/HeroTimeLine/gf_1405_timeline.playable
  7. 3 3
      Assets/Art/HeroTimeLine/gf_1504_timeline.playable
  8. 12 12
      Assets/Art/HeroTimeLine/gf_1505_timeline.playable
  9. 1 1
      Assets/Art/VFX/FXMeshs/fxwuqi/fx_shuzi.mat
  10. 1 1
      Assets/Art/VFX/FXMeshs/fxwuqi/fx_zhuzi.mat
  11. 8 8
      Assets/Art/VFX/FXPrefabs/fx_gf_bingdao.prefab
  12. 3 3
      Assets/Art/VFX/FXPrefabs/fx_gf_bingdao_hit.prefab
  13. 3 3
      Assets/Art/VFX/FXPrefabs/fx_gf_muci.prefab
  14. 10 10
      Assets/Art/VFX/FXPrefabs/fx_gf_shuiqiu.prefab
  15. 4 4
      Assets/Art/VFX/FXPrefabs/fx_gf_shuiqiu_hit.prefab
  16. 6 6
      Assets/Art/VFX/FXPrefabs/fx_gf_tu_dashitou.prefab
  17. 3 3
      Assets/Art/VFX/FXPrefabs/fx_gf_tu_dashitou_chuxian.prefab
  18. 30 48
      Assets/Art/VFX/FXPrefabs/fx_gf_tu_dashitou_hit.prefab
  19. 8 8
      Assets/Art/VFX/FXPrefabs/fx_gf_tu_xiaoshitou.prefab
  20. 2 2
      Assets/Art/VFX/FXPrefabs/fx_gf_tu_xiaoshitou_hit.prefab
  21. 9 9
      Assets/Art/VFX/FXPrefabs/fx_gf_zhuzi.prefab
  22. 3 3
      Assets/Art/VFX/FXPrefabs/fx_gf_zhuzi_hit.prefab
  23. 12 237
      Assets/Art/cs3.scene
  24. 0 0
      Assets/Res/TimeLineAssets/1101_timeline_TD.txt
  25. 0 0
      Assets/Res/TimeLineAssets/1102_timeline_TD.txt
  26. 0 0
      Assets/Res/TimeLineAssets/1103_timeline_TD.txt
  27. 1 1
      Assets/Res/TimeLineAssets/1104_timeline_TD.txt
  28. 1 1
      Assets/Res/TimeLineAssets/1105_timeline_TD.txt
  29. 1 1
      Assets/Res/TimeLineAssets/1201_timeline_TD.txt
  30. 0 0
      Assets/Res/TimeLineAssets/1202_timeline_TD.txt
  31. 1 1
      Assets/Res/TimeLineAssets/1204_timeline_TD.txt
  32. 1 1
      Assets/Res/TimeLineAssets/1205_timeline_TD.txt
  33. 1 1
      Assets/Res/TimeLineAssets/1301_timeline_TD.txt
  34. 0 0
      Assets/Res/TimeLineAssets/1302_timeline_TD.txt
  35. 1 1
      Assets/Res/TimeLineAssets/1304_timeline_TD.txt
  36. 1 1
      Assets/Res/TimeLineAssets/1305_timeline_TD.txt
  37. 0 0
      Assets/Res/TimeLineAssets/1401_timeline_TD.txt
  38. 0 0
      Assets/Res/TimeLineAssets/1402_timeline_TD.txt
  39. 0 0
      Assets/Res/TimeLineAssets/1403_timeline_TD.txt
  40. 1 1
      Assets/Res/TimeLineAssets/1404_timeline_TD.txt
  41. 1 1
      Assets/Res/TimeLineAssets/1405_timeline_TD.txt
  42. 0 0
      Assets/Res/TimeLineAssets/1501_timeline_TD.txt
  43. 0 0
      Assets/Res/TimeLineAssets/1502_timeline_TD.txt
  44. 0 0
      Assets/Res/TimeLineAssets/1504_timeline_TD.txt
  45. 1 1
      Assets/Res/TimeLineAssets/1505_timeline_TD.txt
  46. 1 1
      Assets/Res/TimeLineAssets/2008_timeline_TD.txt
  47. 1 1
      Assets/Res/TimeLineAssets/Boss01_TD.txt
  48. 0 0
      Assets/Res/TimeLineAssets/BossSk1_timeline_TD.txt
  49. 0 0
      Assets/Res/TimeLineAssets/BossSk2_timeline_TD.txt
  50. 0 0
      Assets/Res/TimeLineAssets/BossSk4_timeline_TD.txt
  51. 0 0
      Assets/Res/TimeLineAssets/Boss_BeiHaiGui_TD.txt
  52. 0 0
      Assets/Res/TimeLineAssets/Boss_QiongQi_TD.txt
  53. 0 0
      Assets/Res/TimeLineAssets/Boss_ShuGuai_TD.txt
  54. 0 0
      Assets/Res/TimeLineAssets/Boss_Tree_TD.txt
  55. 0 0
      Assets/Res/TimeLineAssets/Boss_Tree_xiao_TD.txt
  56. 0 0
      Assets/Res/TimeLineAssets/Boss_fenghuang_TD.txt
  57. 1 1
      Assets/Res/TimeLineAssets/Guixiu01_TD.txt
  58. 1 1
      Assets/Res/TimeLineAssets/Gw_Man_TD.txt
  59. 1 1
      Assets/Res/TimeLineAssets/Gw_Woman_TD.txt
  60. 0 0
      Assets/Res/TimeLineAssets/Gw_zhizhu_TD.txt
  61. 1 1
      Assets/Res/TimeLineAssets/Nanzhu_TD.txt
  62. 0 0
      Assets/Res/TimeLineAssets/fb_3101_TD.txt
  63. 0 0
      Assets/Res/TimeLineAssets/fb_3202_TD.txt
  64. 0 0
      Assets/Res/TimeLineAssets/fb_3203_TD.txt
  65. 0 0
      Assets/Res/TimeLineAssets/fb_3302_TD.txt
  66. 0 0
      Assets/Res/TimeLineAssets/fb_3401_TD.txt
  67. 0 0
      Assets/Res/TimeLineAssets/fb_3402_TD.txt
  68. 0 0
      Assets/Res/TimeLineAssets/fb_BossPing_TD.txt
  69. 0 0
      Assets/Res/TimeLineAssets/fb_dao1_TD.txt
  70. 0 0
      Assets/Res/TimeLineAssets/fb_ding1_TD.txt
  71. 0 0
      Assets/Res/TimeLineAssets/fb_feicuihulu_TD.txt
  72. 0 0
      Assets/Res/TimeLineAssets/fb_huohulu_TD.txt
  73. 0 0
      Assets/Res/TimeLineAssets/fb_jian1_TD.txt
  74. 0 0
      Assets/Res/TimeLineAssets/fb_jian2_TD.txt
  75. 0 0
      Assets/Res/TimeLineAssets/fb_linglongta_TD.txt
  76. 0 0
      Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt
  77. 0 0
      Assets/Res/TimeLineAssets/fb_xuanguidun_TD.txt
  78. 0 0
      Assets/Res/TimeLineAssets/fb_yuping_TD.txt
  79. 1 1
      Assets/Res/TimeLineAssets/gf_mozhan_timeline_TD.txt
  80. 0 0
      Assets/Res/TimeLineAssets/gw_huli_TD.txt
  81. 0 0
      Assets/Res/TimeLineAssets/gw_xianhe_TD.txt
  82. 0 0
      Assets/Res/TimeLineAssets/jianjue_timeline_TD.txt
  83. 0 0
      Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt
  84. 1 1
      Assets/Res/TimeLineAssets/timeline_TD.txt
  85. 0 7
      Assets/StreamingAssets/assetBundle.zip.meta
  86. 2 2
      UserSettings/EditorUserSettings.asset

+ 12 - 12
Assets/Art/HeroTimeLine/gf_1204_timeline.playable

@@ -25,18 +25,18 @@ MonoBehaviour:
   postPlayback: 2
   targetType: 2
   LocationType: 5
-  targetSpecialDotName: zdpos9
+  targetSpecialDotName: zdpos1
   randomGroup: 0
-  isUseRandom: 0
+  isUseRandom: 1
   xoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   yoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   zoff:
-    x: 0
-    y: 0
+    x: 0.5
+    y: -0.5
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -88,7 +88,7 @@ MonoBehaviour:
   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_Clip: {fileID: 1827226128182048838, guid: da64dad2561f5ad40ad6a0ee04fd8862, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -148,7 +148,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 1
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0
@@ -388,7 +388,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -4686349789103776704}
-    m_Duration: 1
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8106544261917024806}
     m_EaseInDuration: 0
@@ -520,7 +520,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.3999999999999999
+    m_Start: 0.8
     m_ClipIn: 0
     m_Asset: {fileID: -8648936006479847121}
     m_Duration: 1

+ 12 - 12
Assets/Art/HeroTimeLine/gf_1205_timeline.playable

@@ -38,7 +38,7 @@ MonoBehaviour:
   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_Clip: {fileID: 1827226128182048838, guid: da64dad2561f5ad40ad6a0ee04fd8862, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -100,7 +100,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0
@@ -255,18 +255,18 @@ MonoBehaviour:
   postPlayback: 2
   targetType: 2
   LocationType: 0
-  targetSpecialDotName: zdpos9
+  targetSpecialDotName: zdpos1
   randomGroup: 0
-  isUseRandom: 0
+  isUseRandom: 1
   xoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   yoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   zoff:
-    x: 0
-    y: 0
+    x: 0.5
+    y: -0.5
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -410,7 +410,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.3999999999999999
+    m_Start: 0.8
     m_ClipIn: 0
     m_Asset: {fileID: 3298053661483317591}
     m_Duration: 1
@@ -505,7 +505,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -4686349789103776704}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8106544261917024806}
     m_EaseInDuration: 0

+ 13 - 13
Assets/Art/HeroTimeLine/gf_1304_timeline.playable

@@ -78,7 +78,7 @@ MonoBehaviour:
   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_Clip: {fileID: 1827226128182048838, guid: da64dad2561f5ad40ad6a0ee04fd8862, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -115,18 +115,18 @@ MonoBehaviour:
   postPlayback: 2
   targetType: 2
   LocationType: 0
-  targetSpecialDotName: zdpos9
+  targetSpecialDotName: zdpos1
   randomGroup: 0
-  isUseRandom: 0
+  isUseRandom: 1
   xoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   yoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   zoff:
-    x: 0
-    y: 0
+    x: 0.5
+    y: -0.5
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -187,7 +187,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.3999999999999999
+    m_Start: 0.8
     m_ClipIn: 0
     m_Asset: {fileID: -4298024269844489681}
     m_Duration: 1
@@ -282,7 +282,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0
@@ -409,7 +409,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -4686349789103776704}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8106544261917024806}
     m_EaseInDuration: 0
@@ -473,7 +473,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: attack1
+    m_DisplayName: attack5
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0

+ 13 - 37
Assets/Art/HeroTimeLine/gf_1305_timeline.playable

@@ -38,7 +38,7 @@ MonoBehaviour:
   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_Clip: {fileID: 1827226128182048838, guid: da64dad2561f5ad40ad6a0ee04fd8862, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -75,18 +75,18 @@ MonoBehaviour:
   postPlayback: 2
   targetType: 2
   LocationType: 0
-  targetSpecialDotName: zdpos9
+  targetSpecialDotName: zdpos1
   randomGroup: 0
-  isUseRandom: 0
+  isUseRandom: 1
   xoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   yoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   zoff:
-    x: 0
-    y: 0
+    x: 0.5
+    y: -0.5
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -125,7 +125,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0
@@ -328,29 +328,6 @@ MonoBehaviour:
     volume: 1
     stereoPan: 0
     spatialBlend: 0
---- !u!114 &2811424835076340321
-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: 8671022006834208387}
-  m_Children: []
-  m_Clips: []
-  m_Markers:
-    m_Objects: []
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -385,7 +362,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.3999999999999999
+    m_Start: 0.8
     m_ClipIn: 0
     m_Asset: {fileID: -3545846702826145013}
     m_Duration: 1
@@ -480,7 +457,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -4686349789103776704}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8106544261917024806}
     m_EaseInDuration: 0
@@ -544,7 +521,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: attack1
+    m_DisplayName: attack5
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -586,7 +563,6 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 7085209051080327398}
-  - {fileID: 2811424835076340321}
   m_Clips: []
   m_Markers:
     m_Objects: []

+ 1 - 1
Assets/Art/HeroTimeLine/gf_1404_timeline.playable

@@ -68,7 +68,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 1
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0

+ 1 - 1
Assets/Art/HeroTimeLine/gf_1405_timeline.playable

@@ -125,7 +125,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0

+ 3 - 3
Assets/Art/HeroTimeLine/gf_1504_timeline.playable

@@ -22,7 +22,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.6333333333333333
+    m_Start: 0.6
     m_ClipIn: 0
     m_Asset: {fileID: 8640498369755309592}
     m_Duration: 1
@@ -334,7 +334,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 0.9333333333333333
+    m_Duration: 0.8
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0
@@ -557,7 +557,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -4686349789103776704}
-    m_Duration: 0.9333333333333333
+    m_Duration: 0.8
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8106544261917024806}
     m_EaseInDuration: 0

+ 12 - 12
Assets/Art/HeroTimeLine/gf_1505_timeline.playable

@@ -48,19 +48,19 @@ MonoBehaviour:
   active: 1
   postPlayback: 2
   targetType: 2
-  LocationType: 0
-  targetSpecialDotName: zdpos9
+  LocationType: 5
+  targetSpecialDotName: zdpos1
   randomGroup: 0
   isUseRandom: 1
   xoff:
-    x: -1
-    y: 1
+    x: 1.5
+    y: -1.5
   yoff:
-    x: 0
-    y: 1
+    x: 1.5
+    y: -1.5
   zoff:
-    x: 0
-    y: 0
+    x: 0.5
+    y: -0.5
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -112,7 +112,7 @@ MonoBehaviour:
   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_Clip: {fileID: 1827226128182048838, guid: da64dad2561f5ad40ad6a0ee04fd8862, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -146,7 +146,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.3999999999999999
+    m_Start: 0.8
     m_ClipIn: 0
     m_Asset: {fileID: -6105229194439621245}
     m_Duration: 1
@@ -241,7 +241,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0
@@ -464,7 +464,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -4686349789103776704}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8106544261917024806}
     m_EaseInDuration: 0

+ 1 - 1
Assets/Art/VFX/FXMeshs/fxwuqi/fx_shuzi.mat

@@ -168,7 +168,7 @@ Material:
     - _Emission: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _FresnelColor: {r: 33.579033, g: 6.9554915, b: 1.764935, a: 0}
-    - _MainColor: {r: 0.22822213, g: 1.2984034, b: 0.11724121, a: 0}
+    - _MainColor: {r: 0.15320326, g: 0.8207546, b: 0.08517256, a: 0}
     - _Main_Color: {r: 0.48295742, g: 1.8777702, b: 0.33151996, a: 1}
     - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
     - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}

+ 1 - 1
Assets/Art/VFX/FXMeshs/fxwuqi/fx_zhuzi.mat

@@ -168,7 +168,7 @@ Material:
     - _Emission: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _FresnelColor: {r: 33.579033, g: 6.9554915, b: 1.764935, a: 0}
-    - _MainColor: {r: 1.9948136, g: 3.1374662, b: 1.60256, a: 0}
+    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
     - _Main_Color: {r: 0.48295742, g: 1.8777702, b: 0.33151996, a: 1}
     - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
     - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}

+ 8 - 8
Assets/Art/VFX/FXPrefabs/fx_gf_bingdao.prefab

@@ -4868,7 +4868,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 3
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -9890,7 +9890,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.4
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -14886,8 +14886,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0.5
-  multipleTargetDelayTime: 0.2
+  delayTime: 0.1
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_bingdao_hit
   startAudioName: feijian.wav
   hitAudioName: feijian_hit.wav
@@ -14899,10 +14899,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 17
+  speed: 18
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 2
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 1
@@ -19801,7 +19801,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24693,7 +24693,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0

+ 3 - 3
Assets/Art/VFX/FXPrefabs/fx_gf_bingdao_hit.prefab

@@ -9778,7 +9778,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14679,7 +14679,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14739,7 +14739,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3149071213132107113}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.9, y: -0.95000076, z: 4.26}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0

+ 3 - 3
Assets/Art/VFX/FXPrefabs/fx_gf_muci.prefab

@@ -19646,7 +19646,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0
+  delayTime: 0.1
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_muci_hit
   startAudioName: feijian.wav
@@ -19659,10 +19659,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 13
+  speed: 18
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 2
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 1

+ 10 - 10
Assets/Art/VFX/FXPrefabs/fx_gf_shuiqiu.prefab

@@ -4801,7 +4801,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -4911,7 +4911,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.4
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -5011,7 +5011,7 @@ Transform:
   - {fileID: 8965073897359312606}
   - {fileID: 1289933725777297600}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &2347296082923951403
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -9846,8 +9846,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0
-  multipleTargetDelayTime: 0
+  delayTime: 0.1
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_shuiqiu_hit
   startAudioName: 1202_fashe.wav
   hitAudioName: feijian_hit.wav
@@ -9859,10 +9859,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 15
+  speed: 18
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 1
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 0
@@ -14739,7 +14739,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -19576,7 +19576,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24477,7 +24477,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 5
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

+ 4 - 4
Assets/Art/VFX/FXPrefabs/fx_gf_shuiqiu_hit.prefab

@@ -4946,7 +4946,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3584718080304953291}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.38, y: -1.38, z: 0.77}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -19577,7 +19577,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -29433,7 +29433,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -34334,7 +34334,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

+ 6 - 6
Assets/Art/VFX/FXPrefabs/fx_gf_tu_dashitou.prefab

@@ -4859,7 +4859,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -4922,7 +4922,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 763203834398548103}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -1, y: -0.795, z: 1.18}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -9841,10 +9841,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 15
+  speed: 16
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 2
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 1
@@ -9961,7 +9961,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.5
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -29584,7 +29584,7 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 1442426473
+  m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 1
   m_RenderMode: 0

+ 3 - 3
Assets/Art/VFX/FXPrefabs/fx_gf_tu_dashitou_chuxian.prefab

@@ -9751,7 +9751,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14641,7 +14641,7 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 1442426473
+  m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 1
   m_RenderMode: 0
@@ -14703,7 +14703,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6888923829218698599}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -1, y: -0.795, z: 0.58}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0

+ 30 - 48
Assets/Art/VFX/FXPrefabs/fx_gf_tu_dashitou_hit.prefab

@@ -752,7 +752,7 @@ ParticleSystem:
     sphericalDirectionAmount: 0
     randomPositionAmount: 0
     radius:
-      value: 0.0001
+      value: 0.5
       mode: 0
       spread: 0
       speed:
@@ -5189,7 +5189,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.7
+      scalar: 1
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -12491,7 +12491,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.2
+    dampen: 0.15
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -14721,7 +14721,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5622319895006946880}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -1.12, y: -0.9, z: 5.57}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -20639,28 +20639,19 @@ ParticleSystem:
         m_Curve:
         - serializedVersion: 3
           time: 0
-          value: 0.43704224
+          value: 0.7702713
           inSlope: 0
-          outSlope: 0.98901635
-          tangentMode: 69
+          outSlope: 0
+          tangentMode: 0
           weightedMode: 0
           inWeight: 0
           outWeight: 0
-        - serializedVersion: 3
-          time: 0.40168327
-          value: 0.8343136
-          inSlope: 0.98901635
-          outSlope: 0.27692094
-          tangentMode: 69
-          weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.33333334
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0.27692094
-          outSlope: -2
-          tangentMode: 69
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
           weightedMode: 0
           inWeight: 0
           outWeight: 0
@@ -24461,7 +24452,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24664,8 +24655,8 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 20
-      minScalar: 5
+      scalar: 40
+      minScalar: 20
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -24782,7 +24773,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 2
+      scalar: 1.5
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -25106,7 +25097,7 @@ ParticleSystem:
     gravityModifier:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.2
+      scalar: 0.3
       minScalar: 0
       maxCurve:
         serializedVersion: 2
@@ -25541,8 +25532,8 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 1
-          inSlope: -2
-          outSlope: -2
+          inSlope: 0
+          outSlope: 0
           tangentMode: 0
           weightedMode: 0
           inWeight: 0
@@ -27156,7 +27147,7 @@ ParticleSystem:
     magnitude:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.1
+      scalar: 1
       minScalar: 0.1
       maxCurve:
         serializedVersion: 2
@@ -27210,7 +27201,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.2
+    dampen: 0.25
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -29388,7 +29379,7 @@ ParticleSystemRenderer:
   m_MaxParticleSize: 5
   m_CameraVelocityScale: 0
   m_VelocityScale: 0
-  m_LengthScale: 2
+  m_LengthScale: 1
   m_SortingFudge: 0
   m_NormalDirection: 1
   m_ShadowBias: 0
@@ -30459,31 +30450,22 @@ ParticleSystem:
         m_Curve:
         - serializedVersion: 3
           time: 0
-          value: 0.33016145
-          inSlope: 2
-          outSlope: 2.650415
-          tangentMode: 69
-          weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.33333334
-        - serializedVersion: 3
-          time: 0.22335824
-          value: 0.9221535
-          inSlope: 2.650415
-          outSlope: 0.1002348
-          tangentMode: 69
+          value: 0.6486511
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
           weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.33333334
+          inWeight: 0
+          outWeight: 0
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0.1002348
+          inSlope: 0
           outSlope: 0
-          tangentMode: 69
+          tangentMode: 0
           weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.33333334
+          inWeight: 0
+          outWeight: 0
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4

+ 8 - 8
Assets/Art/VFX/FXPrefabs/fx_gf_tu_xiaoshitou.prefab

@@ -77,7 +77,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.5
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -170,7 +170,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1799151367647923245}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -1.137, y: 0.82, z: 8.08}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -5074,8 +5074,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0
-  multipleTargetDelayTime: 0
+  delayTime: 0.1
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_tu_xiaoshitou_hit
   startAudioName: 1505_feixing.wav
   hitAudioName: 1505_hit.wav
@@ -5087,10 +5087,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 9
+  speed: 18
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 2
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 1
@@ -9987,7 +9987,7 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 1442426473
+  m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 1
   m_RenderMode: 0
@@ -14881,7 +14881,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

+ 2 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_tu_xiaoshitou_hit.prefab

@@ -9829,7 +9829,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -9889,7 +9889,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2287700352512132330}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -1.12, y: -0.9, z: 10.94}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0

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

@@ -30,7 +30,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4012674967958436802}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.958, y: -1.469, z: 2.02}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -4933,8 +4933,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0.5
-  multipleTargetDelayTime: 0.2
+  delayTime: 0.1
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_zhuzi_hit
   startAudioName: feijian.wav
   hitAudioName: feijian_hit.wav
@@ -4946,10 +4946,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 15
+  speed: 18
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 2
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 1
@@ -9857,7 +9857,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 3
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14749,7 +14749,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14810,7 +14810,7 @@ Transform:
   m_GameObject: {fileID: 6940019122759254771}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: -0, z: -0.17}
+  m_LocalPosition: {x: 0, y: 0.02, z: -0.17}
   m_LocalScale: {x: 0.71716, y: 0.84416753, z: 0.71716}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -19769,7 +19769,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.4
   m_PreviewTimeScale: 1
   m_Parameters:

+ 3 - 3
Assets/Art/VFX/FXPrefabs/fx_gf_zhuzi_hit.prefab

@@ -9751,7 +9751,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -19571,7 +19571,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -19631,7 +19631,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6878692311186764286}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.9, y: -0.95000076, z: 7.45}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0

File diff suppressed because it is too large
+ 12 - 237
Assets/Art/cs3.scene


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1101_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1102_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1103_timeline_TD.txt


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

@@ -1 +1 @@
-{"timeLineName":"1104_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0.2333333,\"endTime\":1.09898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1104\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":1.5,\"y\":-1.5},\"yoff\":{\"x\":1.5,\"y\":-1.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1104_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1104_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0.2333333,\"endTime\":1.09898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1104\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":1.5,\"y\":-1.5},\"yoff\":{\"x\":1.5,\"y\":-1.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1104_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

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

@@ -1 +1 @@
-{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0.2833333,\"endTime\":1.14898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":2,\"y\":-2},\"yoff\":{\"x\":2,\"y\":-2},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1105_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0.2833333,\"endTime\":1.14898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":2,\"y\":-2},\"yoff\":{\"x\":2,\"y\":-2},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1105_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

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

@@ -1 +1 @@
-{"timeLineName":"1201_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingzhui\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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\":\"1201_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1201_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1201_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingzhui\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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\":\"1201_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1201_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1202_timeline_TD.txt


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

@@ -1 +1 @@
-{"timeLineName":"1204_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_shuiqiu\",\"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\":\"1204_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1204_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1204_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_shuiqiu\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":1.5,\"y\":-1.5},\"yoff\":{\"x\":1.5,\"y\":-1.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1204_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

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

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

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

@@ -1 +1 @@
-{"timeLineName":"1301_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_duzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"0\",\"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\":\"1301_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1301_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1301_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_duzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"0\",\"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\":\"1301_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1301_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

File diff suppressed because it is too large
+ 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","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}}
+{"timeLineName":"1304_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"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\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_zhuzi\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":1.5,\"y\":-1.5},\"yoff\":{\"x\":1.5,\"y\":-1.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1304_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

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

@@ -1 +1 @@
-{"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}}
+{"timeLineName":"1305_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"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\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_muci\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":1.5,\"y\":-1.5},\"yoff\":{\"x\":1.5,\"y\":-1.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1305_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1401_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1402_timeline_TD.txt


File diff suppressed because it is too large
+ 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","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"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\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":2,\"y\":-2},\"yoff\":{\"x\":2,\"y\":-2},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"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\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"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.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huoqiu\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":2,\"y\":-2},\"yoff\":{\"x\":2,\"y\":-2},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1404_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

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

@@ -1 +1 @@
-{"timeLineName":"1405_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"feijian_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0.7,\"endTime\":1.217098,\"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\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":2,\"y\":-2},\"yoff\":{\"x\":2,\"y\":-2},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"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\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"feijian_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0.7,\"endTime\":1.217098,\"continuedTime\":0.5170975,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huodao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":2,\"y\":-2},\"yoff\":{\"x\":2,\"y\":-2},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1405_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1501_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1502_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1504_timeline_TD.txt


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

@@ -1 +1 @@
-{"timeLineName":"1505_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","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}","{\"audioName\":\"1501_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.001156,\"continuedTime\":1.001156,\"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,\"isUseRandom\":true,\"xoff\":{\"x\":-1,\"y\":1},\"yoff\":{\"x\":0,\"y\":1},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":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}}
+{"timeLineName":"1505_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"1501_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.001156,\"continuedTime\":1.001156,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_xiaoshitou\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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\":true,\"xoff\":{\"x\":1.5,\"y\":-1.5},\"yoff\":{\"x\":1.5,\"y\":-1.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1505_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

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

@@ -1 +1 @@
-{"timeLineName":"2008_timeline","key":["TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_2008\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos3\",\"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\":\"2008\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"2008_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"2008_timeline","key":["TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_2008\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos3\",\"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\":\"2008\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"2008_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

+ 1 - 1
Assets/Res/TimeLineAssets/Boss01_TD.txt

@@ -1 +1 @@
-{"timeLineName":"Boss01","key":["TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"idle\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"idle\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Boss01","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"Boss01","key":["TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"idle\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"idle\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Boss01","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/BossSk1_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/BossSk2_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/BossSk4_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_BeiHaiGui_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_QiongQi_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_ShuGuai_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_Tree_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_Tree_xiao_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_fenghuang_TD.txt


+ 1 - 1
Assets/Res/TimeLineAssets/Guixiu01_TD.txt

@@ -1 +1 @@
-{"timeLineName":"Guixiu01","key":["TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"idle\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"idle\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.333333,\"continuedTime\":1.333333,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Guixiu01","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"Guixiu01","key":["TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"idle\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"idle\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.333333,\"continuedTime\":1.333333,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Guixiu01","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

+ 1 - 1
Assets/Res/TimeLineAssets/Gw_Man_TD.txt

@@ -1 +1 @@
-{"timeLineName":"Gw_Man","key":["TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"gj1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"gj1\",\"isActivity\":true,\"startTime\":0,\"endTime\":1.666667,\"continuedTime\":1.666667,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"gj2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"g2\",\"isActivity\":true,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"sk1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"sk1\",\"isActivity\":true,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"sk2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"sk2\",\"isActivity\":true,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Gw_Man","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"Gw_Man","key":["TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"gj1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"gj1\",\"isActivity\":true,\"startTime\":0,\"endTime\":1.666667,\"continuedTime\":1.666667,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"gj2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"g2\",\"isActivity\":true,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"sk1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"sk1\",\"isActivity\":true,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"sk2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"sk2\",\"isActivity\":true,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Gw_Man","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

+ 1 - 1
Assets/Res/TimeLineAssets/Gw_Woman_TD.txt

@@ -1 +1 @@
-{"timeLineName":"Gw_Woman","key":["TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"gj1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"gj1\",\"isActivity\":true,\"startTime\":0,\"endTime\":1.2,\"continuedTime\":1.2,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"gj2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"gj2\",\"isActivity\":true,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Gw_Woman","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"Gw_Woman","key":["TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"gj1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"gj1\",\"isActivity\":true,\"startTime\":0,\"endTime\":1.2,\"continuedTime\":1.2,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"gj2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"gj2\",\"isActivity\":true,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Gw_Woman","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Gw_zhizhu_TD.txt


+ 1 - 1
Assets/Res/TimeLineAssets/Nanzhu_TD.txt

@@ -1 +1 @@
-{"timeLineName":"Nanzhu","key":["TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"idle\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"idle\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Nanzhu","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"Nanzhu","key":["TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"idle\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"idle\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Nanzhu","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3101_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3202_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3203_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3302_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3401_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3402_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_BossPing_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_dao1_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_ding1_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_feicuihulu_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_huohulu_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_jian1_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_jian2_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_linglongta_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_xuanguidun_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/fb_yuping_TD.txt


+ 1 - 1
Assets/Res/TimeLineAssets/gf_mozhan_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"gf_mozhan_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_mozhan\",\"randomSeed\":382,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0.3166667,\"endTime\":1.316667,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"gf_mozhan_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"gf_mozhan_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_mozhan\",\"randomSeed\":382,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0.3166667,\"endTime\":1.316667,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"gf_mozhan_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/gw_huli_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/gw_xianhe_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/jianjue_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt


+ 1 - 1
Assets/Res/TimeLineAssets/timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"timeline","key":[],"value":[],"heroName":"timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"timeline","key":[],"value":[],"heroName":"timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

+ 0 - 7
Assets/StreamingAssets/assetBundle.zip.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 2
UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 540803075206595a085d5c7241260e4415164b722a2922647d2a4a62e6b3676c
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

Some files were not shown because too many files changed in this diff