Browse Source

添加功法

DESKTOP-FB72PO8\Administrator 3 tuần trước cách đây
mục cha
commit
0d591157b3

+ 194 - 1
Assets/Art/ArtHero/Nanzhu.prefab

@@ -1799,6 +1799,196 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8337225621856230769}
   m_LocalEulerAnglesHint: {x: 0.46251035, y: 16.587234, z: -4.7615733}
+--- !u!1 &2465070876798450240
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1218920481803884576}
+  - component: {fileID: 6405069392919689355}
+  - component: {fileID: 2688906658405038478}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Line
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1218920481803884576
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2465070876798450240}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.619}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7138274267145577638}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!120 &6405069392919689355
+LineRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2465070876798450240}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 3616ce87b32db8b4e9a7fcea5f28a3b7, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Positions:
+  - {x: 0, y: 0, z: 0}
+  - {x: 0, y: 0, z: 1}
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 0.1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.84472084
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.049682617
+        inSlope: -1.584133
+        outSlope: -1.584133
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.12500003
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    textureScale: {x: 1, y: 1}
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MaskInteraction: 0
+  m_UseWorldSpace: 1
+  m_Loop: 0
+  m_ApplyActiveColorSpace: 1
+--- !u!114 &2688906658405038478
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2465070876798450240}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7d939771673368a45937f98dae9b41d2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offQuanZhong:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: -0.0041666664
+      value: 0.99882126
+      inSlope: -1.320765
+      outSlope: -1.320765
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0.04979253
+    - serializedVersion: 3
+      time: 1
+      value: 0.5
+      inSlope: -0.0068197474
+      outSlope: -0.0068197474
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.34439835
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  rootTran: {fileID: 1218920481803884576}
+  count: 10
+  maxDis: 2
+  _linePointInfo: []
 --- !u!1 &2511168210110294320
 GameObject:
   m_ObjectHideFlags: 0
@@ -5788,7 +5978,10 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 3529304473156151762, guid: e98123b0464151a4bb4df521121f34d9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1218920481803884576}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e98123b0464151a4bb4df521121f34d9, type: 3}
 --- !u!4 &7138274267145577638 stripped

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 425 - 443
Assets/Res/CombatHero/Boss01.prefab


+ 191 - 0
Assets/Res/CombatHero/Nanzhu.prefab

@@ -3062,6 +3062,7 @@ Transform:
   - {fileID: 4501145304847097903}
   - {fileID: 2932231524936236044}
   - {fileID: 3307815797954414493}
+  - {fileID: 6271754470148831388}
   m_Father: {fileID: 7980208121730886396}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6568964744699825309
@@ -3725,6 +3726,196 @@ Transform:
   - {fileID: 6674290530522452802}
   m_Father: {fileID: 692069673640557588}
   m_LocalEulerAnglesHint: {x: 1.6360048, y: -0.3420888, z: -23.232197}
+--- !u!1 &8105595062276188006
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6271754470148831388}
+  - component: {fileID: 649673291142649595}
+  - component: {fileID: 1221947545574298827}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Line
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6271754470148831388
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8105595062276188006}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.619}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2662654692604703939}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!120 &649673291142649595
+LineRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8105595062276188006}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 3616ce87b32db8b4e9a7fcea5f28a3b7, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Positions:
+  - {x: 0, y: 0, z: 0}
+  - {x: 0, y: 0, z: 1}
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 0.1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.84472084
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.049682617
+        inSlope: -1.584133
+        outSlope: -1.584133
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.12500003
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    textureScale: {x: 1, y: 1}
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MaskInteraction: 0
+  m_UseWorldSpace: 1
+  m_Loop: 0
+  m_ApplyActiveColorSpace: 1
+--- !u!114 &1221947545574298827
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8105595062276188006}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7d939771673368a45937f98dae9b41d2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offQuanZhong:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: -0.0041666664
+      value: 0.99882126
+      inSlope: -1.320765
+      outSlope: -1.320765
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0.04979253
+    - serializedVersion: 3
+      time: 1
+      value: 0.5
+      inSlope: -0.0068197474
+      outSlope: -0.0068197474
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.34439835
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  rootTran: {fileID: 6271754470148831388}
+  count: 10
+  maxDis: 2
+  _linePointInfo: []
 --- !u!1 &8157072182123631697
 GameObject:
   m_ObjectHideFlags: 0

+ 33 - 33
Assets/Res/CombatHero/fb_3101.prefab

@@ -72,6 +72,38 @@ MonoBehaviour:
   _Animator: {fileID: 6919295934107179613}
   _Transitions: {fileID: 11400000, guid: 230f24058e9f56b42ad6a34f9a45652d, type: 2}
   _ActionOnDisable: 0
+--- !u!1 &1726912062431574551
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6702737919524919132}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6702737919524919132
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1726912062431574551}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.0000034666066, y: -0.0000034454445, z: -0.7092684, w: 0.7049386}
+  m_LocalPosition: {x: -0.0014843316, y: 0.255734, z: 0.0000000111784875}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1419627869443203312}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2913977674401134542
 GameObject:
   m_ObjectHideFlags: 0
@@ -215,7 +247,7 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5654767920754603888}
+  - {fileID: 6702737919524919132}
   m_Father: {fileID: 327998283763961317}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6698746874094658648
