瀏覽代碼

修改bug

DESKTOP-FB72PO8\Administrator 5 天之前
父節點
當前提交
aed1e87812

+ 2 - 2
Assets/Art/HeroTimeLine/gf_1402_timeline.playable

@@ -158,7 +158,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: b135098b2b412304a8a5386b868bb20f
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 9011773141688868156, guid: 500e4162e3702284f86b9365528d8655, type: 3}
   updateParticle: 1
   particleRandomSeed: 5167
   updateDirector: 1
@@ -195,7 +195,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: 1dcba9b8a21b74748889abc96580cb19
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 7282454173369998372, guid: f8a61f0a77c6acb4fbc56399516655cb, type: 3}
   updateParticle: 1
   particleRandomSeed: 6098
   updateDirector: 1

+ 145 - 114
Assets/Art/VFX/FXPrefabs/fx_gf_1402.prefab

@@ -58,12 +58,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 651555970202960780}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000073889126, y: 3.8859638e-10, z: 0.05252152, w: 0.9986198}
-  m_LocalPosition: {x: -0.41247374, y: 0.000000057220458, z: 0.00000005816877}
+  m_LocalRotation: {x: 0.7024371, y: -0.081130736, z: 0.702437, w: -0.08113072}
+  m_LocalPosition: {x: -0, y: 0.52727234, z: -2.9201818}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1810992592661290339}
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &822950574649449611
 GameObject:
@@ -90,13 +90,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 822950574649449611}
   serializedVersion: 2
-  m_LocalRotation: {x: 2.858155e-15, y: -7.9768184e-15, z: -0.03157842, w: 0.9995013}
-  m_LocalPosition: {x: -0.4087349, y: -0.000000038146972, z: 0.000000056984245}
+  m_LocalRotation: {x: 0.70534396, y: 0.049899634, z: 0.70534384, w: 0.049899645}
+  m_LocalPosition: {x: -0, y: 0.44327462, z: -1.7351258}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6371397751334135514}
-  m_Father: {fileID: 8059291242587138979}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &893379813674700054
 GameObject:
@@ -123,13 +122,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 893379813674700054}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021701428, y: -0.000000003947506, z: -0.17896399, w: 0.98385566}
-  m_LocalPosition: {x: -0.3415143, y: -0.00000015258789, z: 0.000000040327485}
+  m_LocalRotation: {x: 0.7026539, y: 0.07923181, z: 0.7026537, w: 0.07923183}
+  m_LocalPosition: {x: 0, y: 0.618672, z: 1.6913452}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5753177128787202825}
-  m_Father: {fileID: 5308593044411586627}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &917305453943219417
 GameObject:
@@ -222,13 +220,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 996373573618100290}
   serializedVersion: 2
-  m_LocalRotation: {x: 2.8588838e-18, y: 7.216447e-15, z: -0.0003961622, w: 0.99999994}
-  m_LocalPosition: {x: -0.45860872, y: -0.000000076293944, z: 0.000000065157444}
+  m_LocalRotation: {x: 0.7065125, y: 0.028985776, z: 0.7065124, w: 0.028985761}
+  m_LocalPosition: {x: 0, y: 0.44327414, z: 0.5149405}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7001932010641342593}
-  m_Father: {fileID: 1369930539169240919}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1185931831778614166
 GameObject:
@@ -255,15 +252,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1185931831778614166}
   serializedVersion: 2
-  m_LocalRotation: {x: 6.786668e-16, y: -5.8912933e-15, z: -0.03563612, w: 0.99936485}
-  m_LocalPosition: {x: -0.36620957, y: -0.000000038146972, z: 0.000000051708803}
+  m_LocalRotation: {x: 0.7070961, y: -0.003906473, z: 0.707096, w: -0.0039064805}
+  m_LocalPosition: {x: -0, y: 0.47162116, z: -1.0069442}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7130618943804711774}
   - {fileID: 5414847214327984613}
-  - {fileID: 8059291242587138979}
-  m_Father: {fileID: 6536788840627830106}
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1271666161672694679
 GameObject:
@@ -290,13 +286,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1271666161672694679}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000053614233, y: 2.0219097e-10, z: 0.03768448, w: 0.9992897}
-  m_LocalPosition: {x: -0.3748712, y: 0.0000009155273, z: 0.00000005342017}
+  m_LocalRotation: {x: 0.70652395, y: 0.028705865, z: 0.70652384, w: 0.028705873}
+  m_LocalPosition: {x: 0, y: 0.48047936, z: 0.97203743}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8346665726171099011}
-  m_Father: {fileID: 5753177128787202825}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1709593558099195867
 GameObject:
@@ -527,13 +522,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3362024747589173843}
   serializedVersion: 2
-  m_LocalRotation: {x: -7.784745e-16, y: 2.4796364e-15, z: -0.044553634, w: 0.999007}
-  m_LocalPosition: {x: -0.32071114, y: 0.0000058364867, z: 0.000000045168743}
+  m_LocalRotation: {x: 0.706568, y: 0.027601015, z: 0.7065679, w: 0.027601033}
+  m_LocalPosition: {x: -0, y: 0.4751588, z: -1.3276384}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5768878797721049762}
-  m_Father: {fileID: 6350026575152432370}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3374591378059146117
 GameObject:
@@ -560,13 +554,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3374591378059146117}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000002998117, y: 1.7443287e-10, z: 0.058082864, w: 0.99831176}
-  m_LocalPosition: {x: -0.4092929, y: -0.000000038146972, z: 0.000000057655324}
+  m_LocalRotation: {x: 0.7057287, y: -0.044125777, z: 0.7057286, w: -0.0441258}
+  m_LocalPosition: {x: -0, y: 0.39189517, z: -2.5306315}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 9011023807037736751}
-  m_Father: {fileID: 6371397751334135514}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3679154127480222834
 GameObject:
@@ -598,6 +591,19 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 6371039679233382136}
+  - {fileID: 5753177128787202825}
+  - {fileID: 7001932010641342593}
+  - {fileID: 6536788840627830106}
+  - {fileID: 8059291242587138979}
+  - {fileID: 5768878797721049762}
+  - {fileID: 1810992592661290339}
+  - {fileID: 9011023807037736751}
+  - {fileID: 6371397751334135514}
+  - {fileID: 6350026575152432370}
+  - {fileID: 4748928776387753978}
+  - {fileID: 8346665726171099011}
+  - {fileID: 1369930539169240919}
   - {fileID: 5308593044411586627}
   m_Father: {fileID: 4387452523578066488}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -643,6 +649,8 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5308593044411586627}
+  - component: {fileID: 6971341312603714882}
+  - component: {fileID: 6111142273816353237}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: tou
@@ -659,16 +667,63 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4483481881700473301}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7054896, y: -0.04779708, z: 0.70548946, w: -0.04779702}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0.7071068, w: 0}
   m_LocalPosition: {x: 0.0000000887227, y: 0.57260805, z: 2.0297387}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1348991281707882360}
-  - {fileID: 6371039679233382136}
   - {fileID: 1606387288634389678}
   m_Father: {fileID: 3352512095176084717}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 180}
+--- !u!65 &6971341312603714882
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4483481881700473301}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &6111142273816353237
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4483481881700473301}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
 --- !u!1 &4727674001059603539
 GameObject:
   m_ObjectHideFlags: 0
@@ -694,13 +749,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4727674001059603539}
   serializedVersion: 2
-  m_LocalRotation: {x: 5.925546e-10, y: 2.4829234e-12, z: 0.004196629, w: 0.99999124}
-  m_LocalPosition: {x: -0.38374, y: -0.0000004959106, z: 0.00000005418509}
+  m_LocalRotation: {x: 0.70650774, y: -0.029102152, z: 0.7065076, w: -0.029102156}
+  m_LocalPosition: {x: -0, y: 0.44150317, z: -0.6419766}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6350026575152432370}
-  m_Father: {fileID: 4748928776387753978}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5060102855404764636
 GameObject:
@@ -857,15 +911,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7041552679836848774}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000048466826, y: 1.6477714e-10, z: 0.03397916, w: 0.99942255}
-  m_LocalPosition: {x: -0.3580139, y: 0, z: 0.000000051132574}
+  m_LocalRotation: {x: 0.7049404, y: 0.05531047, z: 0.7049402, w: 0.055310477}
+  m_LocalPosition: {x: 0, y: 0.5389458, z: 1.3423214}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7357606729404232839}
   - {fileID: 5040298048690261420}
-  - {fileID: 1369930539169240919}
-  m_Father: {fileID: 6371039679233382136}
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7494193400016739585
 GameObject:
@@ -892,13 +945,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7494193400016739585}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000004901699, y: 1.7005078e-10, z: 0.034671184, w: 0.99939877}
-  m_LocalPosition: {x: -0.38622722, y: 0.0000023651123, z: 0.000000054667648}
+  m_LocalRotation: {x: 0.7066237, y: -0.026136965, z: 0.70662355, w: -0.026136968}
+  m_LocalPosition: {x: -0, y: 0.4131533, z: -0.25928235}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6536788840627830106}
-  m_Father: {fileID: 7001932010641342593}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7797750196052067437
 GameObject:
@@ -909,9 +961,8 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 4387452523578066488}
-  - component: {fileID: 6666299408506511735}
   - component: {fileID: 7256257004160465783}
-  - component: {fileID: 916268634625053519}
+  - component: {fileID: 677279902485292160}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_gf_1402
@@ -936,27 +987,6 @@ Transform:
   - {fileID: 3352512095176084717}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &6666299408506511735
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7797750196052067437}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.56, y: 0.73, z: 0.74}
-  m_Center: {x: 0, y: -0.011964202, z: -0.07578561}
 --- !u!114 &7256257004160465783
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -969,8 +999,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  delayTime: 0.5
-  multipleTargetDelayTime: 0.2
+  moveTarget: {fileID: 4483481881700473301}
+  delayTime: 0
+  multipleTargetDelayTime: 0
   hitFxName: fx_gf_1402_hit
   hitAudioName: 
   extraMoveSpeed: 0
@@ -989,38 +1020,40 @@ MonoBehaviour:
     isActive: 0
     controlPoints:
     - {x: 0, y: 0, z: 0}
-    - {x: -1.7328203, y: 0.7749173, z: 1.4223565}
-    - {x: 0.3307275, y: -0.0420354, z: 3.1231074}
-    - {x: 0, y: 0, z: 5}
+    - {x: -5.991778, y: 11.401026, z: 2.6156032}
+    - {x: 6.483411, y: -1.7293668, z: 6.2406206}
+    - {x: 0, y: 0, z: 22.48019}
     allDis: 0
   maxDis: 20
---- !u!54 &916268634625053519
-Rigidbody:
+--- !u!114 &677279902485292160
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7797750196052067437}
-  serializedVersion: 4
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
-  m_UseGravity: 1
-  m_IsKinematic: 1
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad68eeb04858bfe4a845d021e8d48077, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offRotation: {x: 0, y: -90, z: 180}
+  bodys:
+  - {fileID: 5308593044411586627}
+  - {fileID: 6371039679233382136}
+  - {fileID: 5753177128787202825}
+  - {fileID: 1369930539169240919}
+  - {fileID: 8346665726171099011}
+  - {fileID: 7001932010641342593}
+  - {fileID: 4748928776387753978}
+  - {fileID: 6536788840627830106}
+  - {fileID: 6350026575152432370}
+  - {fileID: 8059291242587138979}
+  - {fileID: 5768878797721049762}
+  - {fileID: 6371397751334135514}
+  - {fileID: 1810992592661290339}
+  - {fileID: 9011023807037736751}
+  bodyDis: []
 --- !u!1 &7801148123395841449
 GameObject:
   m_ObjectHideFlags: 0
@@ -1079,13 +1112,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8086327070934025245}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000060816348, y: 2.6348707e-10, z: 0.04328361, w: 0.99906284}
-  m_LocalPosition: {x: -0.38930967, y: -0.000000076293944, z: 0.000000055300205}
+  m_LocalRotation: {x: 0.707105, y: -0.00162179, z: 0.70710486, w: -0.00162179}
+  m_LocalPosition: {x: -0, y: 0.41138422, z: 0.1269393}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4748928776387753978}
-  m_Father: {fileID: 8346665726171099011}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8423421314582712413
 GameObject:
@@ -1112,13 +1144,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8423421314582712413}
   serializedVersion: 2
-  m_LocalRotation: {x: 3.6060577e-16, y: 7.058577e-15, z: 0.07488554, w: 0.99719214}
-  m_LocalPosition: {x: -0.39011472, y: -0.00000061035155, z: 0.00000005370188}
+  m_LocalRotation: {x: 0.7071002, y: -0.003060583, z: 0.7071001, w: -0.0030605756}
+  m_LocalPosition: {x: -0, y: 0.3883525, z: -2.1213546}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1810992592661290339}
-  m_Father: {fileID: 5768878797721049762}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8762305196601682268
 GameObject:

+ 1 - 1
Assets/Art/VFX/vfx_wuqi/1402long/1402long.mat

@@ -117,7 +117,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
-    - _Diss_value: 0
+    - _Diss_value: -0.03
     - _DstBlend: 0
     - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1

+ 1 - 1
Assets/Art/VFX/vfx_wuqi/1402long/long.controller

@@ -11,7 +11,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -1554127990298692436}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 390, y: 100, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

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

@@ -28,6 +28,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-4718902783258376847
+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: attack3_1
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3899372176927883266
+  references:
+    version: 2
+    RefIds:
+    - rid: 3899372176927883266
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 6014afcc65ff52a4e846fd0c1483c9b6, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -45,6 +73,7 @@ MonoBehaviour:
     - {fileID: 5809678034847680219}
     - {fileID: 1485322484274848399}
     - {fileID: -6275841264099654957}
+    - {fileID: -4718902783258376847}
     _Modifiers:
     - _From: 0
       _To: 0
@@ -73,6 +102,27 @@ MonoBehaviour:
     - _From: 0
       _To: 2
       _Fade: 0
+    - _From: 0
+      _To: 3
+      _Fade: 0
+    - _From: 1
+      _To: 3
+      _Fade: 0
+    - _From: 2
+      _To: 3
+      _Fade: 0
+    - _From: 3
+      _To: 3
+      _Fade: 0
+    - _From: 3
+      _To: 2
+      _Fade: 0
+    - _From: 3
+      _To: 1
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &1485322484274848399

文件差異過大導致無法顯示
+ 0 - 1
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\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tiangangjianqijue\",\"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.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_tiangangjianqijue_sf\",\"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\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"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,\"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}}

文件差異過大導致無法顯示
+ 0 - 1
Assets/Res/TimeLineAssets/1103_timeline_TD.txt


文件差異過大導致無法顯示
+ 0 - 1
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"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1403\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"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\":\"fx_gf_liaoyuanzhi\",\"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,\"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}}

文件差異過大導致無法顯示
+ 0 - 1
Assets/Res/TimeLineAssets/jianjue_timeline_TD.txt


+ 61 - 3
Assets/Scenes/testCombat.scene

@@ -2185,7 +2185,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
@@ -2261,7 +2261,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.data[0]
-      value: 14055
+      value: 14022
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].skill.Array.data[0]
@@ -4743,6 +4743,63 @@ Sprite:
     - {x: 0.415, y: 0.16499999}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1001 &667277092
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.958
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 4.24
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.78
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7797750196052067437, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_Name
+      value: fx_gf_1402
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
 --- !u!1 &675361046
 GameObject:
   m_ObjectHideFlags: 0
@@ -9427,7 +9484,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.x
@@ -13262,3 +13319,4 @@ SceneRoots:
   - {fileID: 1359684029}
   - {fileID: 1544803331}
   - {fileID: 1085826000}
+  - {fileID: 667277092}

+ 9 - 6
Assets/Scripts/GameLogic/Combat/Skill/S1402.cs

@@ -27,9 +27,13 @@ namespace GameLogic.Combat.Skill
             ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
-                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+                float x = CombatCalculateTool.Instance.GetOdd(-100, 100);
+                x = (x ) / 200;
+                Vector3 pos = new Vector3(x, 0.7f, -2f);
+                pos = CombatHeroEntity.GameObject.transform.TransformPoint(pos);
+                // SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo(pos);
                 ActivationTimeLineData("1402_fashe", currTarget: currTarget,
-                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+                    customizePos: new Vector3[] { pos }, indexCount: i, startTime: -0.2f * i);
             }
 
             ActivationTimeLineData("1402");
@@ -40,16 +44,15 @@ namespace GameLogic.Combat.Skill
         {
         }
 
-      
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData,ISkillFeatures skillFeatures)
+            TriggerData triggerData, ISkillFeatures skillFeatures)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[1]);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
-                AttType.Skill, triggerData, wuXingType,skillFeatures,
+                AttType.Skill, triggerData, wuXingType, skillFeatures,
                 HarmType.Default);
 
             if (harmReturnInfo.isHitHero)
@@ -76,7 +79,7 @@ namespace GameLogic.Combat.Skill
                         CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                         effectValue[4]);
                     CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v2,
-                        AttType.Skill, triggerData, wuXingType,skillFeatures,
+                        AttType.Skill, triggerData, wuXingType, skillFeatures,
                         HarmType.Default);
                 }
             }

+ 7 - 0
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs

@@ -19,6 +19,7 @@ namespace Common.Combat.FxAILogic
 {
     public abstract class FxAILogicBasic : MonoBehaviour, IDisposable, ITimelineFxLogic, ITriggerEntity
     {
+        [Header("移动的根节点,默认是root")] public GameObject moveTarget;
         private TimeLineEventParticleLogicBasic _timeLineEventParticleLogicBasic;
         private ILifetCycleHitPoint _attTarget;
 
@@ -106,6 +107,12 @@ namespace Common.Combat.FxAILogic
                 Dispose();
                 return;
             }
+
+            if (moveTarget == null)
+            {
+                moveTarget = ObjectPoolInterface.own;
+            }
+
             ObjectPoolInterface.own.SetActive(false);
             BarrierTriggerData = new BarrierTriggerData();
             isNotMove = false;

+ 16 - 15
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -14,6 +14,7 @@ namespace Common.Combat.FxAILogic
     [AddComponentMenu("特效脚本/弹道/功法通用弹道")]
     public class FxParabolaBulletLogic : FxAILogicBasic
     {
+      
         public float speed;
         private IUnRegister UnRegister = null;
 
@@ -50,7 +51,7 @@ namespace Common.Combat.FxAILogic
         protected override void ProInit()
         {
             maxDisSpr = maxDis * maxDis;
-           
+
             if (isUseCustomTargetEndPos)
             {
                 endPos = TimeLineEventParticleLogicBasic.customizePos[
@@ -82,7 +83,7 @@ namespace Common.Combat.FxAILogic
                 startDir = (startDir - _currPos).normalized;
                 dirLerpTime = 0;
                 dir = (endPos - CurrPos).normalized;
-                gameObject.transform.rotation = Quaternion.LookRotation(dir);
+                moveTarget.transform.rotation = Quaternion.LookRotation(dir);
             }
             else if (parabolaCurveType == CurveType.Beeline)
             {
@@ -105,7 +106,7 @@ namespace Common.Combat.FxAILogic
                     Vector3 p = BesselPath.controlPoints[i];
                     if (isUseX)
                     {
-                        if (i == 1)
+                        if (i == 1||i==2)
                         {
                             p.x = pos.x > 0 ? p.x * -1 : p.x;
                         }
@@ -118,10 +119,10 @@ namespace Common.Combat.FxAILogic
                 moveBezierPath.SetLengthAtT();
 
                 currTime = 0;
-              
             }
+
             CombatUpdate(0.016f);
-            UnRegister = gameObject.OnTriggerEnterEvent(this, OnTriggerEnterEvent);
+            UnRegister = moveTarget.OnTriggerEnterEvent(this, OnTriggerEnterEvent);
         }
 
         private float GetMoveSpeed()
@@ -262,12 +263,12 @@ namespace Common.Combat.FxAILogic
                 {
                     timeLineTriggerEvent.TimeLineTrigger(
                         TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
-                        target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData,SkillFeaturesData);
+                        target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData, SkillFeaturesData);
                     if (!BarrierTriggerData.isPenetrate)
                     {
                         if (!string.IsNullOrEmpty(hitFxName))
                         {
-                            FinishHit(collision.ClosestPoint(gameObject.transform.position), hitFxName);
+                            FinishHit(collision.ClosestPoint(moveTarget.transform.position), hitFxName);
                         }
 
                         AudioManager.Instance.PlayAudio(hitAudioName, false);
@@ -305,10 +306,10 @@ namespace Common.Combat.FxAILogic
             if (timeLineTriggerEvent != null)
             {
                 timeLineTriggerEvent.TimeLineTrigger(TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
-                    target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData,SkillFeaturesData);
+                    target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData, SkillFeaturesData);
                 if (!string.IsNullOrEmpty(hitFxName))
                 {
-                    FinishHit(collision.ClosestPoint(gameObject.transform.position), hitFxName);
+                    FinishHit(collision.ClosestPoint(moveTarget.transform.position), hitFxName);
                 }
 
                 AudioManager.Instance.PlayAudio(hitAudioName, false);
@@ -360,9 +361,9 @@ namespace Common.Combat.FxAILogic
             // startDir= dir;
             Vector3 lasetPos = _currPos;
             _currPos += dir * GetMoveSpeed() * time;
-            gameObject.transform.position = _currPos;
+            moveTarget.transform.position = _currPos;
 
-            gameObject.transform.rotation = Quaternion.LookRotation(dir);
+            moveTarget.transform.rotation = Quaternion.LookRotation(dir);
         }
 
         private void CustomizeCurve(float time)
@@ -374,8 +375,8 @@ namespace Common.Combat.FxAILogic
             // moveBezierPath.controlPoints[0] = (gameObject.transform.TransformPoint(BesselPath.controlPoints[0]));
             Vector3 p = moveBezierPath.CalculatePoint(currTime);
             Vector3 p2 = moveBezierPath.CalculatePoint(currTime - 0.01f);
-            gameObject.transform.position = p;
-            gameObject.transform.rotation = Quaternion.LookRotation((p - p2).normalized);
+            moveTarget.transform.position = p;
+            moveTarget.transform.rotation = Quaternion.LookRotation((p - p2).normalized);
         }
 
         private void DynamicCurve(float time)
@@ -392,9 +393,9 @@ namespace Common.Combat.FxAILogic
             // startDir= dir;
             Vector3 lasetPos = _currPos;
             _currPos += dir * GetMoveSpeed() * time;
-            gameObject.transform.position = _currPos;
+            moveTarget.transform.position = _currPos;
 
-            gameObject.transform.rotation = Quaternion.LookRotation(dir);
+            moveTarget.transform.rotation = Quaternion.LookRotation(dir);
         }
 
         protected override void ProDispose()

+ 53 - 0
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/S1402_FXLogic.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Common.Combat.FxAILogic;
+using UnityEngine;
+
+public class S1402_FXLogic : MonoBehaviour
+{
+    public Vector3 offRotation;
+    public Transform[] bodys;
+
+    public float[] bodyDis;
+    private Vector3[] defaultPos;
+    Quaternion offRotationQ;
+    private void Awake()
+    {
+        bodyDis = new float[bodys.Length];
+        defaultPos = new Vector3[bodys.Length];
+        defaultPos[0]=bodys[0].position;
+        for (int i = 1; i < bodys.Length; i++)
+        {
+           
+            Transform t1 = bodys[i - 1];
+            Transform t2 = bodys[i];
+            defaultPos[i]=t2.localPosition;
+            bodyDis[i] = Vector3.Distance(t1.position, t2.position);
+        }
+        offRotationQ=Quaternion.Euler(offRotation);
+    }
+
+    private void OnEnable()
+    {
+        for (int i = 0; i < bodys.Length; i++)
+        {
+            bodys[i].localPosition = defaultPos[i];
+        }
+    }
+
+    private void LateUpdate()
+    {
+        bodys[0].rotation *= Quaternion.Euler(0, 270, 0);
+        for (int i = 1; i < bodys.Length; i++)
+        {
+            Transform t1 = bodys[i - 1];
+            Transform t2 = bodys[i];
+            float d = bodyDis[i];
+            Vector3 dir = (t2.position - t1.position).normalized;
+            Quaternion q = Quaternion.LookRotation(dir)*offRotationQ;
+            t2.rotation=q;
+            t2.position = t1.position + dir * d;
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/S1402_FXLogic.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Xi4ZvX/4AXt8qdpHI2YQEPSm/+4mXLARKh00bMfuw1tHmEVRJOyAwo/xfAKA
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

文件差異過大導致無法顯示
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


+ 10 - 10
UserSettings/EditorUserSettings.asset

@@ -21,34 +21,34 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 53010604000559080958097347250f44444e48732e707e34797e1f30b4e3376f
+      value: 0601015304040b595e5c592115705b44424f4b7e787877617c7a4430e0b2326b
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 0601015304040b595e5c592115705b44424f4b7e787877617c7a4430e0b2326b
+      value: 505057005d51580d5d0b5472482006444f15487e292b7f64287b1c65e6e3316a
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 505057005d51580d5d0b5472482006444f15487e292b7f64287b1c65e6e3316a
+      value: 5701555f5d02585f09575a7246755a44454f4e287b2a75607c7f4c6ab0e5376d
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5701555f5d02585f09575a7246755a44454f4e287b2a75607c7f4c6ab0e5376d
+      value: 0704520503075f5809580e7b15770644154f1d73292c7e692f78456be6b36468
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 0704520503075f5809580e7b15770644154f1d73292c7e692f78456be6b36468
+      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
+      value: 0150565056040b095b0a0d7143725944101648287f2a72352b7e1967e7e2356e
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 0150565056040b095b0a0d7143725944101648287f2a72352b7e1967e7e2356e
+      value: 070803025d005d095e085875407a084447161b282f7f72332b2c4832e1b46560
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
+      value: 0750575e51500c020b0b0a7047715a4417154f73747b73622c2d4930b4e5356b
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -10,6 +10,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollectionExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fde80aed0bd3646409e8bfb15c101f005e2000_003Fb3_003F5c77f01e_003FCollectionExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollider_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2193ba18cb0546b2832917f7674384cf20000_003F3a_003Fa0da6a1e_003FCollider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F23_003Fdf7b38e0_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fad_003Fcb4b4f1f_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc8_003F6520f62d_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditor_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003F3c_003F2c949974_003FEditor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

部分文件因文件數量過多而無法顯示