Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Art/ArtHero/Boss_QiongQi.prefab

@@ -6878,7 +6878,7 @@ GameObject:
   - component: {fileID: 2525606172927159227}
   - component: {fileID: 6729870775199769470}
   - component: {fileID: 671630231245957121}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Boss_QiongQi
   m_TagString: Untagged

Assets/Art/ArtHero/Boss_ShuGuai.prefab

@@ -1983,7 +1983,7 @@ GameObject:
   - component: {fileID: 6844662100777984690}
   - component: {fileID: 4575180082093760646}
   - component: {fileID: 7930951334258929589}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Boss_ShuGuai
   m_TagString: Untagged

Assets/Art/ArtHero/Gw_Man.prefab

@@ -429,7 +429,7 @@ GameObject:
   - component: {fileID: 5103682720129024760}
   - component: {fileID: 6527805921833676069}
   - component: {fileID: 3818802069020362906}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Gw_Man
   m_TagString: Untagged

Assets/Art/ArtHero/Gw_Woman.prefab

@@ -326,7 +326,7 @@ GameObject:
   - component: {fileID: 396933856734097702}
   - component: {fileID: 5118581101379158945}
   - component: {fileID: 8765232971657719265}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Gw_Woman
   m_TagString: Untagged

Assets/Art/ArtHero/Gw_zhizhu.prefab

@@ -240,7 +240,7 @@ GameObject:
   - component: {fileID: 92903259249238179}
   - component: {fileID: 244470989959863143}
   - component: {fileID: 2526818506209754930}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Gw_zhizhu
   m_TagString: Untagged

Assets/Art/ArtHero/gw_huli.prefab

@@ -363,7 +363,7 @@ GameObject:
   - component: {fileID: 3066598259677236564}
   - component: {fileID: 4804287893439076215}
   - component: {fileID: 6377784283708840298}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: gw_huli
   m_TagString: Untagged

Assets/Art/ArtHero/gw_xianhe.prefab

@@ -779,7 +779,7 @@ GameObject:
   - component: {fileID: 902395020435489489}
   - component: {fileID: 2586009323351835281}
   - component: {fileID: 1618251077750604395}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: root
   m_TagString: Untagged
@@ -1995,7 +1995,7 @@ GameObject:
   - component: {fileID: 4908537287636657849}
   - component: {fileID: 4708336851760190903}
   - component: {fileID: 8508411397686409098}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: gw_xianhe
   m_TagString: Untagged

Assets/Art/Character/Guaiwu/BossQiongQi/Boss_QiongQi.playable

@@ -142,6 +142,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos2
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -216,6 +217,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos3
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -265,6 +267,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -708,6 +711,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
     x: 1
@@ -1312,6 +1316,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1361,6 +1366,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 1
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1520,6 +1526,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 1
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1538,7 +1545,7 @@ MonoBehaviour:
   isAttSpeed: 0
   isLoop: 0
   loopAlone: 0
-  isActivityCustomTargetPos: 0
+  isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
   isRoat: 0
@@ -2024,6 +2031,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0

Assets/Art/VFX/FXPrefabs/fx gw laoshu zd.prefab

@@ -4848,7 +4848,6 @@ GameObject:
   - component: {fileID: 4549703131287283796}
   - component: {fileID: 3160199261674094191}
   - component: {fileID: 782681925891191511}
-  - component: {fileID: 1334813863390521901}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx gw laoshu zd
@@ -9770,6 +9769,7 @@ MonoBehaviour:
   multipleTargetDelayTime: 0.1
   hitFxName: fx gw laoshu zd hit
   hitAudioName: 
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -9816,19 +9816,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
---- !u!114 &1334813863390521901
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2645004484261668492}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfa417b106904e3fa8b8fdd30dfb0e38, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  delayTime: 0.5
 --- !u!1 &5123393947038394162
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/Boss_QiongQi.prefab

@@ -112,7 +112,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2649847854921583511}
-  - {fileID: 9183282419975755882}
+  - {fileID: 7259031627678092185}
   m_Father: {fileID: 1839027638732501379}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1107205835458973224
@@ -513,141 +513,6 @@ Transform:
   - {fileID: 2984826650034540660}
   m_Father: {fileID: 4184972942332897801}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2783102325905446106
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2663077158017417064}
-  - component: {fileID: 1717743942184710055}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: 5_qiongqi_01
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2663077158017417064
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2783102325905446106}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 7916124759235835689}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1717743942184710055
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2783102325905446106}
-  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: 6dfd584ebcb67774ebb926d289b9e062, 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: 8843994013809016245, guid: 7100d1320a961ca498db118425b30053, type: 3}
-  m_Bones:
-  - {fileID: 7633551116375538852}
-  - {fileID: 4713291663652667870}
-  - {fileID: 4215475559705529314}
-  - {fileID: 5075951773312959119}
-  - {fileID: 3414483184667088548}
-  - {fileID: 740214209368581394}
-  - {fileID: 3572633928092630144}
-  - {fileID: 5888048743765946491}
-  - {fileID: 4184972942332897801}
-  - {fileID: 1015647206680379909}
-  - {fileID: 1636592100894073129}
-  - {fileID: 6635153773524047823}
-  - {fileID: 6847460752606317811}
-  - {fileID: 337121520835448642}
-  - {fileID: 5483329431382551412}
-  - {fileID: 7394994403689946648}
-  - {fileID: 2984826650034540660}
-  - {fileID: 5577223479594090136}
-  - {fileID: 5144844492582153830}
-  - {fileID: 6470189175079036743}
-  - {fileID: 7999618725254932696}
-  - {fileID: 7515929964313448121}
-  - {fileID: 3061702981416354676}
-  - {fileID: 1839027638732501379}
-  - {fileID: 6240012005863691566}
-  - {fileID: 7838553377887008868}
-  - {fileID: 456564194934306359}
-  - {fileID: 7266440096477041774}
-  - {fileID: 7233595646205691017}
-  - {fileID: 2180334154632496721}
-  - {fileID: 3535870936805431281}
-  - {fileID: 7139812789116521553}
-  - {fileID: 9127149591449832434}
-  - {fileID: 2338732907831254401}
-  - {fileID: 4480251382408127652}
-  - {fileID: 2621173680689008467}
-  - {fileID: 1875747591968747186}
-  - {fileID: 8354466962305243695}
-  - {fileID: 6394647661063766813}
-  - {fileID: 9205788965875383}
-  - {fileID: 8441529932085039524}
-  - {fileID: 9212376181250886429}
-  - {fileID: 2666097809341684002}
-  - {fileID: 5061610068430809446}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6847460752606317811}
-  m_AABB:
-    m_Center: {x: 0.0016313419, y: -0.005997536, z: 0.00031523965}
-    m_Extent: {x: 0.05814209, y: 0.032689106, z: 0.03223925}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &2829772229821647295
 GameObject:
   m_ObjectHideFlags: 0
@@ -912,6 +777,38 @@ Transform:
   - {fileID: 8441529932085039524}
   m_Father: {fileID: 4184972942332897801}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3552370709121488481
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7259031627678092185}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Particle System
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7259031627678092185
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552370709121488481}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.0044, y: 0.001, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 864886980770349194}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3572874735542846488
 GameObject:
   m_ObjectHideFlags: 0
@@ -976,7 +873,7 @@ Transform:
   m_LocalScale: {x: 60, y: 60, z: 60}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2663077158017417064}
+  - {fileID: 2589818689175638206}
   - {fileID: 8866586502446609696}
   m_Father: {fileID: 5594557919007481883}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1246,38 +1143,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3572633928092630144}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4446141960175863983
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 9183282419975755882}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Particle System
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &9183282419975755882
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4446141960175863983}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0.0044, y: 0.001, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 864886980770349194}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4592921198476526726
 GameObject:
   m_ObjectHideFlags: 0
@@ -1703,6 +1568,141 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3414483184667088548}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7973319482007560407
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2589818689175638206}
+  - component: {fileID: 97619045016898917}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: 5_qiongqi_01
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2589818689175638206
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7973319482007560407}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7916124759235835689}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &97619045016898917
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7973319482007560407}
+  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: 6dfd584ebcb67774ebb926d289b9e062, 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: 8843994013809016245, guid: 7100d1320a961ca498db118425b30053, type: 3}
+  m_Bones:
+  - {fileID: 7633551116375538852}
+  - {fileID: 4713291663652667870}
+  - {fileID: 4215475559705529314}
+  - {fileID: 5075951773312959119}
+  - {fileID: 3414483184667088548}
+  - {fileID: 740214209368581394}
+  - {fileID: 3572633928092630144}
+  - {fileID: 5888048743765946491}
+  - {fileID: 4184972942332897801}
+  - {fileID: 1015647206680379909}
+  - {fileID: 1636592100894073129}
+  - {fileID: 6635153773524047823}
+  - {fileID: 6847460752606317811}
+  - {fileID: 337121520835448642}
+  - {fileID: 5483329431382551412}
+  - {fileID: 7394994403689946648}
+  - {fileID: 2984826650034540660}
+  - {fileID: 5577223479594090136}
+  - {fileID: 5144844492582153830}
+  - {fileID: 6470189175079036743}
+  - {fileID: 7999618725254932696}
+  - {fileID: 7515929964313448121}
+  - {fileID: 3061702981416354676}
+  - {fileID: 1839027638732501379}
+  - {fileID: 6240012005863691566}
+  - {fileID: 7838553377887008868}
+  - {fileID: 456564194934306359}
+  - {fileID: 7266440096477041774}
+  - {fileID: 7233595646205691017}
+  - {fileID: 2180334154632496721}
+  - {fileID: 3535870936805431281}
+  - {fileID: 7139812789116521553}
+  - {fileID: 9127149591449832434}
+  - {fileID: 2338732907831254401}
+  - {fileID: 4480251382408127652}
+  - {fileID: 2621173680689008467}
+  - {fileID: 1875747591968747186}
+  - {fileID: 8354466962305243695}
+  - {fileID: 6394647661063766813}
+  - {fileID: 9205788965875383}
+  - {fileID: 8441529932085039524}
+  - {fileID: 9212376181250886429}
+  - {fileID: 2666097809341684002}
+  - {fileID: 5061610068430809446}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6847460752606317811}
+  m_AABB:
+    m_Center: {x: 0.0016313419, y: -0.005997536, z: 0.00031523965}
+    m_Extent: {x: 0.05814209, y: 0.032689106, z: 0.03223925}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &8035876589473224738
 GameObject:
   m_ObjectHideFlags: 0
@@ -1884,7 +1884,7 @@ GameObject:
   - component: {fileID: 275845537028252308}
   - component: {fileID: 4028887229881904680}
   - component: {fileID: 5962849931983630885}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Boss_QiongQi
   m_TagString: Untagged

Assets/Res/CombatHero/Boss_ShuGuai.prefab

@@ -112,7 +112,7 @@ GameObject:
   - component: {fileID: 5678818723579936041}
   - component: {fileID: 7160578813726480411}
   - component: {fileID: 1557903237383788498}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Boss_ShuGuai
   m_TagString: Untagged

Assets/Res/CombatHero/Gw_Man.prefab

@@ -2996,7 +2996,7 @@ GameObject:
   - component: {fileID: 4119393079358081289}
   - component: {fileID: 5095572426648034643}
   - component: {fileID: 61622400220848940}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Gw_Man
   m_TagString: Untagged

Assets/Res/CombatHero/Gw_Woman.prefab

@@ -370,6 +370,145 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6724751357183853111}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1186603010911434767
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8473711014963132343}
+  - component: {fileID: 7900026293832846645}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: wm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8473711014963132343
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1186603010911434767}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4689403651027954678}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &7900026293832846645
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1186603010911434767}
+  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: 666bf6b2199c09d4cbede42c8ab1cb2f, type: 2}
+  - {fileID: 2100000, guid: 7e015994da837064ea5f560d6028f171, 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: -279490660103130825, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+  m_Bones:
+  - {fileID: 4945105727235907701}
+  - {fileID: 7998011065512805059}
+  - {fileID: 2875824643968434438}
+  - {fileID: 4248677326738097859}
+  - {fileID: 5162839080582139363}
+  - {fileID: 707116297476470572}
+  - {fileID: 2627763841881735539}
+  - {fileID: 8289826827911044960}
+  - {fileID: 6702039974819073683}
+  - {fileID: 3290157214916426052}
+  - {fileID: 4979146188316453770}
+  - {fileID: 5922647945082602202}
+  - {fileID: 7700620025704749262}
+  - {fileID: 5474164965816723409}
+  - {fileID: 7037949634439166392}
+  - {fileID: 3234669990609445998}
+  - {fileID: 7465753957165584665}
+  - {fileID: 4973968325740696111}
+  - {fileID: 38760862893537117}
+  - {fileID: 102873524844309378}
+  - {fileID: 5743892181385989825}
+  - {fileID: 1438598391994100946}
+  - {fileID: 1719176637416781598}
+  - {fileID: 8512988078373540005}
+  - {fileID: 6970545644056505566}
+  - {fileID: 3736153217138895566}
+  - {fileID: 7451230775751106176}
+  - {fileID: 6840279095240631963}
+  - {fileID: 76318306065102948}
+  - {fileID: 6288143965782374026}
+  - {fileID: 8876608975421870294}
+  - {fileID: 9222387932304255487}
+  - {fileID: 7590292098848221558}
+  - {fileID: 8344432450254821539}
+  - {fileID: 2545776145263777379}
+  - {fileID: 4918623048582214333}
+  - {fileID: 3416099278763638815}
+  - {fileID: 6724751357183853111}
+  - {fileID: 7212489018853604428}
+  - {fileID: 8383235835753341065}
+  - {fileID: 8493664108121398235}
+  - {fileID: 5473365459907701879}
+  - {fileID: 8752775908451386204}
+  - {fileID: 8761929975146425672}
+  - {fileID: 3158317442052950824}
+  - {fileID: 3670683118812269156}
+  - {fileID: 6539478059744295162}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 707116297476470572}
+  m_AABB:
+    m_Center: {x: 0.0012041712, y: -0.0040475377, z: 0.0013229363}
+    m_Extent: {x: 0.023381747, y: 0.009018118, z: 0.012216244}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &1240500905460819226
 GameObject:
   m_ObjectHideFlags: 0
@@ -963,7 +1102,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8708642259133131596}
-  - {fileID: 3182887494534956475}
+  - {fileID: 8473711014963132343}
   m_Father: {fileID: 4077517581177188005}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!95 &8787382300599713327
@@ -1983,145 +2122,6 @@ Transform:
   - {fileID: 2219153294754969309}
   m_Father: {fileID: 8344432450254821539}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6802716188446768561
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3182887494534956475}
-  - component: {fileID: 1868437131709474197}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: wm
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3182887494534956475
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6802716188446768561}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4689403651027954678}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1868437131709474197
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6802716188446768561}
-  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: 666bf6b2199c09d4cbede42c8ab1cb2f, type: 2}
-  - {fileID: 2100000, guid: 7e015994da837064ea5f560d6028f171, 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: -279490660103130825, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
-  m_Bones:
-  - {fileID: 4945105727235907701}
-  - {fileID: 7998011065512805059}
-  - {fileID: 2875824643968434438}
-  - {fileID: 4248677326738097859}
-  - {fileID: 5162839080582139363}
-  - {fileID: 707116297476470572}
-  - {fileID: 2627763841881735539}
-  - {fileID: 8289826827911044960}
-  - {fileID: 6702039974819073683}
-  - {fileID: 3290157214916426052}
-  - {fileID: 4979146188316453770}
-  - {fileID: 5922647945082602202}
-  - {fileID: 7700620025704749262}
-  - {fileID: 5474164965816723409}
-  - {fileID: 7037949634439166392}
-  - {fileID: 3234669990609445998}
-  - {fileID: 7465753957165584665}
-  - {fileID: 4973968325740696111}
-  - {fileID: 38760862893537117}
-  - {fileID: 102873524844309378}
-  - {fileID: 5743892181385989825}
-  - {fileID: 1438598391994100946}
-  - {fileID: 1719176637416781598}
-  - {fileID: 8512988078373540005}
-  - {fileID: 6970545644056505566}
-  - {fileID: 3736153217138895566}
-  - {fileID: 7451230775751106176}
-  - {fileID: 6840279095240631963}
-  - {fileID: 76318306065102948}
-  - {fileID: 6288143965782374026}
-  - {fileID: 8876608975421870294}
-  - {fileID: 9222387932304255487}
-  - {fileID: 7590292098848221558}
-  - {fileID: 8344432450254821539}
-  - {fileID: 2545776145263777379}
-  - {fileID: 4918623048582214333}
-  - {fileID: 3416099278763638815}
-  - {fileID: 6724751357183853111}
-  - {fileID: 7212489018853604428}
-  - {fileID: 8383235835753341065}
-  - {fileID: 8493664108121398235}
-  - {fileID: 5473365459907701879}
-  - {fileID: 8752775908451386204}
-  - {fileID: 8761929975146425672}
-  - {fileID: 3158317442052950824}
-  - {fileID: 3670683118812269156}
-  - {fileID: 6539478059744295162}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 707116297476470572}
-  m_AABB:
-    m_Center: {x: 0.0012041712, y: -0.0040475377, z: 0.0013229363}
-    m_Extent: {x: 0.023381747, y: 0.009018118, z: 0.012216244}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &6888317210019051519
 GameObject:
   m_ObjectHideFlags: 0
@@ -2349,7 +2349,7 @@ GameObject:
   - component: {fileID: 5038790577504756619}
   - component: {fileID: 7753527156799360775}
   - component: {fileID: 3429475382823404082}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Gw_Woman
   m_TagString: Untagged

Assets/Res/CombatHero/Gw_zhizhu.prefab

@@ -345,7 +345,7 @@ GameObject:
   - component: {fileID: 6174033549222467493}
   - component: {fileID: 7974354814680605321}
   - component: {fileID: 1796768579323402695}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Gw_zhizhu
   m_TagString: Untagged
@@ -492,7 +492,7 @@ Transform:
   m_Children:
   - {fileID: 4375332797482998228}
   - {fileID: 1039407194039690153}
-  - {fileID: 6896508366894690234}
+  - {fileID: 422183327268689617}
   m_Father: {fileID: 2459597128203963384}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5030634472939442188
@@ -1502,6 +1502,128 @@ Transform:
   - {fileID: 6531876887812496699}
   m_Father: {fileID: 7777782019114393166}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4336439054520656816
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 422183327268689617}
+  - component: {fileID: 2202401054221367382}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zhizhu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &422183327268689617
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4336439054520656816}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8529751435025211972}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &2202401054221367382
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4336439054520656816}
+  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: 8c514a8942d7b094bb48e1e37198a92d, 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: -4969684963106736597, guid: c15683ee273a8b74490914966c244a56, type: 3}
+  m_Bones:
+  - {fileID: 7777782019114393166}
+  - {fileID: 2955127695541546748}
+  - {fileID: 1940873282483797894}
+  - {fileID: 2423464138471604941}
+  - {fileID: 4039476480694981426}
+  - {fileID: 8676577379760744173}
+  - {fileID: 4444768496248903896}
+  - {fileID: 8907812497787986994}
+  - {fileID: 1114413951768031586}
+  - {fileID: 6113833115755923767}
+  - {fileID: 8239821622679986278}
+  - {fileID: 8432122107930014031}
+  - {fileID: 6641873281479813763}
+  - {fileID: 3043485132187435273}
+  - {fileID: 3405536710523543366}
+  - {fileID: 322005699376293213}
+  - {fileID: 5094308840763255419}
+  - {fileID: 1948876471943425403}
+  - {fileID: 1873728409672405505}
+  - {fileID: 6531876887812496699}
+  - {fileID: 2717603688642941856}
+  - {fileID: 4498197588915398868}
+  - {fileID: 6358255925422200648}
+  - {fileID: 2581008513175198891}
+  - {fileID: 3101387890518712916}
+  - {fileID: 3020479994449237558}
+  - {fileID: 556547103544448451}
+  - {fileID: 2994293195560805726}
+  - {fileID: 5722866064751970171}
+  - {fileID: 6648909816356258184}
+  - {fileID: 1669011939347238760}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 7777782019114393166}
+  m_AABB:
+    m_Center: {x: -0.0051682536, y: -0.0063814223, z: 0.00031678192}
+    m_Extent: {x: 0.034993865, y: 0.015985291, z: 0.026045501}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &4458271534750267118
 GameObject:
   m_ObjectHideFlags: 0
@@ -1924,128 +2046,6 @@ Transform:
   - {fileID: 8529751435025211972}
   m_Father: {fileID: 7141501200185110498}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
---- !u!1 &6210002313554286579
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6896508366894690234}
-  - component: {fileID: 2571384576045633900}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: zhizhu
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6896508366894690234
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6210002313554286579}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8529751435025211972}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2571384576045633900
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6210002313554286579}
-  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: 8c514a8942d7b094bb48e1e37198a92d, 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: -4969684963106736597, guid: c15683ee273a8b74490914966c244a56, type: 3}
-  m_Bones:
-  - {fileID: 7777782019114393166}
-  - {fileID: 2955127695541546748}
-  - {fileID: 1940873282483797894}
-  - {fileID: 2423464138471604941}
-  - {fileID: 4039476480694981426}
-  - {fileID: 8676577379760744173}
-  - {fileID: 4444768496248903896}
-  - {fileID: 8907812497787986994}
-  - {fileID: 1114413951768031586}
-  - {fileID: 6113833115755923767}
-  - {fileID: 8239821622679986278}
-  - {fileID: 8432122107930014031}
-  - {fileID: 6641873281479813763}
-  - {fileID: 3043485132187435273}
-  - {fileID: 3405536710523543366}
-  - {fileID: 322005699376293213}
-  - {fileID: 5094308840763255419}
-  - {fileID: 1948876471943425403}
-  - {fileID: 1873728409672405505}
-  - {fileID: 6531876887812496699}
-  - {fileID: 2717603688642941856}
-  - {fileID: 4498197588915398868}
-  - {fileID: 6358255925422200648}
-  - {fileID: 2581008513175198891}
-  - {fileID: 3101387890518712916}
-  - {fileID: 3020479994449237558}
-  - {fileID: 556547103544448451}
-  - {fileID: 2994293195560805726}
-  - {fileID: 5722866064751970171}
-  - {fileID: 6648909816356258184}
-  - {fileID: 1669011939347238760}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7777782019114393166}
-  m_AABB:
-    m_Center: {x: -0.0051682536, y: -0.0063814223, z: 0.00031678192}
-    m_Extent: {x: 0.034993865, y: 0.015985291, z: 0.026045501}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &6274717151404707655
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/fb_3101.prefab

@@ -73,7 +73,7 @@ MonoBehaviour:
   _Animator: {fileID: 6919295934107179613}
   _Transitions: {fileID: 11400000, guid: 230f24058e9f56b42ad6a34f9a45652d, type: 2}
   _ActionOnDisable: 0
---- !u!1 &1917584506289398573
+--- !u!1 &2118403862271958655
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -81,46 +81,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5643785301416598959}
-  - component: {fileID: 2334410097774364663}
+  - component: {fileID: 7394590640925211247}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: pengpos
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5643785301416598959
+--- !u!4 &7394590640925211247
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1917584506289398573}
+  m_GameObject: {fileID: 2118403862271958655}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.21}
+  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: 2566871063108411739}
+  m_Father: {fileID: 1419627869443203312}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2334410097774364663
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1917584506289398573}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DotName: pengpos
-  followSkeleton: 0
-  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &2913977674401134542
 GameObject:
   m_ObjectHideFlags: 0
@@ -5098,41 +5082,9 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5533750661104402167}
+  - {fileID: 7394590640925211247}
   m_Father: {fileID: 327998283763961317}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5471288638463620842
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5533750661104402167}
-  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 &5533750661104402167
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5471288638463620842}
-  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 &5707983376449416818
 GameObject:
   m_ObjectHideFlags: 0
@@ -14935,6 +14887,54 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!1 &6207401354811574521
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5419000558573401671}
+  - component: {fileID: 9063451026373018289}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: pengpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5419000558573401671
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6207401354811574521}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.21}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2566871063108411739}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9063451026373018289
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6207401354811574521}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: pengpos
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &6371966292403024051
 GameObject:
   m_ObjectHideFlags: 0
@@ -29618,7 +29618,7 @@ Transform:
   - {fileID: 494897741076913576}
   - {fileID: 1136834368834043035}
   - {fileID: 1367215891999932367}
-  - {fileID: 5643785301416598959}
+  - {fileID: 5419000558573401671}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!54 &3322395613801196915

Assets/Res/CombatHero/fb_dao1.prefab

@@ -1,5 +1,37 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &54469017266107943
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5790129391637566592}
+  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 &5790129391637566592
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 54469017266107943}
+  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 &809572923017224122
 GameObject:
   m_ObjectHideFlags: 0
@@ -80,7 +112,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3562723674201918496}
-  - {fileID: 6895736095072367340}
+  - {fileID: 88741161518558766}
   m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &1164658870965195
@@ -104,7 +136,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &1536243572809679665
+--- !u!1 &1498589303109114808
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -112,8 +144,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6895736095072367340}
-  - component: {fileID: 6972005664284182740}
+  - component: {fileID: 88741161518558766}
+  - component: {fileID: 3856221756301760850}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbdao1
@@ -122,13 +154,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6895736095072367340
+--- !u!4 &88741161518558766
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1536243572809679665}
+  m_GameObject: {fileID: 1498589303109114808}
   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}
@@ -137,13 +169,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6972005664284182740
+--- !u!137 &3856221756301760850
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1536243572809679665}
+  m_GameObject: {fileID: 1498589303109114808}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -196,7 +228,7 @@ SkinnedMeshRenderer:
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
---- !u!1 &2789745087214801119
+--- !u!1 &1536243572809679665
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -204,8 +236,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 137737720564992814}
-  - component: {fileID: 4398047792450268412}
+  - component: {fileID: 6895736095072367340}
+  - component: {fileID: 6972005664284182740}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbdao1
@@ -214,13 +246,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &137737720564992814
+--- !u!4 &6895736095072367340
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2789745087214801119}
+  m_GameObject: {fileID: 1536243572809679665}
   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}
@@ -229,13 +261,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8565182548359739858}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4398047792450268412
+--- !u!137 &6972005664284182740
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2789745087214801119}
+  m_GameObject: {fileID: 1536243572809679665}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -279,9 +311,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 1207606602477446263}
+  - {fileID: 5790129391637566592}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 1207606602477446263}
+  m_RootBone: {fileID: 5790129391637566592}
   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 +350,8 @@ Transform:
   m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1207606602477446263}
-  - {fileID: 137737720564992814}
+  - {fileID: 5790129391637566592}
+  - {fileID: 6895736095072367340}
   m_Father: {fileID: 3562723674201918496}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4841319616322308277
@@ -521,35 +553,3 @@ Transform:
   - {fileID: 8565182548359739858}
   m_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8835157081877907769
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1207606602477446263}
-  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 &1207606602477446263
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8835157081877907769}
-  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}

Assets/Res/CombatHero/fb_ding1.prefab

@@ -31,7 +31,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 &206358091987938453
 SkinnedMeshRenderer:
@@ -56,7 +56,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
@@ -83,9 +83,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 8679617179344489080}
+  - {fileID: 7626725028579245760}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8679617179344489080}
+  m_RootBone: {fileID: 7626725028579245760}
   m_AABB:
     m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
     m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
@@ -210,38 +210,6 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &2116142427385260368
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1062292329924629529}
-  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 &1062292329924629529
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2116142427385260368}
-  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,102 +272,10 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1062292329924629529}
-  - {fileID: 1622737233631898674}
+  - {fileID: 7626725028579245760}
+  - {fileID: 7117531926599154318}
   m_Father: {fileID: 8679617179344489080}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3268515223886811187
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1622737233631898674}
-  - component: {fileID: 6572521631221363076}
-  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 &1622737233631898674
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3268515223886811187}
-  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: 8990132256551677773}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6572521631221363076
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3268515223886811187}
-  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: 1062292329924629529}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 1062292329924629529}
-  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 &4033669629132829777
 GameObject:
   m_ObjectHideFlags: 0
@@ -480,7 +356,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8679617179344489080}
-  - {fileID: 7117531926599154318}
+  - {fileID: 2922318761024040769}
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &748615157677977061
@@ -504,6 +380,38 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &5704476920738302778
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7626725028579245760}
+  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 &7626725028579245760
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5704476920738302778}
+  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 &7964700976913853489
 GameObject:
   m_ObjectHideFlags: 0
@@ -624,3 +532,95 @@ Transform:
   - {fileID: 8990132256551677773}
   m_Father: {fileID: 1894970939113486830}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &9025270140611914582
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2922318761024040769}
+  - component: {fileID: 7740065142032186460}
+  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 &2922318761024040769
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9025270140611914582}
+  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 &7740065142032186460
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9025270140611914582}
+  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

Assets/Res/CombatHero/fb_huohulu.prefab

@@ -134,7 +134,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 &842294244840972062
 SkinnedMeshRenderer:
@@ -159,7 +159,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
@@ -186,9 +186,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 9160172853801646544}
+  - {fileID: 3779242221063759924}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9160172853801646544}
+  m_RootBone: {fileID: 3779242221063759924}
   m_AABB:
     m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
     m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}
@@ -227,7 +227,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9160172853801646544}
-  - {fileID: 21970029051936847}
+  - {fileID: 67115246683406487}
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4119005012996295677
@@ -283,38 +283,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2666647535407830336
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7780511927926815356}
-  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 &7780511927926815356
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2666647535407830336}
-  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 &3395690793032451430
 GameObject:
   m_ObjectHideFlags: 0
@@ -345,8 +313,8 @@ Transform:
   m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7780511927926815356}
-  - {fileID: 2022262493830056416}
+  - {fileID: 3779242221063759924}
+  - {fileID: 21970029051936847}
   m_Father: {fileID: 9160172853801646544}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4967031559869244623
@@ -397,98 +365,6 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &5410807061177155910
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2022262493830056416}
-  - component: {fileID: 6940225201478760113}
-  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 &2022262493830056416
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5410807061177155910}
-  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: 8763248839805234681}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6940225201478760113
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5410807061177155910}
-  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: 7780511927926815356}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7780511927926815356}
-  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 &5946700858606240778
 GameObject:
   m_ObjectHideFlags: 0
@@ -576,6 +452,98 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.41, y: 0.60432863, z: 0.43}
   m_Center: {x: 0, y: 0.15330195, z: 0}
+--- !u!1 &6319250338083385495
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 67115246683406487}
+  - component: {fileID: 5872818649073405277}
+  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 &67115246683406487
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6319250338083385495}
+  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 &5872818649073405277
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6319250338083385495}
+  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 &7053293013541296252
 GameObject:
   m_ObjectHideFlags: 0
@@ -624,3 +592,35 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &7718256392837296507
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3779242221063759924}
+  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 &3779242221063759924
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7718256392837296507}
+  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}

Assets/Res/CombatHero/fb_jian1.prefab

@@ -1,6 +1,88 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &87195016156510792
+--- !u!1 &501502460964689709
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  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: 6817217445930053774}
+  - {fileID: 8679696271690265477}
+  m_Father: {fileID: 7466859698293448862}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2714515836740346645
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +90,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5018291736692133323}
-  - component: {fileID: 3995255035610345685}
+  - component: {fileID: 8679696271690265477}
+  - component: {fileID: 5953246889239196620}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -18,28 +100,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5018291736692133323
+--- !u!4 &8679696271690265477
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 87195016156510792}
+  m_GameObject: {fileID: 2714515836740346645}
   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_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3995255035610345685
+--- !u!137 &5953246889239196620
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 87195016156510792}
+  m_GameObject: {fileID: 2714515836740346645}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -56,7 +138,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
+  - {fileID: 2100000, guid: d96695fd0f201484a981206048a40479, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -83,97 +165,15 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
   m_Bones:
-  - {fileID: 7466859698293448862}
+  - {fileID: 6817217445930053774}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7466859698293448862}
+  m_RootBone: {fileID: 6817217445930053774}
   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 &501502460964689709
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  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: 181477049166677361}
-  - {fileID: 7356033452411022349}
-  m_Father: {fileID: 7466859698293448862}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2778996064610124439
 GameObject:
   m_ObjectHideFlags: 0
@@ -206,7 +206,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7466859698293448862}
-  - {fileID: 5018291736692133323}
+  - {fileID: 6249773502145768875}
   m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5295049769349527351
@@ -364,7 +364,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &5182842215280330390
+--- !u!1 &4987636256528046791
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -372,7 +372,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7466859698293448862}
+  - component: {fileID: 6817217445930053774}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -381,23 +381,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7466859698293448862
+--- !u!4 &6817217445930053774
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5182842215280330390}
+  m_GameObject: {fileID: 4987636256528046791}
   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:
-  - {fileID: 1439812933337521677}
-  m_Father: {fileID: 1028615347405319678}
+  m_Children: []
+  m_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7849891338208220805
+--- !u!1 &5182842215280330390
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -405,31 +404,32 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5973240175850598617}
+  - component: {fileID: 7466859698293448862}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_jian1
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5973240175850598617
+--- !u!4 &7466859698293448862
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7849891338208220805}
+  m_GameObject: {fileID: 5182842215280330390}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  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: 2850277934501199321}
+  m_Children:
+  - {fileID: 1439812933337521677}
+  m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8972604681550652111
+--- !u!1 &6209577617317848554
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -437,8 +437,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7356033452411022349}
-  - component: {fileID: 2471179859546777953}
+  - component: {fileID: 6249773502145768875}
+  - component: {fileID: 171023855662719454}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -447,28 +447,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7356033452411022349
+--- !u!4 &6249773502145768875
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8972604681550652111}
+  m_GameObject: {fileID: 6209577617317848554}
   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: 1439812933337521677}
+  m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2471179859546777953
+--- !u!137 &171023855662719454
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8972604681550652111}
+  m_GameObject: {fileID: 6209577617317848554}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -485,7 +485,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: d96695fd0f201484a981206048a40479, type: 2}
+  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -512,16 +512,16 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
   m_Bones:
-  - {fileID: 181477049166677361}
+  - {fileID: 7466859698293448862}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 181477049166677361}
+  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 &9206831159997655228
+--- !u!1 &7849891338208220805
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -529,27 +529,27 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 181477049166677361}
+  - component: {fileID: 5973240175850598617}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fb_jian1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &181477049166677361
+--- !u!4 &5973240175850598617
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9206831159997655228}
+  m_GameObject: {fileID: 7849891338208220805}
   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}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1439812933337521677}
+  m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/CombatHero/fb_jian2.prefab

@@ -134,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 &2596333322828658127
+--- !u!1 &3194090646662862203
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -142,7 +142,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2991660745857884410}
+  - component: {fileID: 2482702149184930913}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -151,13 +151,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2991660745857884410
+--- !u!4 &2482702149184930913
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2596333322828658127}
+  m_GameObject: {fileID: 3194090646662862203}
   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}
@@ -166,7 +166,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6865594351597376310}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5137253403461773634
+--- !u!1 &5291855315857285515
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -174,8 +174,42 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6345950132398281418}
-  - component: {fileID: 8440504658726231771}
+  - component: {fileID: 6865594351597376310}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbjian2run (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6865594351597376310
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5291855315857285515}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.50025254, y: -0.4997474, z: -0.4997474, w: 0.50025254}
+  m_LocalPosition: {x: -0.404, y: 0.004, z: -0}
+  m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2482702149184930913}
+  - {fileID: 7209246308943994393}
+  m_Father: {fileID: 7074505583183483981}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6062416655860172582
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1450755046772979630}
+  - component: {fileID: 1718834354834796375}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbjian2
@@ -184,28 +218,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6345950132398281418
+--- !u!4 &1450755046772979630
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5137253403461773634}
+  m_GameObject: {fileID: 6062416655860172582}
   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_Father: {fileID: 3525720028267400576}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8440504658726231771
+--- !u!137 &1718834354834796375
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5137253403461773634}
+  m_GameObject: {fileID: 6062416655860172582}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -222,7 +256,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, type: 2}
+  - {fileID: 2100000, guid: 8420e942e81a291449164dc3c4f357f3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -249,49 +283,15 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
   m_Bones:
-  - {fileID: 2991660745857884410}
+  - {fileID: 7074505583183483981}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2991660745857884410}
+  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
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6865594351597376310}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbjian2run (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6865594351597376310
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5291855315857285515}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.50025254, y: -0.4997474, z: -0.4997474, w: 0.50025254}
-  m_LocalPosition: {x: -0.404, y: 0.004, z: -0}
-  m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2991660745857884410}
-  - {fileID: 6345950132398281418}
-  m_Father: {fileID: 7074505583183483981}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6360724120513573557
 GameObject:
   m_ObjectHideFlags: 0
@@ -437,7 +437,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7074505583183483981}
-  - {fileID: 7209246308943994393}
+  - {fileID: 1450755046772979630}
   m_Father: {fileID: 9057844881385621598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7120436569189825082
@@ -492,7 +492,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 &4082743038868752186
 SkinnedMeshRenderer:
@@ -517,7 +517,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
@@ -544,9 +544,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
   m_Bones:
-  - {fileID: 7074505583183483981}
+  - {fileID: 2482702149184930913}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7074505583183483981}
+  m_RootBone: {fileID: 2482702149184930913}
   m_AABB:
     m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
     m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}

Assets/Res/CombatHero/fb_linglongta.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &476249980693750394
+--- !u!1 &47329141139730347
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7142104095959993811}
-  - component: {fileID: 7861812452789723502}
+  - component: {fileID: 440887310688095748}
+  - component: {fileID: 1355571507912017375}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_linglongta
@@ -18,105 +18,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7142104095959993811
+--- !u!4 &440887310688095748
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 476249980693750394}
-  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &7861812452789723502
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 476249980693750394}
-  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: 2183918475588764841}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2183918475588764841}
-  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 &2781138394120075255
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6862900107120667793}
-  - component: {fileID: 2856776436865679748}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_linglongta
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6862900107120667793
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2781138394120075255}
+  m_GameObject: {fileID: 47329141139730347}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
@@ -125,13 +33,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 120756530494083055}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2856776436865679748
+--- !u!137 &1355571507912017375
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2781138394120075255}
+  m_GameObject: {fileID: 47329141139730347}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -380,8 +288,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2183918475588764841}
-  - {fileID: 7142104095959993811}
+  - {fileID: 5262026267452847103}
+  - {fileID: 2675396061553354523}
   m_Father: {fileID: 4887794763406024427}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6525093672149038688
@@ -465,7 +373,7 @@ Transform:
   - {fileID: 589998100047264782}
   m_Father: {fileID: 120756530494083055}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8301755148210937787
+--- !u!1 &8779098263414654466
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -473,30 +381,90 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2183918475588764841}
+  - component: {fileID: 2675396061553354523}
+  - component: {fileID: 6892634212361234412}
   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 &2183918475588764841
+--- !u!4 &2675396061553354523
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8301755148210937787}
+  m_GameObject: {fileID: 8779098263414654466}
   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 &6892634212361234412
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8779098263414654466}
+  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: 5262026267452847103}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 5262026267452847103}
+  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 &8833322958098411812
 GameObject:
   m_ObjectHideFlags: 0
@@ -530,7 +498,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4887794763406024427}
-  - {fileID: 6862900107120667793}
+  - {fileID: 440887310688095748}
   m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8112392103606109572
@@ -569,3 +537,35 @@ MonoBehaviour:
   _Animator: {fileID: 8112392103606109572}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
+--- !u!1 &8951014203245568338
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5262026267452847103}
+  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 &5262026267452847103
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8951014203245568338}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 589998100047264782}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/CombatHero/fb_wulonglun.prefab

@@ -1,5 +1,129 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &361611206262873538
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9093806134379656514}
+  - component: {fileID: 2866613447206764488}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: wulonglun2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9093806134379656514
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 361611206262873538}
+  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: 8019158978286339551}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &2866613447206764488
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 361611206262873538}
+  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: 5214003929368713164}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 5214003929368713164}
+  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 &1814943899421255317
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5214003929368713164}
+  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 &5214003929368713164
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1814943899421255317}
+  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_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!1 &2106655689270820769
 GameObject:
   m_ObjectHideFlags: 0
@@ -118,38 +242,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2939259311025774717
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1470389432959255074}
-  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 &1470389432959255074
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2939259311025774717}
-  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_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!1 &3217099317692552822
 GameObject:
   m_ObjectHideFlags: 0
@@ -231,98 +323,6 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &4802278814800867478
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6357061439481624147}
-  - component: {fileID: 6419031361809916663}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: wulonglun
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6357061439481624147
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4802278814800867478}
-  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6419031361809916663
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4802278814800867478}
-  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 &7141257263086483798
 GameObject:
   m_ObjectHideFlags: 0
@@ -353,102 +353,10 @@ Transform:
   m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1470389432959255074}
-  - {fileID: 1363937294688578195}
+  - {fileID: 5214003929368713164}
+  - {fileID: 9093806134379656514}
   m_Father: {fileID: 8985698407474411210}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
---- !u!1 &7165294866436180268
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1363937294688578195}
-  - component: {fileID: 6606487752644679019}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: wulonglun2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1363937294688578195
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7165294866436180268}
-  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: 8019158978286339551}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6606487752644679019
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7165294866436180268}
-  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: 1470389432959255074}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 1470389432959255074}
-  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 &7179850442623262044
 GameObject:
   m_ObjectHideFlags: 0
@@ -530,7 +438,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8985698407474411210}
-  - {fileID: 6357061439481624147}
+  - {fileID: 4145999930151978942}
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!95 &852375880241615242
@@ -569,3 +477,95 @@ MonoBehaviour:
   _Animator: {fileID: 852375880241615242}
   _Transitions: {fileID: 11400000, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
   _ActionOnDisable: 0
+--- !u!1 &7371837735464199026
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4145999930151978942}
+  - component: {fileID: 4999662394394478552}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: wulonglun
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4145999930151978942
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371837735464199026}
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &4999662394394478552
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371837735464199026}
+  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

Assets/Res/CombatHero/fb_yuping.prefab

@@ -199,7 +199,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6598966518811955930}
-  - {fileID: 2975530829370044692}
+  - {fileID: 7122198428960508510}
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8285792300048012968
@@ -238,7 +238,7 @@ MonoBehaviour:
   _Animator: {fileID: 8285792300048012968}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &3574830839826224335
+--- !u!1 &3425242228702666863
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -246,8 +246,40 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3905531150884816205}
-  - component: {fileID: 8697841209603117514}
+  - component: {fileID: 7655473451259797777}
+  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 &7655473451259797777
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3425242228702666863}
+  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: 1037078243560620277}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5303893626362349666
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7122198428960508510}
+  - component: {fileID: 7078358161700077379}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: yuping
@@ -256,30 +288,30 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3905531150884816205
+--- !u!4 &7122198428960508510
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3574830839826224335}
+  m_GameObject: {fileID: 5303893626362349666}
   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: 3197094115664100941}
+  m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8697841209603117514
+--- !u!137 &7078358161700077379
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3574830839826224335}
+  m_GameObject: {fileID: 5303893626362349666}
   m_Enabled: 1
-  m_CastShadows: 1
+  m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -294,7 +326,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 4957e5184678c2d459ca5718cf85db80, type: 2}
+  - {fileID: 2100000, guid: c87dc6d40fc68a445aa316c07eeee6f0, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -321,16 +353,16 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 6508870434291084861}
+  - {fileID: 6598966518811955930}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6508870434291084861}
+  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 &5225240940900619422
+--- !u!1 &5607745375854446393
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -338,39 +370,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6508870434291084861}
-  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 &6508870434291084861
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5225240940900619422}
-  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: 3197094115664100941}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5663388736524697426
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3197094115664100941}
+  - component: {fileID: 1037078243560620277}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_yuping_show
@@ -379,21 +379,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3197094115664100941
+--- !u!4 &1037078243560620277
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5663388736524697426}
+  m_GameObject: {fileID: 5607745375854446393}
   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: 6508870434291084861}
-  - {fileID: 3905531150884816205}
+  - {fileID: 7655473451259797777}
+  - {fileID: 2975530829370044692}
   m_Father: {fileID: 6598966518811955930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6642471949105620041
@@ -474,7 +474,7 @@ Transform:
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3197094115664100941}
+  - {fileID: 1037078243560620277}
   m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8819436757115012534
@@ -508,7 +508,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8974866603299107661}
+  m_Father: {fileID: 1037078243560620277}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &7715444761172679744
 SkinnedMeshRenderer:
@@ -518,7 +518,7 @@ SkinnedMeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8819436757115012534}
   m_Enabled: 1
-  m_CastShadows: 0
+  m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -533,7 +533,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
@@ -560,9 +560,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 6598966518811955930}
+  - {fileID: 7655473451259797777}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6598966518811955930}
+  m_RootBone: {fileID: 7655473451259797777}
   m_AABB:
     m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
     m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}

Assets/Res/CombatHero/gw_huli.prefab

@@ -1073,7 +1073,7 @@ GameObject:
   - component: {fileID: 3730944769665907596}
   - component: {fileID: 1234639040695457102}
   - component: {fileID: 174987257967358945}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: gw_huli
   m_TagString: Untagged

Assets/Res/CombatHero/gw_xianhe.prefab

@@ -247,7 +247,7 @@ GameObject:
   - component: {fileID: 6766802364108061217}
   - component: {fileID: 3694081588206066214}
   - component: {fileID: 9021576348218232918}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: root
   m_TagString: Untagged
@@ -362,7 +362,7 @@ GameObject:
   - component: {fileID: 9173767479712973966}
   - component: {fileID: 880246855749402126}
   - component: {fileID: 6278052668455844195}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: gw_xianhe
   m_TagString: Untagged

Assets/Res/Config/BuffConfig.json

@@ -297,7 +297,7 @@
       "buffGroup": 1018,
       "overlayCount": 10,
       "effectValue": [
-        3.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 15.0,

Assets/Res/Config/EventConditionConfig.json

@@ -2,7 +2,7 @@
   "configList": [
     {
       "ID": 1,
-      "message": 2078,
+      "message": 9001,
       "Operation": 0,
       "ConditionType": 1,
       "ConditionPara": [
@@ -18,7 +18,7 @@
     },
     {
       "ID": 2,
-      "message": 2079,
+      "message": 9002,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -34,7 +34,7 @@
     },
     {
       "ID": 3,
-      "message": 2080,
+      "message": 9003,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -53,7 +53,7 @@
     },
     {
       "ID": 4,
-      "message": 2081,
+      "message": 9004,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -69,7 +69,7 @@
     },
     {
       "ID": 5,
-      "message": 2082,
+      "message": 9005,
       "Operation": 0,
       "ConditionType": 8,
       "finishCount": 1,
@@ -82,7 +82,7 @@
     },
     {
       "ID": 6,
-      "message": 2094,
+      "message": 9006,
       "Operation": 0,
       "ConditionType": 9,
       "finishCount": 6,
@@ -95,7 +95,7 @@
     },
     {
       "ID": 7,
-      "message": 2843,
+      "message": 9007,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -111,7 +111,7 @@
     },
     {
       "ID": 8,
-      "message": 2844,
+      "message": 9008,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -127,7 +127,7 @@
     },
     {
       "ID": 9,
-      "message": 2845,
+      "message": 9009,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -146,7 +146,7 @@
     },
     {
       "ID": 10,
-      "message": 2846,
+      "message": 9010,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -165,7 +165,7 @@
     },
     {
       "ID": 11,
-      "message": 2847,
+      "message": 9011,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -184,7 +184,7 @@
     },
     {
       "ID": 12,
-      "message": 2848,
+      "message": 9012,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -203,7 +203,7 @@
     },
     {
       "ID": 13,
-      "message": 2849,
+      "message": 9013,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -222,7 +222,7 @@
     },
     {
       "ID": 14,
-      "message": 2850,
+      "message": 9014,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -238,7 +238,7 @@
     },
     {
       "ID": 15,
-      "message": 2851,
+      "message": 9015,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -257,7 +257,7 @@
     },
     {
       "ID": 17,
-      "message": 2852,
+      "message": 9016,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -276,7 +276,7 @@
     },
     {
       "ID": 18,
-      "message": 2853,
+      "message": 9017,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -295,7 +295,7 @@
     },
     {
       "ID": 19,
-      "message": 2854,
+      "message": 9018,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -314,7 +314,7 @@
     },
     {
       "ID": 20,
-      "message": 2855,
+      "message": 9019,
       "Operation": 0,
       "ConditionType": 1,
       "ConditionPara": [
@@ -330,7 +330,7 @@
     },
     {
       "ID": 21,
-      "message": 2856,
+      "message": 9020,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -346,7 +346,7 @@
     },
     {
       "ID": 22,
-      "message": 2857,
+      "message": 9021,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -362,7 +362,7 @@
     },
     {
       "ID": 23,
-      "message": 2858,
+      "message": 9022,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -378,7 +378,7 @@
     },
     {
       "ID": 24,
-      "message": 2859,
+      "message": 9023,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -394,7 +394,7 @@
     },
     {
       "ID": 25,
-      "message": 2860,
+      "message": 9024,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -410,7 +410,7 @@
     },
     {
       "ID": 26,
-      "message": 2861,
+      "message": 9025,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -423,6 +423,38 @@
         3,
         4
       ]
+    },
+    {
+      "ID": 27,
+      "message": 9026,
+      "Operation": 0,
+      "ConditionType": 6,
+      "ConditionPara": [
+        20004
+      ],
+      "finishCount": 3,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 28,
+      "message": 9027,
+      "Operation": 0,
+      "ConditionType": 5,
+      "ConditionPara": [
+        1013
+      ],
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -173,6 +173,12 @@
       "name": 0,
       "ID_1": 0,
       "DaoyouID": 0
+    },
+    {
+      "ID": 118,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -6,9 +6,17 @@
         5001,
         1002
       ],
-      "qiangDu": [
-        80,
-        40
+      "hpQiangDu": [
+        90,
+        30
+      ],
+      "attQiangDu": [
+        77,
+        26
+      ],
+      "duipingQiangDu": [
+        75,
+        25
       ],
       "levelAdd": [
         0,
@@ -18,7 +26,24 @@
     {
       "ID": 100002,
       "GroupMonster": [
-        1002
+        5001,
+        1006
+      ],
+      "hpQiangDu": [
+        90,
+        30
+      ],
+      "attQiangDu": [
+        77,
+        26
+      ],
+      "duipingQiangDu": [
+        75,
+        25
+      ],
+      "levelAdd": [
+        0,
+        -2
       ]
     },
     {
@@ -162,6 +187,15 @@
         5007
       ]
     },
+    {
+      "ID": 1013,
+      "GroupMonsterLevel": [
+        105
+      ],
+      "GroupMonster": [
+        5007
+      ]
+    },
     {
       "ID": 2001,
       "GroupMonsterLevel": [
@@ -172,7 +206,7 @@
         5001,
         1001
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -187,7 +221,7 @@
         5002,
         1002
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -202,7 +236,7 @@
         5003,
         1003
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -217,7 +251,7 @@
         5004,
         1004
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -232,7 +266,7 @@
         5005,
         1005
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -246,7 +280,7 @@
         5001,
         1001
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -260,7 +294,7 @@
         5002,
         1002
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -274,7 +308,7 @@
         5003,
         1003
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -288,7 +322,7 @@
         5004,
         1004
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -302,7 +336,7 @@
         5005,
         1005
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -316,7 +350,7 @@
         5001,
         1001
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -330,7 +364,7 @@
         5002,
         1002
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -344,7 +378,7 @@
         5003,
         1003
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -358,7 +392,7 @@
         5004,
         1004
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -372,7 +406,7 @@
         5005,
         1005
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -386,7 +420,7 @@
         5001,
         1001
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -400,7 +434,7 @@
         5002,
         1002
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -414,7 +448,7 @@
         5003,
         1003
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -428,7 +462,7 @@
         5004,
         1004
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]
@@ -442,7 +476,7 @@
         5005,
         1005
       ],
-      "qiangDu": [
+      "hpQiangDu": [
         70,
         30
       ]

Assets/Res/Config/HeroModelConfig.json

@@ -63,7 +63,7 @@
       "nickName": -1,
       "name": 2,
       "headicon": "icon_tx1001",
-      "model": "Guixiu01",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 248,
@@ -92,18 +92,17 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        -1,
+        -1,
+        50
       ],
       "fa_bao_id": [
-        -1,
+        10010,
         -1,
         -1,
         -1
@@ -121,7 +120,7 @@
       "nickName": -1,
       "name": 3,
       "headicon": "icon_tx1002",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 203,
@@ -150,18 +149,17 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        -1,
+        -1,
+        50
       ],
       "fa_bao_id": [
-        -1,
+        10010,
         -1,
         -1,
         -1
@@ -179,7 +177,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx1003",
-      "model": "Guixiu01",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 225,
@@ -208,18 +206,18 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        -1,
+        -1,
+        50,
+        -1
       ],
       "fa_bao_id": [
-        -1,
+        10010,
         -1,
         -1,
         -1
@@ -237,7 +235,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx1004",
-      "model": "Guixiu01",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 270,
@@ -266,18 +264,18 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        -1,
+        50,
+        -1,
+        -1
       ],
       "fa_bao_id": [
-        -1,
+        10010,
         -1,
         -1,
         -1
@@ -298,10 +296,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 180,
-      "hp": 284,
+      "attack": 90,
+      "hp": 567,
       "def": 100,
-      "shield": 284,
+      "shield": 567,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -324,15 +322,15 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
         -1,
-        1,
-        10
+        20,
+        -1,
+        -1,
+        -1,
+        50,
+        -1
       ],
       "fa_bao_id": [
         -1,
@@ -382,15 +380,15 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
+        5,
         -1,
-        1,
-        10
+        -1,
+        50,
+        50,
+        -1,
+        -1
       ],
       "fa_bao_id": [
         -1,
@@ -440,15 +438,15 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
+        5,
         -1,
-        1,
-        10
+        20,
+        -1,
+        50,
+        -1,
+        -1
       ],
       "fa_bao_id": [
         -1,
@@ -498,15 +496,15 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
+        5,
         -1,
-        1,
-        10
+        -1,
+        -1,
+        50,
+        -1,
+        -1
       ],
       "fa_bao_id": [
         -1,
@@ -527,7 +525,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5001",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 316,
@@ -555,20 +553,20 @@
         -1
       ],
       "skillActiveLv": [
+        -1,
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        50,
+        -1
       ],
       "fa_bao_id": [
-        3102,
-        3101,
+        10002,
+        10001,
         -1,
         -1
       ],
@@ -585,7 +583,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5002",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 259,
@@ -610,23 +608,23 @@
         1204,
         -1,
         1202,
-        2003
+        -1
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
         -1,
-        1,
-        10
+        5,
+        -1,
+        20,
+        -1,
+        50,
+        -1
       ],
       "fa_bao_id": [
-        3203,
-        3202,
+        10002,
+        10005,
         -1,
         -1
       ],
@@ -643,7 +641,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5003",
-      "model": "Nanzhu",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 288,
@@ -671,20 +669,20 @@
         1302
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
+        5,
+        -1,
+        20,
         -1,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
-        3301,
-        3302,
+        10010,
+        10007,
         -1,
         -1
       ],
@@ -701,7 +699,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5004",
-      "model": "Nanzhu",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 345,
@@ -723,26 +721,26 @@
         1401,
         -1,
         -1,
-        2005,
+        -1,
         1402,
         -1,
         1403
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
+        -1,
+        5,
         -1,
         -1,
         -1,
+        20,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
-        3301,
-        3302,
+        10002,
+        10010,
         -1,
         -1
       ],
@@ -759,7 +757,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5005",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 230,
@@ -781,26 +779,26 @@
         1502,
         -1,
         -1,
-        2005,
+        -1,
         1504,
         -1,
         1505
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
         -1,
+        -1,
+        20,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
-        3501,
-        3203,
+        10010,
+        10001,
         -1,
         -1
       ],
@@ -845,16 +843,16 @@
         9044
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
+        -1,
+        5,
         -1,
         -1,
+        20,
         -1,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
         -1,
@@ -878,10 +876,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 359,
-      "hp": 232,
+      "attack": 302,
+      "hp": 276,
       "def": 100,
-      "shield": 232,
+      "shield": 276,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -903,16 +901,16 @@
         9054
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
+        -1,
+        5,
         -1,
         -1,
+        20,
         -1,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
         -1,
@@ -1110,10 +1108,10 @@
       "model": "Boss_Tree",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 281,
-      "hp": 350,
+      "attack": 219,
+      "hp": 283,
       "def": 100,
-      "shield": 350,
+      "shield": 283,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Assets/Res/Config/ItemConfig.json

@@ -3874,6 +3874,31 @@
       "sort": 0,
       "itemDesc2": 0
     },
+    {
+      "ID": 20004,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_20004",
+      "itemTag": 21,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
     {
       "ID": 21001,
       "itemName": 3194,

Assets/Res/Config/LevelbattleConfig.json

@@ -150,6 +150,16 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 1013,
+      "Group": [
+        1013
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 2001,
       "Group": [

Assets/Res/Config/SkillConfig.json

@@ -1909,12 +1909,9 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        3.0,
-        47.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        68.0,
+        5.0
       ],
       "intensifierIndex": [
         2
@@ -1937,12 +1934,9 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        3.0,
-        63.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        90.0,
+        6.0
       ],
       "intensifierIndex": [
         2
@@ -1968,12 +1962,9 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        3.0,
-        81.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        116.0,
+        7.0
       ],
       "intensifierIndex": [
         2
@@ -2005,12 +1996,9 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        3.0,
-        107.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        150.0,
+        8.0
       ],
       "intensifierIndex": [
         2
@@ -2042,12 +2030,9 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        3.0,
-        128.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        178.0,
+        9.0
       ],
       "intensifierIndex": [
         2
@@ -2079,12 +2064,9 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        4.0,
-        120.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        224.0,
+        10.0
       ],
       "intensifierIndex": [
         2
@@ -5796,8 +5778,8 @@
       "level": 1,
       "effectValue": [
         5.0,
-        50.0,
-        100.0
+        30.0,
+        50.0
       ],
       "intensifierIndex": [
         0
@@ -5824,8 +5806,8 @@
       "level": 2,
       "effectValue": [
         5.0,
-        60.0,
-        120.0
+        40.0,
+        60.0
       ],
       "intensifierIndex": [
         0
@@ -5861,8 +5843,8 @@
       "level": 3,
       "effectValue": [
         5.0,
-        70.0,
-        140.0
+        50.0,
+        70.0
       ],
       "intensifierIndex": [
         0
@@ -5898,8 +5880,8 @@
       "level": 4,
       "effectValue": [
         5.0,
-        80.0,
-        160.0
+        60.0,
+        80.0
       ],
       "intensifierIndex": [
         0
@@ -5935,8 +5917,8 @@
       "level": 5,
       "effectValue": [
         5.0,
-        90.0,
-        180.0
+        70.0,
+        90.0
       ],
       "intensifierIndex": [
         0
@@ -5973,7 +5955,7 @@
       "effectValue": [
         5.0,
         100.0,
-        200.0
+        100.0
       ],
       "intensifierIndex": [
         0
@@ -6006,7 +5988,7 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        120.0,
+        90.0,
         0.0
       ],
       "intensifierIndex": [
@@ -6030,7 +6012,7 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        130.0,
+        110.0,
         20.0,
         20.0
       ],
@@ -6064,7 +6046,7 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        140.0,
+        130.0,
         20.0,
         20.0
       ],
@@ -6132,7 +6114,7 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        160.0,
+        170.0,
         30.0,
         30.0
       ],
@@ -6166,7 +6148,7 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        170.0,
+        190.0,
         30.0,
         30.0
       ],
@@ -11675,7 +11657,7 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        100.0,
+        200.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11696,7 +11678,7 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        110.0,
+        230.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11717,7 +11699,7 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        120.0,
+        260.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11738,7 +11720,7 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        130.0,
+        290.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11759,7 +11741,7 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        140.0,
+        320.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11780,7 +11762,7 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        150.0,
+        350.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11802,7 +11784,7 @@
       "level": 1,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11824,7 +11806,7 @@
       "level": 2,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11846,7 +11828,7 @@
       "level": 3,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11868,7 +11850,7 @@
       "level": 4,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11890,7 +11872,7 @@
       "level": 5,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11912,7 +11894,7 @@
       "level": 6,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -12077,8 +12059,8 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12098,8 +12080,8 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12119,8 +12101,8 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12140,8 +12122,8 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12161,8 +12143,8 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12182,8 +12164,8 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12491,8 +12473,8 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        2.0,
-        74.0
+        5.0,
+        29.0
       ],
       "intensifierIndex": [
         2
@@ -12515,8 +12497,8 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        2.0,
-        98.0
+        5.0,
+        38.0
       ],
       "intensifierIndex": [
         2
@@ -12539,8 +12521,8 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        2.0,
-        127.0
+        5.0,
+        49.0
       ],
       "intensifierIndex": [
         2
@@ -12563,8 +12545,8 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        2.0,
-        167.0
+        5.0,
+        65.0
       ],
       "intensifierIndex": [
         2
@@ -12587,8 +12569,8 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        2.0,
-        201.0
+        5.0,
+        78.0
       ],
       "intensifierIndex": [
         2
@@ -12611,8 +12593,8 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        2.0,
-        255.0
+        5.0,
+        99.0
       ],
       "intensifierIndex": [
         2
@@ -14105,7 +14087,7 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        20.0
+        300.0
       ],
       "intensifierIndex": [
         1
@@ -14128,7 +14110,7 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        30.0
+        400.0
       ],
       "intensifierIndex": [
         1
@@ -14151,7 +14133,7 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        40.0
+        500.0
       ],
       "intensifierIndex": [
         1
@@ -14174,7 +14156,7 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        50.0
+        600.0
       ],
       "intensifierIndex": [
         1
@@ -14197,7 +14179,7 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        60.0
+        700.0
       ],
       "intensifierIndex": [
         1
@@ -14220,7 +14202,7 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        70.0
+        800.0
       ],
       "intensifierIndex": [
         1

Assets/Scenes/testCombat.scene

@@ -2189,7 +2189,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyLevel
-      value: 2
+      value: 125
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
@@ -2249,7 +2249,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
-      value: 125
+      value: 300
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[1].level
@@ -2265,7 +2265,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 125
+      value: 300
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].level
@@ -2277,7 +2277,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 9004
+      value: 9001
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID
@@ -2289,11 +2289,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillLevel
-      value: 30
+      value: 60
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillStart
-      value: 3
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[1].skillLevel

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -35,7 +35,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 6.支线事件 99.无标记 
+		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 6.支线事件 88.特定任务触发的事件 99.无标记 
 		/// </summary>
 #if !COMBAT_SERVER
 		public int EventTriggerType;

Assets/Scripts/GameData/ExcelConfig/GroupConfig.cs

@@ -48,9 +48,29 @@ namespace Excel2Json
 		///每个怪的比例强度 一个都不填就是默认强度
 		/// </summary>
 #if !COMBAT_SERVER
-		public int[] qiangDu;
+		public int[] hpQiangDu;
 #else
-		public int[] qiangDu{ set; get; }
+		public int[] hpQiangDu{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///攻击强度
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] attQiangDu;
+#else
+		public int[] attQiangDu{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///对拼强度
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] duipingQiangDu;
+#else
+		public int[] duipingQiangDu{ set; get; }
 #endif
 		
 

Assets/Scripts/GameLogic/Combat/Buff/b_1003.cs

@@ -66,7 +66,7 @@ namespace GameLogic.Combat.Buff
                 harm += CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     harm, source.CurrCombatHeroInfo.Wood_Proficient);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                    WuXingType.Null,null,HarmType.Buff);
+                    WuXingType.Wood,null,HarmType.Buff);
             }
         }
 

Assets/Scripts/GameLogic/Combat/Buff/b_1017.cs

@@ -33,17 +33,17 @@ namespace GameLogic.Combat.Buff
 
         protected override void ProUpdateEffect()
         {
-            source.CurrCombatHeroInfo.attack += addAtt;
+            combatHeroEntity.CurrCombatHeroInfo.attack += addAtt;
             addAtt = 0;
             float addAttbl = buffCount * BuffConfig.effectValue[1];
-            addAtt = CombatCalculateTool.Instance.GetVlaueRatioForLong(source.CurrCombatHeroInfo.attack.Value,
+            addAtt = CombatCalculateTool.Instance.GetVlaueRatioForLong(combatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addAttbl);
-            source.CurrCombatHeroInfo.attack -= addAtt;
+            combatHeroEntity.CurrCombatHeroInfo.attack -= addAtt;
         }
 
         protected override void ProDormancyObj()
         {
-            source.CurrCombatHeroInfo.attack += addAtt;
+            combatHeroEntity.CurrCombatHeroInfo.attack += addAtt;
             addAtt = 0;
         }
     }

Assets/Scripts/GameLogic/Combat/CombatState/CombatFightState.cs

@@ -36,8 +36,8 @@ namespace GameLogic.Combat.CombatState
             }
 
             CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(true);
-            IHero ihero = FindMinDixtance(allHero);
+                CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
+            IHero ihero = FindMinDixtance(allHero,maxCount);
             if (ihero == null)
             {
                 CombatController.ChangeState("update");
@@ -51,7 +51,7 @@ namespace GameLogic.Combat.CombatState
             CombatController.GameTimeLineParticleFactory.CombatUpdate(t);
         }
 
-        protected IHero FindMinDixtance(CombatHeroEntity[] allHero)
+        protected IHero FindMinDixtance(CombatHeroEntity[] allHero,int maxCount)
         {
             IHero minDistanceHero = null;
             if (allHero == null)
@@ -61,7 +61,7 @@ namespace GameLogic.Combat.CombatState
 
             CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
             float minDistance = float.MaxValue;
-            for (int i = 0; i < allHero.Length; i++)
+            for (int i = 0; i < maxCount; i++)
             {
                 CombatHeroEntity hero = allHero[i];
                 if (hero.GetMainHotPoin<CombatHeroHitPoint>() == null)

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -67,8 +67,8 @@ namespace GameLogic.Combat.CombatState
 
 
             CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(true);
-            IHero ihero = FindMinDixtance(allHero);
+                CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
+            IHero ihero = FindMinDixtance(allHero,maxCount);
             if (ihero != null)
             {
                 CombatController.ChangeState("fight");
@@ -95,7 +95,7 @@ namespace GameLogic.Combat.CombatState
             CombatController.GameTimeLineParticleFactory.CombatUpdate(t);
         }
 
-        protected IHero FindMinDixtance(CombatHeroEntity[] allHero)
+        protected IHero FindMinDixtance(CombatHeroEntity[] allHero,int maxCount)
         {
             IHero minDistanceHero = null;
             if (allHero == null)
@@ -105,7 +105,7 @@ namespace GameLogic.Combat.CombatState
 
             CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
             float minDistance = float.MaxValue;
-            for (int i = 0; i < allHero.Length; i++)
+            for (int i = 0; i < maxCount; i++)
             {
                 CombatHeroEntity hero = allHero[i];
                 if (hero.GetMainHotPoin<CombatHeroHitPoint>() == null)

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -299,14 +299,17 @@ namespace GameLogic.Combat.CombatTool
             }
         }
 
-        public CombatHeroEntity[] GetHero(bool isEnemy)
+        public CombatHeroEntity[] GetHero(bool isEnemy, out int count)
         {
             if (isEnemy)
             {
+                count = enemyHero.Count;
+
                 return enemyHero.ToArray();
             }
             else
             {
+                count = myHero.Count;
                 return myHero.ToArray();
             }
         }

Assets/Scripts/GameLogic/Combat/CombatTool/CombatReport/CombatReportEntityInfo.cs

@@ -286,7 +286,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 BuffBasic buffBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as BuffBasic;
                 if (buffBasic != null)
                 {
-                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
+                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.ID);
                 }
 
                 string msg =
@@ -311,7 +311,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 BuffBasic buffBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as BuffBasic;
                 if (buffBasic != null)
                 {
-                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
+                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.ID);
                 }
 
                 string msg =

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -42,16 +42,16 @@ namespace GameLogic.Combat.CombatType
 
         protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
         {
-            CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            if (allHero == null || allHero.Length <= 0)
+            CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true, out int maxCount);
+            if (allHero == null || maxCount <= 0)
             {
                 //胜利
                 CombatController.currActiveCombat.GameOver(true);
                 return;
             }
 
-            allHero = combatController.CombatHeroController.GetHero(false);
-            if (allHero == null || allHero.Length <= 0)
+            allHero = combatController.CombatHeroController.GetHero(false, out maxCount);
+            if (allHero == null || maxCount <= 0)
             {
                 //失败
                 CombatController.currActiveCombat.GameOver(false);
@@ -68,7 +68,7 @@ namespace GameLogic.Combat.CombatType
             await cTaskAwaitBuffer.WaitAll();
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
         }
- 
+
         public async CTask LoadCombat(int levelBattleId, System.Action<bool> caombatFinish)
         {
             levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
@@ -79,15 +79,11 @@ namespace GameLogic.Combat.CombatType
                 GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(group);
                 int[] monster = groupConfig.GroupMonster;
                 int[] levels = groupConfig.GroupMonsterLevel;
-               
 
-            
 
                 for (int j = 0; j < monster.Length; j++)
                 {
-                    
-                     
-                    int level =  PlayerManager.Instance.myHero.level.Value;
+                    int level = PlayerManager.Instance.myHero.level.Value;
                     if (levels != null)
                     {
                         level = levels[j];
@@ -98,26 +94,40 @@ namespace GameLogic.Combat.CombatType
                         level += groupConfig.levelAdd[j];
                     }
 
-                    if (level <=0)
+                    if (level <= 0)
                     {
                         level = 1;
                     }
 
                     int monsterHeroModel = monster[j];
                     int qiangdu = 100;
+                    if (groupConfig.hpQiangDu != null)
+                    {
+                        qiangdu = groupConfig.hpQiangDu[j];
+                    }
+
+                    int attQiangdu = 100;
+                    if (groupConfig.attQiangDu != null)
+                    {
+                        attQiangdu = groupConfig.attQiangDu[j];
+                    }
 
-                    if (groupConfig.qiangDu != null)
+                    int duiPingQiangdu = 100;
+                    if (groupConfig.duipingQiangDu != null)
                     {
-                        qiangdu = groupConfig.qiangDu[j];
+                        duiPingQiangdu = groupConfig.duipingQiangDu[j];
                     }
-                    
+
                     HeroInfo heroInfo = new HeroInfo();
                     heroInfo.InitMonster(monsterHeroModel, level);
-                    heroInfo.hp = (EncryptionLong)CombatCalculateTool.Instance.GetVlaueRatioForLong(heroInfo.hp.Value,qiangdu);
-                    heroInfo.attack = (EncryptionLong)CombatCalculateTool.Instance.GetVlaueRatioForLong(heroInfo.attack.Value,qiangdu);
-                    heroInfo.defense = (EncryptionLong)CombatCalculateTool.Instance.GetVlaueRatioForLong(heroInfo.defense.Value,qiangdu);
-                    heroInfo.gongFaStrength = qiangdu - 100;
-                    
+                    heroInfo.hp =
+                        (EncryptionLong)CombatCalculateTool.Instance.GetVlaueRatioForLong(heroInfo.hp.Value, qiangdu);
+                    heroInfo.attack =
+                        (EncryptionLong)CombatCalculateTool.Instance.GetVlaueRatioForLong(heroInfo.attack.Value,
+                            attQiangdu);
+
+                    heroInfo.gongFaStrength = duiPingQiangdu - 100;
+
                     CreateEnemy(cTaskAwaitBuffer, heroInfo, j);
                 }
             }
@@ -157,7 +167,6 @@ namespace GameLogic.Combat.CombatType
 
         private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
-        
             // TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
             // if (testCombatHeroConfig != null)
             // {
@@ -166,18 +175,19 @@ namespace GameLogic.Combat.CombatType
             //     testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);
 
 
-            
             CombatHeroEntity heroEntity = new CombatHeroEntity();
 
             heroEntity.IsEnemy = false;
             heroEntity.number = 0;
 
-          
+
             if (CombatController.currActiveCombat.playerHeroEntity != null)
             {
-                GameObjectPool gameObjectPool= CombatController.currActiveCombat.playerHeroEntity.combatHeroGameObject.GameObjectPool;
+                GameObjectPool gameObjectPool = CombatController.currActiveCombat.playerHeroEntity.combatHeroGameObject
+                    .GameObjectPool;
                 Vector3 pos = gameObjectPool.own.transform.position;
-                cTaskAwaitBuffer.AddTask(heroEntity.InitForObject(gameObjectPool,new CombatHeroAi(), PlayerManager.Instance.myHero, pos,
+                cTaskAwaitBuffer.AddTask(heroEntity.InitForObject(gameObjectPool, new CombatHeroAi(),
+                    PlayerManager.Instance.myHero, pos,
                     delegate(CombatHeroEntity entity)
                     {
                         // entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -30,8 +30,8 @@ namespace GameLogic.Combat.CombatType
         protected Vector3[] enemyHeroPosOff =
         {
             new Vector3(0, 0, 0),
-            new Vector3(3, 0, -3),
-            new Vector3(-3, 0, -3)
+            new Vector3(3, 0, 3),
+            new Vector3(-3, 0, 3)
         };
 
         protected override void ProInit()
@@ -51,7 +51,7 @@ namespace GameLogic.Combat.CombatType
             showTextEventData.Color = new Color(1f, 0.64f, 0.22f);
             showTextEventData.worldPos = combatHeroEntity.combatHeroGameObject.position;
             EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
-            CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
+            // CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true, out int maxCount);
         }
 
 
@@ -127,18 +127,30 @@ namespace GameLogic.Combat.CombatType
 
                     int monsterHeroModel = monster[j];
                     int qiangdu = 100;
+                    if (groupConfig.hpQiangDu != null)
+                    {
+                        qiangdu = groupConfig.hpQiangDu[j];
+                    }
+
+                    int attQiangdu = 100;
+                    if (groupConfig.attQiangDu != null)
+                    {
+                        attQiangdu = groupConfig.attQiangDu[j];
+                    }
 
-                    if (groupConfig.qiangDu != null)
+                    int duiPingQiangdu = 100;
+                    if (groupConfig.duipingQiangDu != null)
                     {
-                        qiangdu = groupConfig.qiangDu[j];
+                        duiPingQiangdu = groupConfig.duipingQiangDu[j];
                     }
 
+
                     CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
                     combatHeroInfo.InitMonster(monsterHeroModel, level);
                     combatHeroInfo.hp = (EncryptionLong)CombatCalculateTool.Instance.GetVlaueRatioForLong(combatHeroInfo.hp.Value,qiangdu);
-                    combatHeroInfo.attack = (EncryptionLong)CombatCalculateTool.Instance.GetVlaueRatioForLong(combatHeroInfo.attack.Value,qiangdu);
-                    combatHeroInfo.defense = (EncryptionLong)CombatCalculateTool.Instance.GetVlaueRatioForLong(combatHeroInfo.defense.Value,qiangdu);
-                    combatHeroInfo.gongFaStrength = qiangdu - 100;
+                    combatHeroInfo.attack = (EncryptionLong)CombatCalculateTool.Instance.GetVlaueRatioForLong(combatHeroInfo.attack.Value,attQiangdu);
+                   
+                    combatHeroInfo.gongFaStrength = duiPingQiangdu - 100;
                     int index = j;
                     index %= monster.Length;
                     // TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = enemyHeroInfo[index];

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroAi.cs

@@ -139,8 +139,8 @@ namespace GameLogic.Combat.Hero
                     (currFocusTarget is BannerHero && !_combatHeroEntity.IsEnemy))
                 {
                     CombatHeroEntity[] allHero =
-                        CombatController.currActiveCombat.CombatHeroController.GetHero(!_combatHeroEntity.IsEnemy);
-                    IHero minDistanceHero = FindMinDixtance(allHero);
+                        CombatController.currActiveCombat.CombatHeroController.GetHero(!_combatHeroEntity.IsEnemy, out int maxCount);
+                    IHero minDistanceHero = FindMinDixtance(allHero,maxCount);
                     currFocusTarget = minDistanceHero as CombatHeroEntity;
                     if (!_combatHeroEntity.IsEnemy && currFocusTarget == null)
                     {
@@ -178,7 +178,7 @@ namespace GameLogic.Combat.Hero
         }
 
 
-        protected IHero FindMinDixtance(CombatHeroEntity[] allHero)
+        protected IHero FindMinDixtance(CombatHeroEntity[] allHero,int maxCount)
         {
             IHero minDistanceHero = null;
             if (allHero == null)
@@ -187,7 +187,7 @@ namespace GameLogic.Combat.Hero
             }
 
             float minDistance = float.MaxValue;
-            for (int i = 0; i < allHero.Length; i++)
+            for (int i = 0; i < maxCount; i++)
             {
                 CombatHeroEntity hero = allHero[i];
                 if (hero.GetMainHotPoin<CombatHeroHitPoint>() == null)

Assets/Scripts/GameLogic/Combat/Skill/S1302.cs

@@ -33,7 +33,8 @@ namespace GameLogic.Combat.Skill
                 currTarget.Add(combatHeroHitPoint);
                 int index = Random.Range(3, 9);
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + index);
-                ActivationTimeLineData("1302_fashe", currTarget: currTarget,customizePos:new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i, startTime: i * -0.1f);
+                ActivationTimeLineData("1302_fashe", currTarget: currTarget,
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i, startTime: i * -0.1f);
             }
         }
 
@@ -58,8 +59,15 @@ namespace GameLogic.Combat.Skill
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData, ISkillFeatures skillFeatures)
         {
+            float addHarm = effectValue[1];
+            b_1003 b1003 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1003>();
+            if (b1003 != null)
+            {
+                addHarm += b1003.buffCount * effectValue[2];
+            }
+
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                effectValue[1]);
+                addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
                 wuXingType, skillFeatures,
@@ -68,7 +76,7 @@ namespace GameLogic.Combat.Skill
             // int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1,this);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1, this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S2011.cs

@@ -38,9 +38,10 @@ namespace GameLogic.Combat.Skill
                 long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(addHarm, effectValue[0]);
                 if (v > 0)
                 {
+                    
                     CombatHeroEntity[] allHero =
-                        CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-                    for (int i = 0; i < allHero.Length; i++)
+                        CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy,out int maxCount);
+                    for (int i = 0; i <  maxCount; i++)
                     {
                         HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, allHero[i],
                             v,

Assets/Scripts/GameLogic/Combat/Skill/S2014.cs

@@ -46,8 +46,13 @@ namespace GameLogic.Combat.Skill
 
                         long v2 = CombatCalculateTool.Instance.GetVlaueRatioForLong(v, effectValue[2]);
                         CombatHeroEntity[] allHero =
-                            CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-                        for (int i = 0; i < allHero.Length; i++)
+                            CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy,out int maxCount);
+                        if (allHero == null)
+                        {
+                            return;
+                        }
+
+                        for (int i = 0; i < maxCount; i++)
                         {
                             if (allHero[i] == target)
                             {

Assets/Scripts/GameLogic/Combat/Skill/S2015.cs

@@ -35,10 +35,10 @@ namespace GameLogic.Combat.Skill
                 if (skillBasic != null && IsPassiveActivateSkill(skillBasic))
                 {
                     CombatHeroEntity[] allHero =
-                        CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
+                        CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy,out int maxCount);
                     if (allHero != null)
                     {
-                        for (int i = 0; i < allHero.Length; i++)
+                        for (int i = 0; i < maxCount; i++)
                         {
                             if (allHero[i] != buffEventData.target)
                             {

Assets/Scripts/GameLogic/Combat/Skill/S60105.cs

@@ -22,9 +22,9 @@ namespace GameLogic.Combat.Skill
         private void OnSkillActivefinish()
         {
             CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
+                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy,out int maxCount);
 
-            for (int i = 0; i < allHero.Length; i++)
+            for (int i = 0; i < maxCount; i++)
             {
                 CombatHeroEntity combatHeroEntity = allHero[i];
                 b_1024 b1024 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1024>();

Assets/Scripts/GameLogic/Combat/Skill/S9054.cs

@@ -23,20 +23,20 @@ namespace GameLogic.Combat.Skill
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData, ISkillFeatures skillFeatures)
         {
-            float harmBl = 0;
-            b_1018 b1018 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1018>();
-            if (b1018 != null) //消耗一层感电，额外照成伤害
-            {
-                harmBl += b1018.buffCount * effectValue[1];
-            }
-
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                harmBl);
-
-            HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
-                AttType.Skill, triggerData,
-                wuXingType, skillFeatures,
-                HarmType.Default);
+            // float harmBl = 0;
+            // b_1018 b1018 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1018>();
+            // if (b1018 != null) //消耗一层感电，额外照成伤害
+            // {
+            //     harmBl += b1018.buffCount * effectValue[1];
+            // }
+            //
+            // long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+            //     harmBl);
+            //
+            // HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
+            //     AttType.Skill, triggerData,
+            //     wuXingType, skillFeatures,
+            //     HarmType.Default);
         }
 
         protected override void ProCombatUpdate(float time)
@@ -54,7 +54,7 @@ namespace GameLogic.Combat.Skill
                     if (b1018 != null)
                     {
                         Vector3 targetPos = targetHeroEntity.dotPos;
-                        ActivationTimeLineData("9053_fashe", customizePos: new Vector3[] { targetPos });
+                        ActivationTimeLineData("9054", customizePos: new Vector3[] { targetPos });
 
                         int count = b1018.buffCount;
                         float harmBl = count * effectValue[1];

Assets/Scripts/GameLogic/Combat/Skill/S9061.cs

@@ -39,9 +39,9 @@ namespace GameLogic.Combat.Skill
             if (summonCombatHeroEntity != null && summonCombatHeroEntity.ownerEntity == CombatHeroEntity)
             {
                 CombatHeroEntity[] combatHeroEntities =
-                    CombatController.currActiveCombat.CombatHeroController.GetHero(CombatHeroEntity.IsEnemy);
+                    CombatController.currActiveCombat.CombatHeroController.GetHero(CombatHeroEntity.IsEnemy,out int maxCount);
                 bool isOk = false;
-                for (int i = 0; i < combatHeroEntities.Length; i++)
+                for (int i = 0; i < maxCount; i++)
                 {
                     SummonCombatHeroEntity t = combatHeroEntities[i] as SummonCombatHeroEntity;
                     if (t != null)

Assets/Scripts/GameLogic/Combat/Skill/S9092.cs

@@ -15,10 +15,10 @@ namespace GameLogic.Combat.Skill
         protected override void ProUseSkill()
         {
             CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(CombatHeroEntity.IsEnemy);
+                CombatController.currActiveCombat.CombatHeroController.GetHero(CombatHeroEntity.IsEnemy,out int maxCount);
             CombatHeroEntity target = null;
             float minHp = 9999;
-            for (int i = 0; i < allHero.Length; i++)
+            for (int i = 0; i < maxCount; i++)
             {
                 CombatHeroEntity t = allHero[i];
                 if (t.HpBl < minHp)
@@ -41,12 +41,16 @@ namespace GameLogic.Combat.Skill
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData, ISkillFeatures skillFeatures)
         {
-            List<BuffBasic> allBuff = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForBuffType(2, 1);
-            if (allBuff.Count > 0)
-            {
-                int index = CombatCalculateTool.Instance.GetOdd(0, allBuff.Count);
-                targetEntity.combatHeroEntity.BuffControl.RemoveBuff(allBuff[index]);
-            }
+            long att = CombatHeroEntity.CurrCombatHeroInfo.attack.Value;
+            long v=CombatCalculateTool.Instance.GetVlaueRatioForLong(att,effectValue[0]);
+            CombatCalculateTool.Instance.Recover(CombatHeroEntity, targetEntity, v, AttType.Skill, HarmType.Default,
+                triggerData);
+            // List<BuffBasic> allBuff = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForBuffType(2, 1);
+            // if (allBuff.Count > 0)
+            // {
+            //     int index = CombatCalculateTool.Instance.GetOdd(0, allBuff.Count);
+            //     targetEntity.combatHeroEntity.BuffControl.RemoveBuff(allBuff[index]);
+            // }
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/S9102.cs

@@ -15,9 +15,9 @@ namespace GameLogic.Combat.Skill
         protected override void ProUseSkill()
         {
             CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(CombatHeroEntity.IsEnemy);
+                CombatController.currActiveCombat.CombatHeroController.GetHero(CombatHeroEntity.IsEnemy,out int maxCount);
             List<CombatHeroEntity> debuffHero = new List<CombatHeroEntity>();
-            for (int i = 0; i < allHero.Length; i++)
+            for (int i = 0; i < maxCount; i++)
             {
                 List<BuffBasic> allBuff = allHero[i].BuffControl.GetBuffBasicForBuffType(2, 1);
                 if (allBuff.Count > 0)

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxNavigationLogic.cs

@@ -146,13 +146,13 @@ public class FxNavigationLogic : FxAILogicBasic
     {
         _currNavigationTargetHero = null;
         CombatHeroEntity[] allHero =
-            CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-        if (allHero == null || allHero.Length <= 0)
+            CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy,out int maxCount);
+        if (allHero == null || maxCount <= 0)
         {
             return;
         }
 
-        int index = CombatCalculateTool.Instance.GetOdd(0, allHero.Length);
+        int index = CombatCalculateTool.Instance.GetOdd(0, maxCount);
         _currNavigationTargetHero = allHero[index];
         // for (int i = 0; i < allHero.Length; i++)
         // {

Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -136,8 +136,8 @@ namespace Fort23.Mono
             playerHeroHpWidget.isFollowTarget = false;
             playerHeroHpWidget.Init(CombatController.currActiveCombat.playerHeroEntity);
 
-            CombatHeroEntity[] allEnemy = CombatController.currActiveCombat.CombatHeroController.GetHero(true);
-            for (int i = 0; i < allEnemy.Length; i++)
+            CombatHeroEntity[] allEnemy = CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
+            for (int i = 0; i < maxCount; i++)
             {
                 CombatHeroEntity enemy = allEnemy[i];
                 if (enemy.isCreateHeroHp)