@@ -428,38 +460,6 @@ SphereCollider:
   serializedVersion: 3
   m_Radius: 2.5
   m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &8487637267489621997
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5654767920754603888}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5654767920754603888
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8487637267489621997}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.0000034666066, y: -0.0000034454445, z: -0.7092684, w: 0.7049386}
-  m_LocalPosition: {x: -0.0014843316, y: 0.255734, z: 0.0000000111784875}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1419627869443203312}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8620631572221498585
 GameObject:
   m_ObjectHideFlags: 0

+ 50 - 50
Assets/Res/CombatHero/fb_dao1.prefab

@@ -80,7 +80,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3562723674201918496}
-  - {fileID: 8064159616724688851}
+  - {fileID: 341433236240939723}
   m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &1164658870965195
@@ -135,7 +135,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3762066587073657769}
+  m_Father: {fileID: 8565182548359739858}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &7923005440633552504
 SkinnedMeshRenderer:
@@ -160,7 +160,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f58524814877b3e40882cfc86b50263f, type: 2}
+  - {fileID: 2100000, guid: 86993dbe6487a364cbe7896811a1b5bd, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -187,16 +187,16 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 3562723674201918496}
+  - {fileID: 2018949844395968379}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3562723674201918496}
+  m_RootBone: {fileID: 2018949844395968379}
   m_AABB:
     m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
     m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
---- !u!1 &3252717919954794025
+--- !u!1 &3315704827882945007
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -204,8 +204,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5385310624096171323}
-  - component: {fileID: 5818385223583229960}
+  - component: {fileID: 341433236240939723}
+  - component: {fileID: 2011055496560028418}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbdao1
@@ -214,28 +214,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5385310624096171323
+--- !u!4 &341433236240939723
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3252717919954794025}
+  m_GameObject: {fileID: 3315704827882945007}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068}
   m_LocalPosition: {x: 0.0017127597, y: 0.0099856565, z: -0.0027135524}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8565182548359739858}
+  m_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &5818385223583229960
+--- !u!137 &2011055496560028418
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3252717919954794025}
+  m_GameObject: {fileID: 3315704827882945007}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -252,7 +252,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 86993dbe6487a364cbe7896811a1b5bd, type: 2}
+  - {fileID: 2100000, guid: f58524814877b3e40882cfc86b50263f, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -279,9 +279,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 2080436865810212948}
+  - {fileID: 3562723674201918496}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2080436865810212948}
+  m_RootBone: {fileID: 3562723674201918496}
   m_AABB:
     m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
     m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
@@ -318,8 +318,8 @@ Transform:
   m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2080436865810212948}
-  - {fileID: 5385310624096171323}
+  - {fileID: 2018949844395968379}
+  - {fileID: 8064159616724688851}
   m_Father: {fileID: 3562723674201918496}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4841319616322308277
@@ -402,6 +402,38 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &5590284719876153940
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2018949844395968379}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2018949844395968379
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5590284719876153940}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.4986345, y: 0.50136185, z: 0.50136185, w: 0.4986345}
+  m_LocalPosition: {x: -0.000023143375, y: 0, z: -0.0119704185}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8565182548359739858}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6215354488376093969
 GameObject:
   m_ObjectHideFlags: 0
@@ -521,35 +553,3 @@ Transform:
   - {fileID: 8565182548359739858}
   m_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8524396712761896666
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2080436865810212948}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2080436865810212948
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8524396712761896666}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.4986345, y: 0.50136185, z: 0.50136185, w: 0.4986345}
-  m_LocalPosition: {x: -0.000023143375, y: 0, z: -0.0119704185}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8565182548359739858}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 106 - 106
Assets/Res/CombatHero/fb_ding1.prefab

@@ -70,7 +70,7 @@ SphereCollider:
   serializedVersion: 3
   m_Radius: 2.5
   m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &1093995286667772230
+--- !u!1 &915891261123967365
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -78,90 +78,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3057396901882598369}
-  - component: {fileID: 7526762644151156742}
+  - component: {fileID: 2457600077502199845}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbding1
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3057396901882598369
+--- !u!4 &2457600077502199845
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1093995286667772230}
+  m_GameObject: {fileID: 915891261123967365}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: 0.00000008742278, z: -1.9106855e-15, w: 1}
-  m_LocalPosition: {x: 0.0010262298, y: 0.3607047, z: 0.0013793564}
+  m_LocalRotation: {x: 0.0000034666066, y: -0.0000034454445, z: -0.7092684, w: 0.7049386}
+  m_LocalPosition: {x: -0.0014843316, y: 0.255734, z: 0.0000000111784875}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8990132256551677773}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &7526762644151156742
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1093995286667772230}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: e51f6fe61916bdc429f5c50f1883dbf0, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
-  m_Bones:
-  - {fileID: 8712801551819097098}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8712801551819097098}
-  m_AABB:
-    m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
-    m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &1623525566636903651
 GameObject:
   m_ObjectHideFlags: 0
@@ -210,38 +150,6 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &1955377790817370835
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8712801551819097098}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8712801551819097098
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1955377790817370835}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.0000034666066, y: -0.0000034454445, z: -0.7092684, w: 0.7049386}
-  m_LocalPosition: {x: -0.0014843316, y: 0.255734, z: 0.0000000111784875}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8990132256551677773}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2377362009792030562
 GameObject:
   m_ObjectHideFlags: 0
@@ -304,8 +212,8 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8712801551819097098}
-  - {fileID: 3057396901882598369}
+  - {fileID: 2457600077502199845}
+  - {fileID: 3557722492346635764}
   m_Father: {fileID: 8679617179344489080}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4033669629132829777
@@ -356,6 +264,98 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &4637087399725123188
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1035735780819833162}
+  - component: {fileID: 1285019419662063602}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbding1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1035735780819833162
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4637087399725123188}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: 0.00000008742278, z: -1.9106855e-15, w: 1}
+  m_LocalPosition: {x: 0.0010262298, y: 0.3607047, z: 0.0013793564}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1894970939113486830}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &1285019419662063602
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4637087399725123188}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: ac736dc4828e57d49ab30b5a3414c1bf, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
+  m_Bones:
+  - {fileID: 8679617179344489080}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 8679617179344489080}
+  m_AABB:
+    m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
+    m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &5064081042845336680
 GameObject:
   m_ObjectHideFlags: 0
@@ -388,7 +388,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8679617179344489080}
-  - {fileID: 3557722492346635764}
+  - {fileID: 1035735780819833162}
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &748615157677977061
@@ -443,7 +443,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1894970939113486830}
+  m_Father: {fileID: 8990132256551677773}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &2669355923862340939
 SkinnedMeshRenderer:
@@ -468,7 +468,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: ac736dc4828e57d49ab30b5a3414c1bf, type: 2}
+  - {fileID: 2100000, guid: e51f6fe61916bdc429f5c50f1883dbf0, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -495,9 +495,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 8679617179344489080}
+  - {fileID: 2457600077502199845}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8679617179344489080}
+  m_RootBone: {fileID: 2457600077502199845}
   m_AABB:
     m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
     m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}

+ 119 - 119
Assets/Res/CombatHero/fb_huohulu.prefab

@@ -70,6 +70,98 @@ MonoBehaviour:
   DotName: lingyu
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &256385291667035159
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2611168779589616515}
+  - component: {fileID: 5842484068623255575}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_hulu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2611168779589616515
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 256385291667035159}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5315834147508480038}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &5842484068623255575
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 256385291667035159}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: f3d79fc4671836747af1c04171aec002, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
+  m_Bones:
+  - {fileID: 9160172853801646544}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 9160172853801646544}
+  m_AABB:
+    m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
+    m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &505536922449034425
 GameObject:
   m_ObjectHideFlags: 0
@@ -135,7 +227,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9160172853801646544}
-  - {fileID: 4131563668958382124}
+  - {fileID: 2611168779589616515}
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4119005012996295677
@@ -191,7 +283,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3395690793032451430
+--- !u!1 &3331353102672156155
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -199,33 +291,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8763248839805234681}
+  - component: {fileID: 6746486956424624303}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: hulu1run (1)
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8763248839805234681
+--- !u!4 &6746486956424624303
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395690793032451430}
+  m_GameObject: {fileID: 3331353102672156155}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000054321042, y: 0.000000054323817, z: 0.7071068, w: 0.7071067}
-  m_LocalPosition: {x: 0.108, y: -0.002, z: -0}
-  m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
+  m_LocalRotation: {x: 0.000000054321042, y: -0.000000054323817, z: -0.7071068, w: 0.7071067}
+  m_LocalPosition: {x: 0.0017814379, y: 0.089754246, z: 0.0000000039232826}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3519324424275757210}
-  - {fileID: 7031036048625354967}
-  m_Father: {fileID: 9160172853801646544}
+  m_Children: []
+  m_Father: {fileID: 8763248839805234681}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4146896971153102790
+--- !u!1 &3395690793032451430
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -233,90 +323,32 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7031036048625354967}
-  - component: {fileID: 2157670628109972766}
+  - component: {fileID: 8763248839805234681}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_hulu
+  m_Name: hulu1run (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7031036048625354967
+--- !u!4 &8763248839805234681
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4146896971153102790}
+  m_GameObject: {fileID: 3395690793032451430}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: -0.000000054321042, y: 0.000000054323817, z: 0.7071068, w: 0.7071067}
+  m_LocalPosition: {x: 0.108, y: -0.002, z: -0}
+  m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8763248839805234681}
+  m_Children:
+  - {fileID: 6746486956424624303}
+  - {fileID: 4131563668958382124}
+  m_Father: {fileID: 9160172853801646544}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2157670628109972766
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4146896971153102790}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: d5464f0ff5f42434898b4ca5e0f3a3b9, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
-  m_Bones:
-  - {fileID: 3519324424275757210}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3519324424275757210}
-  m_AABB:
-    m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
-    m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &4646650871260632015
 GameObject:
   m_ObjectHideFlags: 0
@@ -348,7 +380,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5315834147508480038}
+  m_Father: {fileID: 8763248839805234681}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &8517376033930631362
 SkinnedMeshRenderer:
@@ -373,7 +405,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f3d79fc4671836747af1c04171aec002, type: 2}
+  - {fileID: 2100000, guid: d5464f0ff5f42434898b4ca5e0f3a3b9, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -400,9 +432,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 9160172853801646544}
+  - {fileID: 6746486956424624303}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9160172853801646544}
+  m_RootBone: {fileID: 6746486956424624303}
   m_AABB:
     m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
     m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}
@@ -457,38 +489,6 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &5944645572097284297
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3519324424275757210}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3519324424275757210
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5944645572097284297}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000054321042, y: -0.000000054323817, z: -0.7071068, w: 0.7071067}
-  m_LocalPosition: {x: 0.0017814379, y: 0.089754246, z: 0.0000000039232826}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8763248839805234681}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5946700858606240778
 GameObject:
   m_ObjectHideFlags: 0

+ 196 - 196
Assets/Res/CombatHero/fb_jian1.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &501502460964689709
+--- !u!1 &205411393183236771
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,90 +8,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1192501532934153881}
-  - component: {fileID: 6050097129459189668}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: hitpos
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1192501532934153881
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 501502460964689709}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.131}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2850277934501199321}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6050097129459189668
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 501502460964689709}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DotName: hitpos
-  followSkeleton: 0
-  myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &1047511870456823630
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1439812933337521677}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbjian1_run (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1439812933337521677
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1047511870456823630}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.00269293, y: -0.70710176, z: -0.00269293, w: 0.70710164}
-  m_LocalPosition: {x: 0.005, y: -0.008, z: -0}
-  m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4688398925017063905}
-  - {fileID: 1380972485855535237}
-  m_Father: {fileID: 7466859698293448862}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1723895046793606980
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1380972485855535237}
-  - component: {fileID: 3681083728677326100}
+  - component: {fileID: 2499674190630539183}
+  - component: {fileID: 8507142732755673350}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -100,13 +18,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1380972485855535237
+--- !u!4 &2499674190630539183
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1723895046793606980}
+  m_GameObject: {fileID: 205411393183236771}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
@@ -115,13 +33,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3681083728677326100
+--- !u!137 &8507142732755673350
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1723895046793606980}
+  m_GameObject: {fileID: 205411393183236771}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -165,16 +83,16 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
   m_Bones:
-  - {fileID: 4688398925017063905}
+  - {fileID: 7873865221050051946}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4688398925017063905}
+  m_RootBone: {fileID: 7873865221050051946}
   m_AABB:
     m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
     m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
---- !u!1 &2778996064610124439
+--- !u!1 &501502460964689709
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -182,55 +100,47 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1028615347405319678}
-  - component: {fileID: 5295049769349527351}
+  - component: {fileID: 1192501532934153881}
+  - component: {fileID: 6050097129459189668}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbjian1_run
+  m_Name: hitpos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1028615347405319678
+--- !u!4 &1192501532934153881
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2778996064610124439}
+  m_GameObject: {fileID: 501502460964689709}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.449}
+  m_LocalPosition: {x: 0, y: 0, z: 0.131}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7466859698293448862}
-  - {fileID: 8379544868775316697}
+  m_Children: []
   m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!95 &5295049769349527351
-Animator:
-  serializedVersion: 5
+--- !u!114 &6050097129459189668
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2778996064610124439}
+  m_GameObject: {fileID: 501502460964689709}
   m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 0}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
---- !u!1 &2790421725491447900
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &1047511870456823630
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -238,91 +148,33 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8379544868775316697}
-  - component: {fileID: 4076128094225944065}
+  - component: {fileID: 1439812933337521677}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_jian1
+  m_Name: fbjian1_run (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8379544868775316697
+--- !u!4 &1439812933337521677
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2790421725491447900}
+  m_GameObject: {fileID: 1047511870456823630}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: -0.00269293, y: -0.70710176, z: -0.00269293, w: 0.70710164}
+  m_LocalPosition: {x: 0.005, y: -0.008, z: -0}
+  m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1028615347405319678}
+  m_Children:
+  - {fileID: 7873865221050051946}
+  - {fileID: 2499674190630539183}
+  m_Father: {fileID: 7466859698293448862}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4076128094225944065
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2790421725491447900}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
-  m_Bones:
-  - {fileID: 7466859698293448862}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7466859698293448862}
-  m_AABB:
-    m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
-    m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
---- !u!1 &2952852402389578089
+--- !u!1 &2778996064610124439
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -330,30 +182,54 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4688398925017063905}
+  - component: {fileID: 1028615347405319678}
+  - component: {fileID: 5295049769349527351}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fbjian1_run
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4688398925017063905
+--- !u!4 &1028615347405319678
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2952852402389578089}
+  m_GameObject: {fileID: 2778996064610124439}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00269293, y: 0.70710176, z: 0.00269293, w: 0.70710164}
-  m_LocalPosition: {x: -1.6448311e-10, y: 0.008153026, z: -0.0037629348}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.449}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1439812933337521677}
+  m_Children:
+  - {fileID: 7466859698293448862}
+  - {fileID: 8782788248395210699}
+  m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &5295049769349527351
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2778996064610124439}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &3749266543314816333
 GameObject:
   m_ObjectHideFlags: 0
@@ -488,6 +364,98 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &4064148292968751682
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8782788248395210699}
+  - component: {fileID: 9074855017406667456}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_jian1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8782788248395210699
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4064148292968751682}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1028615347405319678}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &9074855017406667456
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4064148292968751682}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
+  m_Bones:
+  - {fileID: 7466859698293448862}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 7466859698293448862}
+  m_AABB:
+    m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
+    m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &5182842215280330390
 GameObject:
   m_ObjectHideFlags: 0
@@ -521,6 +489,38 @@ Transform:
   - {fileID: 1439812933337521677}
   m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6247668006819170245
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7873865221050051946}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7873865221050051946
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6247668006819170245}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00269293, y: 0.70710176, z: 0.00269293, w: 0.70710164}
+  m_LocalPosition: {x: -1.6448311e-10, y: 0.008153026, z: -0.0037629348}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1439812933337521677}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7849891338208220805
 GameObject:
   m_ObjectHideFlags: 0

+ 108 - 108
Assets/Res/CombatHero/fb_jian2.prefab

@@ -1,97 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &828282348096655094
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5811507564024763975}
-  - component: {fileID: 5008753405292080215}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbjian2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5811507564024763975
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828282348096655094}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.001073494, y: -0.00010567544, z: -0.095695294}
-  m_LocalScale: {x: 0.408649, y: 0.408649, z: 0.408649}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6865594351597376310}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &5008753405292080215
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 828282348096655094}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
-  m_Bones:
-  - {fileID: 6533086412356243130}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6533086412356243130}
-  m_AABB:
-    m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
-    m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &1943758829950784143
 GameObject:
   m_ObjectHideFlags: 0
@@ -226,7 +134,7 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.34, y: 0.36, z: 1.3845047}
   m_Center: {x: 0, y: 0, z: 0.10598475}
---- !u!1 &4740502625925022175
+--- !u!1 &4287526477644076915
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -234,30 +142,90 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6533086412356243130}
+  - component: {fileID: 8952235792856624030}
+  - component: {fileID: 8335130374322843872}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fbjian2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6533086412356243130
+--- !u!4 &8952235792856624030
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4740502625925022175}
+  m_GameObject: {fileID: 4287526477644076915}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.50025254, y: 0.4997474, z: 0.4997474, w: 0.50025254}
-  m_LocalPosition: {x: 0.0041293018, y: 0, z: -0.39396098}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.001073494, y: -0.00010567544, z: -0.095695294}
+  m_LocalScale: {x: 0.408649, y: 0.408649, z: 0.408649}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6865594351597376310}
+  m_Father: {fileID: 3525720028267400576}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &8335130374322843872
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4287526477644076915}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 8420e942e81a291449164dc3c4f357f3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
+  m_Bones:
+  - {fileID: 7074505583183483981}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 7074505583183483981}
+  m_AABB:
+    m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
+    m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &5291855315857285515
 GameObject:
   m_ObjectHideFlags: 0
@@ -288,8 +256,8 @@ Transform:
   m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6533086412356243130}
-  - {fileID: 5811507564024763975}
+  - {fileID: 3266530590906192968}
+  - {fileID: 4716738965492020883}
   m_Father: {fileID: 7074505583183483981}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6360724120513573557
@@ -373,6 +341,38 @@ Transform:
   - {fileID: 6865594351597376310}
   m_Father: {fileID: 3525720028267400576}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6846410371519530648
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3266530590906192968}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3266530590906192968
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6846410371519530648}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.50025254, y: 0.4997474, z: 0.4997474, w: 0.50025254}
+  m_LocalPosition: {x: 0.0041293018, y: 0, z: -0.39396098}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6865594351597376310}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6968568073675785829
 GameObject:
   m_ObjectHideFlags: 0
@@ -436,7 +436,7 @@ Transform:
   m_LocalScale: {x: 0.408649, y: 0.408649, z: 0.408649}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3525720028267400576}
+  m_Father: {fileID: 6865594351597376310}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &7418787684994205654
 SkinnedMeshRenderer:
@@ -461,7 +461,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 8420e942e81a291449164dc3c4f357f3, type: 2}
+  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -488,9 +488,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
   m_Bones:
-  - {fileID: 7074505583183483981}
+  - {fileID: 3266530590906192968}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7074505583183483981}
+  m_RootBone: {fileID: 3266530590906192968}
   m_AABB:
     m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
     m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
@@ -529,7 +529,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7074505583183483981}
-  - {fileID: 4716738965492020883}
+  - {fileID: 8952235792856624030}
   m_Father: {fileID: 9057844881385621598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7120436569189825082

+ 91 - 91
Assets/Res/CombatHero/fb_linglongta.prefab

@@ -86,7 +86,7 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.5, y: 0.9786749, z: 0.51}
   m_Center: {x: 0, y: 0.09983301, z: 0}
---- !u!1 &3580194636756566804
+--- !u!1 &2910685980630592845
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -94,8 +94,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5453257205577254170}
-  - component: {fileID: 7304961738102155940}
+  - component: {fileID: 5635258282733404110}
+  - component: {fileID: 1236016330712688993}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_linglongta
@@ -104,28 +104,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5453257205577254170
+--- !u!4 &5635258282733404110
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3580194636756566804}
+  m_GameObject: {fileID: 2910685980630592845}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 589998100047264782}
+  m_Father: {fileID: 120756530494083055}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &7304961738102155940
+--- !u!137 &1236016330712688993
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3580194636756566804}
+  m_GameObject: {fileID: 2910685980630592845}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -142,7 +142,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 838f24e6b06702f4e9c1920dbaac2574, type: 2}
+  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -169,9 +169,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
   m_Bones:
-  - {fileID: 4371632020068830266}
+  - {fileID: 4887794763406024427}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4371632020068830266}
+  m_RootBone: {fileID: 4887794763406024427}
   m_AABB:
     m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
     m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
@@ -258,7 +258,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5561411384629671683
+--- !u!1 &5500127987251366898
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -266,30 +266,90 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4371632020068830266}
+  - component: {fileID: 3231776680841960416}
+  - component: {fileID: 5893218522489894933}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fb_linglongta
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4371632020068830266
+--- !u!4 &3231776680841960416
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5561411384629671683}
+  m_GameObject: {fileID: 5500127987251366898}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000008506696, y: -0.00000077682074, z: -0.7026459, w: 0.7115397}
-  m_LocalPosition: {x: 0.003003329, y: 0.3102259, z: 0.000000013560405}
-  m_LocalScale: {x: 1.0651475, y: 1.0651475, z: 1.0651475}
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 589998100047264782}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &5893218522489894933
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5500127987251366898}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 838f24e6b06702f4e9c1920dbaac2574, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
+  m_Bones:
+  - {fileID: 6314342733247479616}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6314342733247479616}
+  m_AABB:
+    m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
+    m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &6069193922456573349
 GameObject:
   m_ObjectHideFlags: 0
@@ -320,8 +380,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4371632020068830266}
-  - {fileID: 5453257205577254170}
+  - {fileID: 6314342733247479616}
+  - {fileID: 3231776680841960416}
   m_Father: {fileID: 4887794763406024427}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6525093672149038688
@@ -438,7 +498,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4887794763406024427}
-  - {fileID: 1845715947009500738}
+  - {fileID: 5635258282733404110}
   m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8112392103606109572
@@ -477,7 +537,7 @@ MonoBehaviour:
   _Animator: {fileID: 8112392103606109572}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &8938234129487809371
+--- !u!1 &9208974120539907502
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -485,87 +545,27 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1845715947009500738}
-  - component: {fileID: 6486241998962750643}
+  - component: {fileID: 6314342733247479616}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_linglongta
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1845715947009500738
+--- !u!4 &6314342733247479616
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8938234129487809371}
+  m_GameObject: {fileID: 9208974120539907502}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: 0.0000008506696, y: -0.00000077682074, z: -0.7026459, w: 0.7115397}
+  m_LocalPosition: {x: 0.003003329, y: 0.3102259, z: 0.000000013560405}
+  m_LocalScale: {x: 1.0651475, y: 1.0651475, z: 1.0651475}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 120756530494083055}
+  m_Father: {fileID: 589998100047264782}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6486241998962750643
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8938234129487809371}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
-  m_Bones:
-  - {fileID: 4887794763406024427}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4887794763406024427}
-  m_AABB:
-    m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
-    m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1

+ 90 - 90
Assets/Res/CombatHero/fb_wulonglun.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &1443405341454595079
+--- !u!1 &598013411970405603
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,30 +8,90 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1336467593492326271}
+  - component: {fileID: 8281834725943987604}
+  - component: {fileID: 887955925863900944}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: wulonglun
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1336467593492326271
+--- !u!4 &8281834725943987604
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1443405341454595079}
+  m_GameObject: {fileID: 598013411970405603}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000013315736, y: -4.323337e-10, z: 0.99999475, w: -0.0032467872}
-  m_LocalPosition: {x: 0.0024026327, y: 0.002230635, z: 9.750415e-11}
+  m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8019158978286339551}
+  m_Father: {fileID: 2106735808395853295}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &887955925863900944
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 598013411970405603}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a78f967665a433842a8fa465bd7675d2, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
+  m_Bones:
+  - {fileID: 8985698407474411210}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 8985698407474411210}
+  m_AABB:
+    m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
+    m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &2106655689270820769
 GameObject:
   m_ObjectHideFlags: 0
@@ -150,7 +210,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2413334448953198556
+--- !u!1 &2905563792790260855
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -158,38 +218,38 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8334064864557355731}
-  - component: {fileID: 7324515030267634579}
+  - component: {fileID: 4054188882919538187}
+  - component: {fileID: 2862418067941951781}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: wulonglun
+  m_Name: wulonglun2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8334064864557355731
+--- !u!4 &4054188882919538187
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2413334448953198556}
+  m_GameObject: {fileID: 2905563792790260855}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
   m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2106735808395853295}
+  m_Father: {fileID: 8019158978286339551}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &7324515030267634579
+--- !u!137 &2862418067941951781
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2413334448953198556}
+  m_GameObject: {fileID: 2905563792790260855}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -206,7 +266,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: a78f967665a433842a8fa465bd7675d2, type: 2}
+  - {fileID: 2100000, guid: fbaa3d8e57dad6d4f92978954632c928, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -233,9 +293,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
   m_Bones:
-  - {fileID: 8985698407474411210}
+  - {fileID: 3410144848409527962}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8985698407474411210}
+  m_RootBone: {fileID: 3410144848409527962}
   m_AABB:
     m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
     m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}
@@ -323,7 +383,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &6322616896261511469
+--- !u!1 &6102316403729450065
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -331,90 +391,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8810012324202427936}
-  - component: {fileID: 3344176810379380294}
+  - component: {fileID: 3410144848409527962}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: wulonglun2
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8810012324202427936
+--- !u!4 &3410144848409527962
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6322616896261511469}
+  m_GameObject: {fileID: 6102316403729450065}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
+  m_LocalRotation: {x: 0.00000013315736, y: -4.323337e-10, z: 0.99999475, w: -0.0032467872}
+  m_LocalPosition: {x: 0.0024026327, y: 0.002230635, z: 9.750415e-11}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8019158978286339551}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3344176810379380294
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6322616896261511469}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: fbaa3d8e57dad6d4f92978954632c928, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
-  m_Bones:
-  - {fileID: 1336467593492326271}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 1336467593492326271}
-  m_AABB:
-    m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
-    m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &7141257263086483798
 GameObject:
   m_ObjectHideFlags: 0
@@ -445,8 +445,8 @@ Transform:
   m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1336467593492326271}
-  - {fileID: 8810012324202427936}
+  - {fileID: 3410144848409527962}
+  - {fileID: 4054188882919538187}
   m_Father: {fileID: 8985698407474411210}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!1 &7179850442623262044
@@ -530,7 +530,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8985698407474411210}
-  - {fileID: 8334064864557355731}
+  - {fileID: 8281834725943987604}
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!95 &852375880241615242

+ 138 - 138
Assets/Res/CombatHero/fb_yuping.prefab

@@ -32,7 +32,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &599265379002391614
+--- !u!1 &830323653225142647
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -40,7 +40,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2907909882228419691}
+  - component: {fileID: 7970759296972584285}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -49,20 +49,20 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2907909882228419691
+--- !u!4 &7970759296972584285
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 599265379002391614}
+  m_GameObject: {fileID: 830323653225142647}
   serializedVersion: 2
   m_LocalRotation: {x: 0.0000054902584, y: -0.0000053734734, z: -0.70370746, w: 0.7104899}
   m_LocalPosition: {x: 0.0068355557, y: 0.011254414, z: 4.9194604e-10}
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2408311897329936481}
+  m_Father: {fileID: 7864300003189669800}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1253890320904128996
 GameObject:
@@ -95,7 +95,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8974866603299107661}
+  m_Father: {fileID: 7864300003189669800}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &2569823386016739577
 SkinnedMeshRenderer:
@@ -105,7 +105,7 @@ SkinnedMeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1253890320904128996}
   m_Enabled: 1
-  m_CastShadows: 0
+  m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -120,7 +120,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: c87dc6d40fc68a445aa316c07eeee6f0, type: 2}
+  - {fileID: 2100000, guid: 4957e5184678c2d459ca5718cf85db80, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -147,9 +147,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 6598966518811955930}
+  - {fileID: 7970759296972584285}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6598966518811955930}
+  m_RootBone: {fileID: 7970759296972584285}
   m_AABB:
     m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
     m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
@@ -204,6 +204,98 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &2497106611140766073
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 816317365032727547}
+  - component: {fileID: 1797732577096249031}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: yuping
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &816317365032727547
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2497106611140766073}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00000006657903, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8974866603299107661}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &1797732577096249031
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2497106611140766073}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: c87dc6d40fc68a445aa316c07eeee6f0, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
+  m_Bones:
+  - {fileID: 6598966518811955930}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6598966518811955930}
+  m_AABB:
+    m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
+    m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &3027240060212061077
 GameObject:
   m_ObjectHideFlags: 0
@@ -323,7 +415,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6598966518811955930}
-  - {fileID: 264279905621998790}
+  - {fileID: 816317365032727547}
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8285792300048012968
@@ -362,132 +454,6 @@ MonoBehaviour:
   _Animator: {fileID: 8285792300048012968}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &3941316761858345346
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2408311897329936481}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_yuping_show
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2408311897329936481
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3941316761858345346}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.0000054429547, y: 0.0000054203256, z: 0.70370746, w: 0.7104899}
-  m_LocalPosition: {x: 0.079, y: -0.024, z: -0}
-  m_LocalScale: {x: 3.6666656, y: 3.6666656, z: 3.6666665}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2907909882228419691}
-  - {fileID: 6223406245894324381}
-  m_Father: {fileID: 6598966518811955930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5605808332428955725
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6223406245894324381}
-  - component: {fileID: 6919206934179613305}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: yuping
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6223406245894324381
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5605808332428955725}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.00000006657903, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2408311897329936481}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6919206934179613305
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5605808332428955725}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 4957e5184678c2d459ca5718cf85db80, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
-  m_Bones:
-  - {fileID: 2907909882228419691}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2907909882228419691}
-  m_AABB:
-    m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
-    m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &6642471949105620041
 GameObject:
   m_ObjectHideFlags: 0
@@ -566,6 +532,40 @@ Transform:
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2408311897329936481}
+  - {fileID: 7864300003189669800}
   m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8380015432052603336
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7864300003189669800}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_yuping_show
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7864300003189669800
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8380015432052603336}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.0000054429547, y: 0.0000054203256, z: 0.70370746, w: 0.7104899}
+  m_LocalPosition: {x: 0.079, y: -0.024, z: -0}
+  m_LocalScale: {x: 3.6666656, y: 3.6666656, z: 3.6666665}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7970759296972584285}
+  - {fileID: 264279905621998790}
+  m_Father: {fileID: 6598966518811955930}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 1 - 1
Assets/Scenes/testCombat.scene

@@ -2317,7 +2317,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 39 - 6
Assets/Scripts/Core/Utility/TailingLine.cs

@@ -14,6 +14,11 @@ public class TailingLine : MonoBehaviour
         public Vector3 dir;
     }
 
+    public AnimationCurve offQuanZhong;
+
+    public float quanZhong=5;
+
+    // public float addTime;
     public Transform rootTran;
     public int count;
     public float maxDis;
@@ -23,6 +28,7 @@ public class TailingLine : MonoBehaviour
 
     protected float minDis;
 
+
     private void Awake()
     {
         _lineRenderer = GetComponent<LineRenderer>();
@@ -38,7 +44,7 @@ public class TailingLine : MonoBehaviour
         for (int i = 0; i < count; i++)
         {
             LinePointInfo linePointInfo = new LinePointInfo();
-            Vector3 pos = rootTran.transform.TransformPoint(new Vector3(0, 0, minDis * i*-1));
+            Vector3 pos = rootTran.transform.TransformPoint(new Vector3(0, 0, minDis * i * -1));
             linePointInfo.pos = pos;
             linePointInfo.rotion = startRot;
             linePointInfo.dir = rootTran.transform.forward;
@@ -60,18 +66,45 @@ public class TailingLine : MonoBehaviour
         linePointInfo.rotion = rootTran.rotation.eulerAngles;
         linePointInfo.dir = rootTran.transform.forward;
         _lineRenderer.SetPosition(0, linePointInfo.pos);
+        // float at = (1 - addTime) / _linePointInfo.Count;
+
+        int m = _linePointInfo.Count / 2;
+        int c = _linePointInfo.Count - m;
+        float quanZhongWidget = 1.0f / c;
         for (int i = 1; i < _linePointInfo.Count; i++)
         {
+            float w = i * 1.0f / _linePointInfo.Count;
+            float at = offQuanZhong.Evaluate(w);
+            if (at <= 0)
+            {
+                at = 0.01f;
+            }
+
             LinePointInfo point = _linePointInfo[i];
             LinePointInfo lasetPoint = _linePointInfo[i - 1];
             Vector3 dir = lasetPoint.pos - point.pos;
-            Vector3 newDir = Vector3.Lerp(dir.normalized, lasetPoint.dir, 0.1f).normalized;
-            point.pos = lasetPoint.pos + (newDir * (minDis * -1));
+            float md = dir.magnitude;
+            if (md < minDis)
+            {
+                md = minDis;
+            }
+            else
+            {
+                md = Mathf.Lerp(md, minDis, at);
+            }
+
+            if (m == i)
+            {
+                var sin = Mathf.Sin(Time.time);
+                var cos = Mathf.Cos(Time.time);
+                Quaternion quaternion = Quaternion.Euler(sin * quanZhong, cos * quanZhong, 0);
+                dir = quaternion * dir;
+            }
+
+            Vector3 newDir = Vector3.Lerp(dir.normalized, lasetPoint.dir, at).normalized;
+            point.pos = lasetPoint.pos + (newDir * (md * -1));
             point.dir = newDir;
             _lineRenderer.SetPosition(i, point.pos);
-            // Quaternion q1= Quaternion.LookRotation(dir.normalized);
-            // Quaternion q2= Quaternion.LookRotation(lasetPoint.dir);
-            // Quaternion q = Quaternion.Lerp(q1, q2, 0.1f);
         }
     }
 }

+ 1 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -118,7 +118,7 @@ namespace GameLogic.Combat.CombatTool
 
             float qiangDu = 100;
             SkillFeaturesData skillFeaturesData = skillFeatures as SkillFeaturesData;
-            if (skillFeaturesData != null)
+            if (skillFeaturesData != null&&skillFeaturesData.maxHp>0)
             {
                 qiangDu = (skillFeaturesData.hp * 100) / skillFeaturesData.maxHp;
             }

+ 12 - 11
Assets/Scripts/GameLogic/Combat/Skill/S1401.cs

@@ -17,6 +17,17 @@ namespace GameLogic.Combat.Skill
         protected override void ProUseSkill()
         {
             ballisticsCount = (int)effectValue[0];
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>(1);
+                currTarget.Add(combatHeroHitPoint);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + zdPosIndex[i]);
+                ActivationTimeLineData("lieyanjian_zd", currTarget: currTarget,
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+            }
             this.AddTriggerCallBack("lieyanjian_zd", ProDefaultTimeLineTrigger_ZD);
             ActivationTimeLineData("1401");
         }
@@ -56,17 +67,7 @@ namespace GameLogic.Combat.Skill
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData,ISkillFeatures skillFeatures)
         {
-            for (int i = 0; i < effectValue[0]; i++)
-            {
-                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
-                    .GetThis<CombatHeroEntity>()
-                    .GetMainHotPoin<CombatHeroHitPoint>();
-                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>(1);
-                currTarget.Add(combatHeroHitPoint);
-                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + zdPosIndex[i]);
-                ActivationTimeLineData("lieyanjian_zd", currTarget: currTarget,
-                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
-            }
+           
         }
     }
 }

+ 10 - 10
UserSettings/EditorUserSettings.asset

@@ -21,34 +21,34 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 505057005d51580d5d0b5472482006444f15487e292b7f64287b1c65e6e3316a
+      value: 0704520503075f5809580e7b15770644154f1d73292c7e692f78456be6b36468
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5701555f5d02585f09575a7246755a44454f4e287b2a75607c7f4c6ab0e5376d
+      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 0704520503075f5809580e7b15770644154f1d73292c7e692f78456be6b36468
+      value: 0150565056040b095b0a0d7143725944101648287f2a72352b7e1967e7e2356e
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 0150565056040b095b0a0d7143725944101648287f2a72352b7e1967e7e2356e
+      value: 070803025d005d095e085875407a084447161b282f7f72332b2c4832e1b46560
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 0750575e51500c020b0b0a7047715a4417154f73747b73622c2d4930b4e5356b
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 070803025d005d095e085875407a084447161b282f7f72332b2c4832e1b46560
+      value: 540250560006580f5d0d597544775944444f4e2e7e2c71367f2b4b31b4b8626d
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 0750575e51500c020b0b0a7047715a4417154f73747b73622c2d4930b4e5356b
+      value: 5506075403000c0f585c0a2113700e44144e407d2e797e6575784f65b4b0673c
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 540250560006580f5d0d597544775944444f4e2e7e2c71367f2b4b31b4b8626d
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 515700535051580855590f2745765e44104e1c7f782d74362b784e60bbe3353e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

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