Browse Source

修改功法效果

DESKTOP-FB72PO8\Administrator 4 ngày trước cách đây
mục cha
commit
34751869d6
53 tập tin đã thay đổi với 184 bổ sung49 xóa
  1. 12 6
      Assets/Art/HeroTimeLine/gf_1103_timeline.playable
  2. 2 2
      Assets/Art/VFX/FXPrefabs/fx_gf1103_sf.prefab
  3. 46 10
      Assets/Art/VFX/FXPrefabs/fx_gf_1103.prefab
  4. 56 0
      Assets/Res/HeroAnimtion/Nanzhu.asset
  5. 0 0
      Assets/Res/TimeLineAssets/1101_timeline_TD.txt
  6. 1 1
      Assets/Res/TimeLineAssets/1102_timeline_TD.txt
  7. 0 0
      Assets/Res/TimeLineAssets/1103_timeline_TD.txt
  8. 1 1
      Assets/Res/TimeLineAssets/1104_timeline_TD.txt
  9. 1 1
      Assets/Res/TimeLineAssets/1105_timeline_TD.txt
  10. 1 1
      Assets/Res/TimeLineAssets/1201_timeline_TD.txt
  11. 0 0
      Assets/Res/TimeLineAssets/1202_timeline_TD.txt
  12. 1 1
      Assets/Res/TimeLineAssets/1204_timeline_TD.txt
  13. 1 1
      Assets/Res/TimeLineAssets/1205_timeline_TD.txt
  14. 1 1
      Assets/Res/TimeLineAssets/1301_timeline_TD.txt
  15. 1 1
      Assets/Res/TimeLineAssets/1304_timeline_TD.txt
  16. 1 1
      Assets/Res/TimeLineAssets/1305_timeline_TD.txt
  17. 0 0
      Assets/Res/TimeLineAssets/1401_timeline_TD.txt
  18. 0 0
      Assets/Res/TimeLineAssets/1402_timeline_TD.txt
  19. 1 1
      Assets/Res/TimeLineAssets/1403_timeline_TD.txt
  20. 1 1
      Assets/Res/TimeLineAssets/1404_timeline_TD.txt
  21. 1 1
      Assets/Res/TimeLineAssets/1405_timeline_TD.txt
  22. 1 1
      Assets/Res/TimeLineAssets/1501_timeline_TD.txt
  23. 1 1
      Assets/Res/TimeLineAssets/1504_timeline_TD.txt
  24. 1 1
      Assets/Res/TimeLineAssets/1505_timeline_TD.txt
  25. 1 1
      Assets/Res/TimeLineAssets/2008_timeline_TD.txt
  26. 0 0
      Assets/Res/TimeLineAssets/BossSk1_timeline_TD.txt
  27. 0 0
      Assets/Res/TimeLineAssets/BossSk2_timeline_TD.txt
  28. 0 0
      Assets/Res/TimeLineAssets/BossSk4_timeline_TD.txt
  29. 0 0
      Assets/Res/TimeLineAssets/fb_3101_TD.txt
  30. 0 0
      Assets/Res/TimeLineAssets/fb_3202_TD.txt
  31. 0 0
      Assets/Res/TimeLineAssets/fb_3203_TD.txt
  32. 0 0
      Assets/Res/TimeLineAssets/fb_3302_TD.txt
  33. 0 0
      Assets/Res/TimeLineAssets/fb_3401_TD.txt
  34. 0 0
      Assets/Res/TimeLineAssets/fb_3402_TD.txt
  35. 0 0
      Assets/Res/TimeLineAssets/fb_BossPing_TD.txt
  36. 0 0
      Assets/Res/TimeLineAssets/fb_dao1_TD.txt
  37. 0 0
      Assets/Res/TimeLineAssets/fb_ding1_TD.txt
  38. 0 0
      Assets/Res/TimeLineAssets/fb_feicuihulu_TD.txt
  39. 0 0
      Assets/Res/TimeLineAssets/fb_huohulu_TD.txt
  40. 0 0
      Assets/Res/TimeLineAssets/fb_jian1_TD.txt
  41. 0 0
      Assets/Res/TimeLineAssets/fb_jian2_TD.txt
  42. 0 0
      Assets/Res/TimeLineAssets/fb_linglongta_TD.txt
  43. 0 0
      Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt
  44. 0 0
      Assets/Res/TimeLineAssets/fb_xuanguidun_TD.txt
  45. 0 0
      Assets/Res/TimeLineAssets/fb_yuping_TD.txt
  46. 1 1
      Assets/Res/TimeLineAssets/gf_mozhan_timeline_TD.txt
  47. 0 0
      Assets/Res/TimeLineAssets/jianjue_timeline_TD.txt
  48. 0 0
      Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt
  49. 10 4
      Assets/Scripts/GameLogic/Combat/Skill/S1103.cs
  50. 17 1
      Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs
  51. 2 1
      Assets/Scripts/GameTimeLine/CustomizeTime/TimeLineParticleSystem/TimeLineParticleSystemAsset.cs
  52. 4 0
      Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineEventParticleLogicBasic.cs
  53. 18 8
      Assets/Scripts/GameTimeLine/SerializationTimeLine/TimeLineSerialization/TimeLinePlayFxSerializtion.cs

+ 12 - 6
Assets/Art/HeroTimeLine/gf_1103_timeline.playable

@@ -15,7 +15,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: e34e4626481e59049ad3b409a5bf9fb0
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 3480204404607475665, guid: 822c8e51bc5c0f34a8f0881cedc76e54, type: 3}
   updateParticle: 1
   particleRandomSeed: 5717
   updateDirector: 1
@@ -37,6 +37,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-7255035198238635011
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -52,7 +54,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: 96464e33dc97a5b4ca08520f4fd5dc1b
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 1745893356863579098, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
   updateParticle: 1
   particleRandomSeed: 3202
   updateDirector: 1
@@ -71,9 +73,11 @@ MonoBehaviour:
   isAttSpeed: 0
   isLoop: 0
   loopAlone: 0
-  isActivityCustomTargetPos: 0
+  isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 1
+  roatIndex: 1
 --- !u!114 &-5073625934344026965
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -97,7 +101,6 @@ MonoBehaviour:
   - {fileID: 8106544261917024806}
   - {fileID: -894447145330074657}
   - {fileID: 5407991339139584327}
-  - {fileID: 6061407382484812371}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -323,7 +326,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: e9be10d28379adf49ae0e4b85f170347
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 4172095099205432901, guid: b23232a05f682be40bf3a65455c9f7f3, type: 3}
   updateParticle: 1
   particleRandomSeed: 518
   updateDirector: 1
@@ -345,6 +348,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 1
+  roatIndex: 1
 --- !u!114 &5407991339139584327
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -455,7 +460,7 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5073625934344026965}
+  m_Parent: {fileID: 8849378030042438386}
   m_Children: []
   m_Clips:
   - m_Version: 1
@@ -696,6 +701,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 455171082174220382}
+  - {fileID: 6061407382484812371}
   m_Clips: []
   m_Markers:
     m_Objects: []

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

@@ -27,7 +27,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1745893356863579098}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0.9358445, w: 0.35241348}
   m_LocalPosition: {x: -0.998, y: -1.7600002, z: -1.186}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -35,7 +35,7 @@ Transform:
   - {fileID: 2151778121771675607}
   - {fileID: 8243156749990173179}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 138.73}
 --- !u!198 &6937384450666117639
 ParticleSystem:
   m_ObjectHideFlags: 0

+ 46 - 10
Assets/Art/VFX/FXPrefabs/fx_gf_1103.prefab

@@ -1,5 +1,40 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2345020058552568286
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8368732458135709500}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8368732458135709500
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2345020058552568286}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7359019252172593379}
+  - {fileID: 2205518357157729889}
+  - {fileID: 1524189644196614407}
+  m_Father: {fileID: 127005549176519968}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3433620202101111751
 GameObject:
   m_ObjectHideFlags: 0
@@ -26,12 +61,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3433620202101111751}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0.28}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 127005549176519968}
+  m_Father: {fileID: 8368732458135709500}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!96 &8236048876126668317
 TrailRenderer:
@@ -177,9 +212,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7359019252172593379}
-  - {fileID: 2205518357157729889}
-  - {fileID: 1524189644196614407}
+  - {fileID: 8368732458135709500}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &5248323578188183229
@@ -5073,6 +5106,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1103_hit
@@ -5085,6 +5119,8 @@ MonoBehaviour:
   size: 1
   isInit: 0
   speed: 20
+  roatRoot: {fileID: 8368732458135709500}
+  raotIndex: 1
   parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -14953,12 +14989,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6042077122885001401}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: -0.15}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 127005549176519968}
+  m_Father: {fileID: 8368732458135709500}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!198 &3643551127382296177
 ParticleSystem:
@@ -29636,8 +29672,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8616464955476399753}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.017698}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.01769799}
   m_LocalScale: {x: 0.80805, y: 0.75, z: 0.7788}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -29645,5 +29681,5 @@ Transform:
   - {fileID: 1193821795372858093}
   - {fileID: 3811563905954814054}
   - {fileID: 4397787540378935157}
-  m_Father: {fileID: 127005549176519968}
+  m_Father: {fileID: 8368732458135709500}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 56 - 0
Assets/Res/HeroAnimtion/Nanzhu.asset

@@ -74,6 +74,7 @@ MonoBehaviour:
     - {fileID: 1485322484274848399}
     - {fileID: -6275841264099654957}
     - {fileID: -4718902783258376847}
+    - {fileID: 4162791575905085679}
     _Modifiers:
     - _From: 0
       _To: 0
@@ -123,6 +124,33 @@ MonoBehaviour:
     - _From: 3
       _To: 0
       _Fade: 0
+    - _From: 0
+      _To: 4
+      _Fade: 0
+    - _From: 1
+      _To: 4
+      _Fade: 0
+    - _From: 2
+      _To: 4
+      _Fade: 0
+    - _From: 3
+      _To: 4
+      _Fade: 0
+    - _From: 4
+      _To: 4
+      _Fade: 0
+    - _From: 4
+      _To: 3
+      _Fade: 0
+    - _From: 4
+      _To: 2
+      _Fade: 0
+    - _From: 4
+      _To: 1
+      _Fade: 0
+    - _From: 4
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &1485322484274848399
@@ -153,6 +181,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 669eef23799d5b84ca0df43cd5aadfd5, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &4162791575905085679
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: attack5
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3899372176927883595
+  references:
+    version: 2
+    RefIds:
+    - rid: 3899372176927883595
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: da64dad2561f5ad40ad6a0ee04fd8862, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &5809678034847680219
 MonoBehaviour:
   m_ObjectHideFlags: 0

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/1101_timeline_TD.txt


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

@@ -1 +1 @@
-{"timeLineName":"1102_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack3_1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102\",\"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,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102_sf\",\"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,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1102_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1102_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack3_1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102_sf\",\"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,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1102_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 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","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jindao\",\"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,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"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","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jindao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1104_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

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

@@ -1 +1 @@
-{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"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,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"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","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"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,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1105_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

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

@@ -1 +1 @@
-{"timeLineName":"1201_timeline","key":["TineLineAnimationPlayableSerialization","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}","{\"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,\"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","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}","{\"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,\"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}}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 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","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}","{\"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,\"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","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}","{\"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,\"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}}

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

@@ -1 +1 @@
-{"timeLineName":"1205_timeline","key":["TineLineAnimationPlayableSerialization","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}","{\"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,\"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","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}","{\"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,\"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}}

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

@@ -1 +1 @@
-{"timeLineName":"1301_timeline","key":["TineLineAnimationPlayableSerialization","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}","{\"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,\"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","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}","{\"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,\"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}}

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

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

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

@@ -1 +1 @@
-{"timeLineName":"1305_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_muci\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"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","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_muci\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"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}}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/1401_timeline_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/1402_timeline_TD.txt


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

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

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

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

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

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

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

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

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

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

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

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

+ 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_boss01_sk1_jian\",\"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,\"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_boss01_sk1_jian\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"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}}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/BossSk1_timeline_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/BossSk2_timeline_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/BossSk4_timeline_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3101_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3202_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3203_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3302_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3401_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3402_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_BossPing_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_dao1_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_ding1_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_feicuihulu_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_huohulu_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_jian1_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_jian2_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_linglongta_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_xuanguidun_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 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,\"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,\"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}}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/jianjue_timeline_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt


+ 10 - 4
Assets/Scripts/GameLogic/Combat/Skill/S1103.cs

@@ -17,6 +17,7 @@ namespace GameLogic.Combat.Skill
     {
         protected override void ProUseSkill()
         {
+            _finishTimeLineGroupName = "1103";
             ActivationTimeLineData("1103");
             CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
                 .GetThis<CombatHeroEntity>()
@@ -26,16 +27,21 @@ namespace GameLogic.Combat.Skill
             ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
-                float startTime = i * -0.02f;
+                float a = CombatCalculateTool.Instance.GetOdd(0, 360);
+                Quaternion q = Quaternion.Euler(0, 0, a);
+                q = CombatHeroEntity.GameObject.transform.rotation * q;
+                Vector3 qe = q.eulerAngles;
+                float startTime = i * -0.2f;
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
                 ActivationTimeLineData("1103_fashe", currTarget: currTarget,
-                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i,startTime:startTime);
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos(), qe }, indexCount: i,
+                    startTime: startTime);
             }
         }
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData,ISkillFeatures skillFeatures)
+            TriggerData triggerData, ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             if (SelfSkillConfig.level > 5)
@@ -52,7 +58,7 @@ namespace GameLogic.Combat.Skill
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,skillFeatures,
+                wuXingType, skillFeatures,
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {

+ 17 - 1
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Core.Audio;
 using Core.Triiger;
 using Core.Utility;
+using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 using GameLogic.Combat.Skill;
@@ -16,6 +17,8 @@ namespace Common.Combat.FxAILogic
     {
       
         public float speed;
+        public Transform roatRoot;
+        public int raotIndex;
         private IUnRegister UnRegister = null;
 
 
@@ -52,6 +55,11 @@ namespace Common.Combat.FxAILogic
         {
             maxDisSpr = maxDis * maxDis;
 
+            if (roatRoot!=null&&TimeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.isRoat)
+            {
+                roatRoot.transform.eulerAngles = TimeLineEventParticleLogicBasic.customizePos[raotIndex];
+            }
+
             if (isUseCustomTargetEndPos)
             {
                 endPos = TimeLineEventParticleLogicBasic.customizePos[
@@ -326,7 +334,15 @@ namespace Common.Combat.FxAILogic
             if (!string.IsNullOrEmpty(hitFxName))
             {
                 CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle(hitFxName,
-                    pos, null, false, null, null);
+                    pos, null, false, null, CallBack);
+            }
+        }
+
+        private void CallBack(ParticleSystemPool obj)
+        {
+            if (roatRoot != null)
+            {
+                obj.transform.rotation=  roatRoot.rotation;
             }
         }
 

+ 2 - 1
Assets/Scripts/GameTimeLine/CustomizeTime/TimeLineParticleSystem/TimeLineParticleSystemAsset.cs

@@ -37,7 +37,8 @@ public class TimeLineParticleSystemAsset : ControlPlayableAsset
     [Header("激活自定义目标点")] public bool isActivityCustomTargetPos;
     [Header("自定义目标点下标")] public int CustomTargetPosIndex;
     [Header("间隔时间")] public float intervalTime;
-    
+    [Header("是否自定义旋转")] public bool isRoat;
+    [Header("旋转值下标")] public int roatIndex;
     public override Playable CreatePlayable(PlayableGraph graph, GameObject go)
     {
         return base.CreatePlayable(graph, go);

+ 4 - 0
Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineEventParticleLogicBasic.cs

@@ -320,6 +320,10 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                             }
 
                             _timeLineEventLogicGroup.OnInitParticleSystemPoolCallBack?.Invoke(pool);
+                            if (timeLinePlayFxSerializtion.isRoat)
+                            {
+                                pool.own.transform.eulerAngles = customizePos[timeLinePlayFxSerializtion.roatIndex];
+                            }
                         }
                     });
                 if (clock != null)

+ 18 - 8
Assets/Scripts/GameTimeLine/SerializationTimeLine/TimeLineSerialization/TimeLinePlayFxSerializtion.cs

@@ -19,12 +19,15 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
     public FXLocationType locationType;
     public string targetSpecialDotName;
     public string hitPointGroupName;
-    public  bool isGround;
+    public bool isGround;
+
     /// <summary>
     /// 是否跟随目标
     /// </summary>
     public bool isFollowTarget;
+
     public bool isFollowRootTarget;
+
     /// <summary>
     /// 是否不旋转 (默认是跟随目标旋转)
     /// </summary>
@@ -37,15 +40,20 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
 
     public int CustomTargetPosIndex;
     public bool isActivityCustomTargetPos;
+
     /// <summary>
     /// 是否循环
     /// </summary>
     public bool isLoop;
+
     /// <summary>
     /// 循环独立
     /// </summary>
     public bool loopAlone;
+
     public float intervalTime;
+    public bool isRoat;
+    public int roatIndex;
     public TimeLinePlayFxSerializtion()
     {
     }
@@ -61,21 +69,21 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
         }
 
         GameObject go = null;
-       
+
         if (controlPlayableAsset.prefabGameObject != null)
         {
             go = controlPlayableAsset.prefabGameObject;
         }
-        else if(playableDirector.playableGraph.GetResolver()!=null)
+        else if (playableDirector.playableGraph.GetResolver() != null)
         {
-            go=  controlPlayableAsset.sourceGameObject.Resolve(playableDirector.playableGraph.GetResolver());
+            go = controlPlayableAsset.sourceGameObject.Resolve(playableDirector.playableGraph.GetResolver());
         }
 
         Object obj = controlPlayableAsset.sourceGameObject.defaultValue;
         // Debug.Log(playableDirector.playableGraph.GetResolver());
         if (go != null)
         {
-            fxName =go.name;
+            fxName = go.name;
             randomSeed = controlPlayableAsset.particleRandomSeed;
             locationType = controlPlayableAsset.LocationType;
             targetSpecialDotName = controlPlayableAsset.targetSpecialDotName;
@@ -89,13 +97,15 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
             CustomTargetPosIndex = controlPlayableAsset.CustomTargetPosIndex;
             isActivityCustomTargetPos = controlPlayableAsset.isActivityCustomTargetPos;
             loopAlone = controlPlayableAsset.loopAlone;
-            isLoop=controlPlayableAsset.isLoop;
-            intervalTime=controlPlayableAsset.intervalTime;
+            isLoop = controlPlayableAsset.isLoop;
+            intervalTime = controlPlayableAsset.intervalTime;
+            isRoat = controlPlayableAsset.isRoat;
+            roatIndex = controlPlayableAsset.roatIndex;
         }
     }
 #endif
     public override TimeLineEventLogicBasic CreateLogic()
     {
-            return CObjectPool.Instance.Fetch<TimeLineEventParticleLogicBasic>();
+        return CObjectPool.Instance.Fetch<TimeLineEventParticleLogicBasic>();
     }
 }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác