DESKTOP-BGJIU14\ck 2 napja
szülő
commit
9737850a51
63 módosított fájl, 157 hozzáadás és 200 törlés
  1. 0 52
      Assets/Art/ArtHero/Boss_QiongQi.prefab
  2. 9 1
      Assets/Art/Character/Guaiwu/TreeBoss/Boss_Tree.playable
  3. 23 22
      Assets/Art/VFX/FXPrefabs/fx boss 9052 zd.prefab
  4. 0 0
      Assets/Res/TimeLineAssets/1101_timeline_TD.txt
  5. 0 0
      Assets/Res/TimeLineAssets/1102_timeline_TD.txt
  6. 0 0
      Assets/Res/TimeLineAssets/1103_timeline_TD.txt
  7. 1 1
      Assets/Res/TimeLineAssets/1104_timeline_TD.txt
  8. 1 1
      Assets/Res/TimeLineAssets/1105_timeline_TD.txt
  9. 1 1
      Assets/Res/TimeLineAssets/1201_timeline_TD.txt
  10. 0 0
      Assets/Res/TimeLineAssets/1202_timeline_TD.txt
  11. 1 1
      Assets/Res/TimeLineAssets/1204_timeline_TD.txt
  12. 1 1
      Assets/Res/TimeLineAssets/1205_timeline_TD.txt
  13. 1 1
      Assets/Res/TimeLineAssets/1301_timeline_TD.txt
  14. 0 0
      Assets/Res/TimeLineAssets/1302_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. 0 0
      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. 0 0
      Assets/Res/TimeLineAssets/1501_timeline_TD.txt
  23. 0 0
      Assets/Res/TimeLineAssets/1502_timeline_TD.txt
  24. 0 0
      Assets/Res/TimeLineAssets/1504_timeline_TD.txt
  25. 1 1
      Assets/Res/TimeLineAssets/1505_timeline_TD.txt
  26. 1 1
      Assets/Res/TimeLineAssets/2008_timeline_TD.txt
  27. 0 0
      Assets/Res/TimeLineAssets/BossSk1_timeline_TD.txt
  28. 0 0
      Assets/Res/TimeLineAssets/BossSk2_timeline_TD.txt
  29. 0 0
      Assets/Res/TimeLineAssets/BossSk4_timeline_TD.txt
  30. 0 0
      Assets/Res/TimeLineAssets/Boss_BeiHaiGui_TD.txt
  31. 0 0
      Assets/Res/TimeLineAssets/Boss_QiongQi_TD.txt
  32. 0 0
      Assets/Res/TimeLineAssets/Boss_ShuGuai_TD.txt
  33. 0 0
      Assets/Res/TimeLineAssets/Boss_Tree_TD.txt
  34. 0 0
      Assets/Res/TimeLineAssets/Boss_Tree_xiao_TD.txt
  35. 0 0
      Assets/Res/TimeLineAssets/Boss_fenghuang_TD.txt
  36. 0 0
      Assets/Res/TimeLineAssets/Gw_zhizhu_TD.txt
  37. 0 0
      Assets/Res/TimeLineAssets/fb_3101_TD.txt
  38. 0 0
      Assets/Res/TimeLineAssets/fb_3202_TD.txt
  39. 0 0
      Assets/Res/TimeLineAssets/fb_3203_TD.txt
  40. 0 0
      Assets/Res/TimeLineAssets/fb_3302_TD.txt
  41. 0 0
      Assets/Res/TimeLineAssets/fb_3401_TD.txt
  42. 0 0
      Assets/Res/TimeLineAssets/fb_3402_TD.txt
  43. 0 0
      Assets/Res/TimeLineAssets/fb_BossPing_TD.txt
  44. 0 0
      Assets/Res/TimeLineAssets/fb_dao1_TD.txt
  45. 0 0
      Assets/Res/TimeLineAssets/fb_ding1_TD.txt
  46. 0 0
      Assets/Res/TimeLineAssets/fb_feicuihulu_TD.txt
  47. 0 0
      Assets/Res/TimeLineAssets/fb_huohulu_TD.txt
  48. 0 0
      Assets/Res/TimeLineAssets/fb_jian1_TD.txt
  49. 0 0
      Assets/Res/TimeLineAssets/fb_jian2_TD.txt
  50. 0 0
      Assets/Res/TimeLineAssets/fb_linglongta_TD.txt
  51. 0 0
      Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt
  52. 0 0
      Assets/Res/TimeLineAssets/fb_xuanguidun_TD.txt
  53. 0 0
      Assets/Res/TimeLineAssets/fb_yuping_TD.txt
  54. 1 1
      Assets/Res/TimeLineAssets/gf_mozhan_timeline_TD.txt
  55. 0 0
      Assets/Res/TimeLineAssets/gw_huli_TD.txt
  56. 0 0
      Assets/Res/TimeLineAssets/gw_xianhe_TD.txt
  57. 0 0
      Assets/Res/TimeLineAssets/jianjue_timeline_TD.txt
  58. 0 0
      Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt
  59. 3 3
      Assets/Scenes/testCombat.scene
  60. BIN
      Excel2Json/Excel/FabaoConfig.xlsx
  61. BIN
      Excel2Json/Excel/HeroModel.xlsx
  62. BIN
      Excel2Json/Excel/skill.xlsx
  63. 109 109
      UserSettings/Layouts/default-2022.dwlt

+ 0 - 52
Assets/Art/ArtHero/Boss_QiongQi.prefab

@@ -7368,22 +7368,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 7195369486424068322}
     m_Modifications:
-    - target: {fileID: 247287361231855195, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: randomSeed
-      value: 8481
-      objectReference: {fileID: 0}
-    - target: {fileID: 247287361231855195, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 608607158942486417, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: randomSeed
-      value: 8481
-      objectReference: {fileID: 0}
-    - target: {fileID: 608607158942486417, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 1629107773219833525, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.24
@@ -7424,46 +7408,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2623203453425681451, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: randomSeed
-      value: 8481
-      objectReference: {fileID: 0}
-    - target: {fileID: 2623203453425681451, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3178291786780567331, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: randomSeed
-      value: 8481
-      objectReference: {fileID: 0}
-    - target: {fileID: 3178291786780567331, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5545652762918832821, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: randomSeed
-      value: 8481
-      objectReference: {fileID: 0}
-    - target: {fileID: 5545652762918832821, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 7412391199606318376, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
       propertyPath: m_Name
       value: fx boss 9052 zd
       objectReference: {fileID: 0}
-    - target: {fileID: 7466353896069030335, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: randomSeed
-      value: 8481
-      objectReference: {fileID: 0}
-    - target: {fileID: 7466353896069030335, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7793222201525339119, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
-      propertyPath: delayTime
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

+ 9 - 1
Assets/Art/Character/Guaiwu/TreeBoss/Boss_Tree.playable

@@ -118,6 +118,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 1
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -203,6 +204,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -589,6 +591,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -677,6 +680,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 2
@@ -726,6 +730,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
     x: 2
@@ -1129,6 +1134,7 @@ MonoBehaviour:
   targetType: 0
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1828,6 +1834,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1921,7 +1928,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.1666666666666665
+    m_Start: 1.45
     m_ClipIn: 0
     m_Asset: {fileID: -2249753213640787348}
     m_Duration: 1.5
@@ -2135,6 +2142,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0

+ 23 - 22
Assets/Art/VFX/FXPrefabs/fx boss 9052 zd.prefab

@@ -28,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 909345235688523031}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 0, y: 0.00000059604645, z: -0.12}
+  m_LocalPosition: {x: 0, y: 0.00000059604645, z: 0.05099953}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -53,7 +53,7 @@ ParticleSystem:
   prewarm: 1
   playOnAwake: 1
   useUnscaledTime: 0
-  autoRandomSeed: 1
+  autoRandomSeed: 0
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -110,7 +110,7 @@ ParticleSystem:
   moveWithTransform: 1
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 0
-  randomSeed: 0
+  randomSeed: 8481
   InitialModule:
     serializedVersion: 3
     enabled: 1
@@ -4929,7 +4929,7 @@ Transform:
   m_GameObject: {fileID: 3000979404457613572}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0.17099953}
   m_LocalScale: {x: 0.40648314, y: 0.40648314, z: 0.99449706}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -4954,7 +4954,7 @@ ParticleSystem:
   prewarm: 1
   playOnAwake: 1
   useUnscaledTime: 0
-  autoRandomSeed: 1
+  autoRandomSeed: 0
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -5011,7 +5011,7 @@ ParticleSystem:
   moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 0
-  randomSeed: 0
+  randomSeed: 8481
   InitialModule:
     serializedVersion: 3
     enabled: 1
@@ -9763,7 +9763,7 @@ Transform:
   m_GameObject: {fileID: 4114401953581355641}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0.17099953}
   m_LocalScale: {x: 5, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -9788,7 +9788,7 @@ ParticleSystem:
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
-  autoRandomSeed: 1
+  autoRandomSeed: 0
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -9845,7 +9845,7 @@ ParticleSystem:
   moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 0
-  randomSeed: 0
+  randomSeed: 8481
   InitialModule:
     serializedVersion: 3
     enabled: 1
@@ -14664,7 +14664,7 @@ Transform:
   m_GameObject: {fileID: 4717662361274741172}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0.17099953}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -14689,7 +14689,7 @@ ParticleSystem:
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
-  autoRandomSeed: 1
+  autoRandomSeed: 0
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -14746,7 +14746,7 @@ ParticleSystem:
   moveWithTransform: 1
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 0
-  randomSeed: 0
+  randomSeed: 8481
   InitialModule:
     serializedVersion: 3
     enabled: 1
@@ -19557,7 +19557,7 @@ Transform:
   m_GameObject: {fileID: 5969172049683703254}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0.17099953}
   m_LocalScale: {x: 5, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -19582,7 +19582,7 @@ ParticleSystem:
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
-  autoRandomSeed: 1
+  autoRandomSeed: 0
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -19639,7 +19639,7 @@ ParticleSystem:
   moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 0
-  randomSeed: 0
+  randomSeed: 8481
   InitialModule:
     serializedVersion: 3
     enabled: 1
@@ -24448,7 +24448,7 @@ Transform:
   m_GameObject: {fileID: 6873228063336548785}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.44}
+  m_LocalPosition: {x: 0, y: 0, z: -0.26900047}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -24591,7 +24591,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7412391199606318376}
   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.24, y: 0.87000084, z: 13.51}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -24625,7 +24625,7 @@ BoxCollider:
   m_Enabled: 1
   serializedVersion: 3
   m_Size: {x: 0.73, y: 0.88, z: 1.11}
-  m_Center: {x: 0, y: -0.011964202, z: -0.9350886}
+  m_Center: {x: 0, y: 0, z: -0.48}
 --- !u!54 &1159786465427386941
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -24672,7 +24672,7 @@ ParticleSystem:
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
-  autoRandomSeed: 1
+  autoRandomSeed: 0
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -24729,7 +24729,7 @@ ParticleSystem:
   moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 0
-  randomSeed: 0
+  randomSeed: 8481
   InitialModule:
     serializedVersion: 3
     enabled: 1
@@ -29466,10 +29466,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0.1
+  delayTime: 0
   multipleTargetDelayTime: 0.1
   hitFxName: fx boss 9052 hit
   hitAudioName: 
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -29517,7 +29518,7 @@ Transform:
   m_GameObject: {fileID: 8163178968380641720}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 1.88}
+  m_LocalPosition: {x: 0, y: 0, z: 2.051}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/1101_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/1102_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 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\":\"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}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"Random\":{},\"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,\"y\":-1},\"yoff\":{\"x\":0.5,\"y\":-0.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"zhongZhi\":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","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}","{\"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,\"y\":-1},\"yoff\":{\"x\":0.5,\"y\":-0.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}}

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

@@ -1 +1 @@
-{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","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}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"Random\":{},\"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\":0.5,\"y\":-0.5},\"yoff\":{\"x\":0.5,\"y\":-0.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"zhongZhi\":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","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}","{\"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\":0.5,\"y\":-0.5},\"yoff\":{\"x\":0.5,\"y\":-0.5},\"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}}

+ 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}","{\"Random\":{},\"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},\"zhongZhi\":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,\"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}}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 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}","{\"Random\":{},\"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},\"zhongZhi\":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,\"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}}

+ 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}","{\"Random\":{},\"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},\"zhongZhi\":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,\"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}}

+ 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}","{\"Random\":{},\"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},\"zhongZhi\":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,\"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}}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/1302_timeline_TD.txt


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

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

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

@@ -1 +1 @@
-{"timeLineName":"1305_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"Random\":{},\"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},\"zhongZhi\":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,\"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}}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/1401_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/1402_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/1403_timeline_TD.txt


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

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

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

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

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/1501_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/1502_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 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","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}","{\"Random\":{},\"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\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"zhongZhi\":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","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_xiaoshitou\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"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}}

+ 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}","{\"Random\":{},\"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},\"zhongZhi\":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":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/BossSk1_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/BossSk2_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/BossSk4_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_BeiHaiGui_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_QiongQi_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_ShuGuai_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_Tree_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_Tree_xiao_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_fenghuang_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/Gw_zhizhu_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3101_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3202_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3203_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3302_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3401_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3402_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_BossPing_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_dao1_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_ding1_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_feicuihulu_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_huohulu_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_jian1_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_jian2_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_linglongta_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/fb_xuanguidun_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 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}","{\"Random\":{},\"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},\"zhongZhi\":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":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/gw_huli_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/gw_xianhe_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/jianjue_timeline_TD.txt


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt


+ 3 - 3
Assets/Scenes/testCombat.scene

@@ -2197,7 +2197,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: levelBattleId
-      value: 100001
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
@@ -2265,7 +2265,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 5001
+      value: 9004
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID
@@ -2353,7 +2353,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

BIN
Excel2Json/Excel/FabaoConfig.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/skill.xlsx


+ 109 - 109
UserSettings/Layouts/default-2022.dwlt

@@ -17,9 +17,9 @@ MonoBehaviour:
     x: 0
     y: 43
     width: 2560
-    height: 1349
+    height: 1357
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: CombatR
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 371}
   m_MaxSize: {x: 10000, y: 10000}
@@ -40,9 +40,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 486
-    width: 967
-    height: 243
+    y: 745
+    width: 721
+    height: 50
   m_MinSize: {x: 102, y: 121}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 17}
@@ -67,8 +67,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 525
-    height: 570
+    width: 528
+    height: 512
   m_MinSize: {x: 102, y: 121}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 18}
@@ -94,13 +94,13 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 729
-    width: 967
-    height: 570
+    y: 795
+    width: 721
+    height: 512
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 53
+  controlID: 87
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -123,7 +123,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2560
-    height: 1349
+    height: 1357
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -168,7 +168,7 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1329
+    y: 1337
     width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
@@ -195,11 +195,11 @@ MonoBehaviour:
     x: 0
     y: 30
     width: 2560
-    height: 1299
+    height: 1307
   m_MinSize: {x: 500, y: 150}
   m_MaxSize: {x: 40480, y: 24288}
   vertical: 0
-  controlID: 51
+  controlID: 85
   draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -218,8 +218,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 561
-    height: 1299
+    width: 454
+    height: 1307
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 19}
@@ -245,14 +245,14 @@ MonoBehaviour:
   - {fileID: 4}
   m_Position:
     serializedVersion: 2
-    x: 561
+    x: 454
     y: 0
-    width: 967
-    height: 1299
+    width: 721
+    height: 1307
   m_MinSize: {x: 200, y: 150}
   m_MaxSize: {x: 16192, y: 24288}
   vertical: 1
-  controlID: 52
+  controlID: 86
   draggingID: 0
 --- !u!114 &11
 MonoBehaviour:
@@ -271,10 +271,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 967
-    height: 486
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 721
+    height: 745
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -296,12 +296,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 525
+    x: 528
     y: 0
-    width: 442
-    height: 570
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 193
+    height: 512
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 22}
   m_Panes:
   - {fileID: 22}
@@ -324,14 +324,14 @@ MonoBehaviour:
   - {fileID: 15}
   m_Position:
     serializedVersion: 2
-    x: 1528
+    x: 1175
     y: 0
-    width: 514
-    height: 1299
+    width: 867
+    height: 1307
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 77
+  controlID: 169
   draggingID: 0
 --- !u!114 &14
 MonoBehaviour:
@@ -350,8 +350,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 514
-    height: 464
+    width: 867
+    height: 467
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 23}
@@ -375,9 +375,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 464
-    width: 514
-    height: 835
+    y: 467
+    width: 867
+    height: 840
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 24}
@@ -403,9 +403,9 @@ MonoBehaviour:
     x: 2042
     y: 0
     width: 518
-    height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+    height: 1307
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 25}
   m_Panes:
   - {fileID: 25}
@@ -431,10 +431,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 561
-    y: 559
-    width: 965
-    height: 222
+    x: 454
+    y: 818
+    width: 719
+    height: 29
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -466,14 +466,14 @@ MonoBehaviour:
       e31: 0
       e32: 0
       e33: 1
-    - e00: 0.7408218
+    - e00: 0.6296985
       e01: 0
       e02: 0
-      e03: -119.00844
+      e03: 96.89282
       e10: 0
-      e11: 0.7408218
+      e11: 0.6296985
       e12: 0
-      e13: -106.6522
+      e13: -49.104362
       e20: 0
       e21: 0
       e22: 1
@@ -518,10 +518,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 561
-    y: 802
-    width: 523
-    height: 549
+    x: 454
+    y: 868
+    width: 526
+    height: 491
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -555,8 +555,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 560
-    height: 1278
+    width: 453
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -609,23 +609,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 560
-      height: 1257
-    m_Scale: {x: 0.74666667, y: 0.74666667}
-    m_Translation: {x: 280, y: 628.5}
+      width: 453
+      height: 1265
+    m_Scale: {x: 0.604, y: 0.60400003}
+    m_Translation: {x: 226.50002, y: 632.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -375
-      y: -841.7411
-      width: 750
-      height: 1683.4822
+      x: -375.00003
+      y: -1047.1854
+      width: 750.00006
+      height: 2094.3708
     m_MinimalGUI: 1
-  m_defaultScale: 0.74666667
-  m_LastWindowPixelSize: {x: 560, y: 1278}
+  m_defaultScale: 0.604
+  m_LastWindowPixelSize: {x: 453, y: 1286}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -651,10 +651,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 561
+    x: 454
     y: 73
-    width: 965
-    height: 465
+    width: 719
+    height: 724
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -994,8 +994,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: -231.00003, y: -145.00003}
-      snapOffsetDelta: {x: 0.000030517578, y: 0}
+      snapOffset: {x: -231.00003, y: -145}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Scene View/TrailRenderer
       index: 10
@@ -1039,9 +1039,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.591262, y: 20.239126, z: 15.228993}
+    m_Target: {x: 4.7627716, y: 9.17481, z: 665.1085}
     speed: 2
-    m_Value: {x: -0.20099896, y: 20.274967, z: 15.00996}
+    m_Value: {x: -0.5027687, y: 21.812504, z: 10.795132}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1087,17 +1087,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.10544765, y: 0.30806836, z: -0.034994002, w: 0.9450643}
+    m_Target: {x: 0.3233517, y: -0.35722753, z: 0.13341017, w: 0.8661791}
     speed: 2
-    m_Value: {x: 0.10542676, y: 0.30800733, z: -0.03498707, w: 0.9448771}
+    m_Value: {x: 0.054047655, y: -0.6935784, z: 0.052336987, w: 0.71644163}
   m_Size:
-    m_Target: 3.3696237
+    m_Target: 261.15747
     speed: 2
-    m_Value: 3.2245202
+    m_Value: 2.1652489
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -1278,10 +1278,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1086
-    y: 802
-    width: 440
-    height: 549
+    x: 982
+    y: 868
+    width: 191
+    height: 491
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1299,7 +1299,7 @@ MonoBehaviour:
     m_IsLocked: 0
   m_SequenceHierarchy: {fileID: 0}
   m_SequencePath:
-    m_SelectionRoot: -59790
+    m_SelectionRoot: 0
     m_SubElements: []
 --- !u!114 &23
 MonoBehaviour:
@@ -1321,10 +1321,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1528
+    x: 1175
     y: 73
-    width: 512
-    height: 443
+    width: 865
+    height: 446
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1338,9 +1338,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 7216ffff
-      m_LastClickedID: -59790
-      m_ExpandedIDs: 7615ffff7a15ffff8015ffff8415ffff5616ffff7e16ffff1817ffffcc5affff78faffff
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 7cfaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1384,10 +1384,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1528
-    y: 537
-    width: 512
-    height: 814
+    x: 1175
+    y: 540
+    width: 865
+    height: 819
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1399,7 +1399,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: Boss_QiongQi
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1409,24 +1409,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/Character/Guaiwu/xianhe
+    - Assets
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: Boss_QiongQi
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/Character/Guaiwu/xianhe
+  - Assets
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\unityProject\XiuXianGame
+  m_LastProjectPath: D:\Server\NetServer\NetServer\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 399}
-    m_SelectedIDs: e2470100
-    m_LastClickedID: 83938
-    m_ExpandedIDs: 0000000018ee00001aee00001cee00001eee000020ee000022ee000024ee000026ee000028ee00002aee00002cee00002eee000030ee000032ee000034ee000036ee000038ee00003aee00003cee00003eee000040ee000042ee000044ee000046ee000048ee00004aee00004cee00004eee000050ee000052ee000054ee000056ee00007af100002c48010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 79}
+    m_SelectedIDs: 88ee0000
+    m_LastClickedID: 61064
+    m_ExpandedIDs: 000000009869000088ee00008aee00008cee00008eee000090ee000092ee000094ee000096ee000098ee00009aee00009cee00009eee0000a0ee0000a2ee000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1454,7 +1454,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000018ee00001aee00001cee00001eee000020ee000022ee000024ee000026ee000028ee00002aee00002cee00002eee000030ee000032ee000034ee000036ee000038ee00003aee00003cee00003eee000040ee000042ee000044ee000046ee000048ee00004aee00004cee00004eee000050ee000052ee000054ee000056ee0000
+    m_ExpandedIDs: 000000009869000088ee00008aee00008cee00008eee000090ee000092ee000094ee000096ee000098ee00009aee00009cee00009eee0000a0ee0000a2ee0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1485,18 +1485,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100ae5a010094b001004e610100a2d1010038890300a6aa0000feaa0000d2530400a4530400aa890100b68f0100c28f0100c88f0100bc8f010096f50100baf8010096f7010038f20100e2ab0000bc37010084ab00001e3a01003edf0000263a010088ab0000e4ab000070ac0000d8ab0000e0ab000082270100442701004227010056480100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: gw_xianhe
-      m_OriginalName: gw_xianhe
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 48382
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 15}
     m_CreateAssetUtility:
@@ -1533,7 +1533,7 @@ MonoBehaviour:
     x: 2042
     y: 73
     width: 517
-    height: 1278
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott