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

@@ -7282,39 +7282,52 @@ PlayableDirector:
     value: {fileID: 0}
   - key: {fileID: 316636926299432361, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
     value: {fileID: 0}
+  - key: {fileID: 0}
+    value: {fileID: 3085854238553441623}
   m_ExposedReferences:
     m_References:
     - d3d3fcbd8cb8a3d4ea62175d2ab430f7: {fileID: 364068198859337419}
     - d8f52b8140b945646bba2928f14fa847: {fileID: 0}
+    - 9d1958c8bf484af45882f43f9e7dabb0: {fileID: 7023696562122098253}
     - 107c0281ab5015945b9dd6b6604a6c03: {fileID: 9070131457569374497}
     - c03658669bf520a42b2a7ca850cdec70: {fileID: 0}
     - 97957883873eead45bac806ca33a805a: {fileID: 0}
     - da39ab302b6f3b741b5c23084cedf19f: {fileID: 949410144025296100}
     - cd41b8fc3b21efe4cbe899ed914b6600: {fileID: 0}
+    - 3283b1ca6c858c04caaf5b1469321291: {fileID: 838601366100711833}
     - 31c9ad88093e6ca47b20bb18ffde6e38: {fileID: 0}
     - 3e3d16ad40b2f6d4d9ff4bb1d0530658: {fileID: 0}
     - a27f8fc3b05620744b1d8ecb8887fb39: {fileID: 0}
     - 4b1143ea381fa784f845770efe57aa83: {fileID: 2263686003338691694}
+    - 24715b6589667244c81a22af7d2dfeb4: {fileID: 364068198859337419}
     - 7c7b63a1a0f94964ea4c108dc4af7f42: {fileID: 949410144025296100}
     - bb35662e382e98d4b80a57b982b56ab8: {fileID: 0}
     - 6589fc36d26872a46bfc37722f0d7bf8: {fileID: 7959803032152918586}
     - 8e5d16b5462d3284d88f214e820dadd8: {fileID: 838601366100711833}
     - 0ee58640dad94eb489d6f6345bb5180f: {fileID: 0}
+    - b194c7c95fdcb6748b8844dc9add5f12: {fileID: 2263686003338691694}
     - a0779ba4dad202b4db95cb6cd4b0c896: {fileID: 7023696562122098253}
+    - bceca1865b47cdc4d9384a9143b00b60: {fileID: 9070131457569374497}
+    - c8769d202e0fd454db5c679eddf65795: {fileID: 2263686003338691694}
     - e5893d02ff773c24d90f3a4c2a3cf23a: {fileID: 0}
     - b190ed1255d343840a5d9183261365db: {fileID: 0}
+    - 22d0a8b76d5fd5043b1b4b89e7e8d3c5: {fileID: 949410144025296100}
     - 9635ac9ca9870f44ebb1d5aa834aeb1f: {fileID: 7959803032152918586}
     - b595c57d511827847877b0a39cb18ce9: {fileID: 0}
     - 7eb1db0bf59982e4ba2ce0cb58d76bf5: {fileID: 0}
     - d9a0fd86aae4d22458ec4598babc39d9: {fileID: 2263686003338691694}
     - 4db9e7fff1b8eca43a9c546af192dc07: {fileID: 364068198859337419}
     - c0d3aed911ec10241b4881dd97d57871: {fileID: 0}
+    - eb065f5852c2a1b4a9579efebed38e09: {fileID: 7959803032152918586}
     - 888a17ff1678a32458692c29e3b98065: {fileID: 949410144025296100}
+    - c0df6c07ddc063f458ffc74b09a8622d: {fileID: 838601366100711833}
     - d0adedccc0a2738449274d6a52066b4b: {fileID: 0}
     - 81c219ee5fd8d1344a247672e8a7e494: {fileID: 2263686003338691694}
+    - 49afc94251389a44786e5878b9f54ac3: {fileID: 949410144025296100}
     - d79c1d139f3d5184ab27a4d3a3be27fd: {fileID: 0}
     - c1853077ea817324884439b3f62904ab: {fileID: 0}
     - a73f76c883890c3409c7eadfe88a018d: {fileID: 0}
+    - 242a1c22a692dab4c869907165f4c92e: {fileID: 364068198859337419}
 --- !u!1 &9221292201945622232
 GameObject:
   m_ObjectHideFlags: 0
@@ -7355,6 +7368,22 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 7195369486424068322}
     m_Modifications:
+    - target: {fileID: 247287361231855195, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: randomSeed
+      value: 8481
+      objectReference: {fileID: 0}
+    - target: {fileID: 247287361231855195, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 608607158942486417, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: randomSeed
+      value: 8481
+      objectReference: {fileID: 0}
+    - target: {fileID: 608607158942486417, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1629107773219833525, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.24
@@ -7395,10 +7424,42 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2623203453425681451, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: randomSeed
+      value: 8481
+      objectReference: {fileID: 0}
+    - target: {fileID: 2623203453425681451, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3178291786780567331, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: randomSeed
+      value: 8481
+      objectReference: {fileID: 0}
+    - target: {fileID: 3178291786780567331, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5545652762918832821, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: randomSeed
+      value: 8481
+      objectReference: {fileID: 0}
+    - target: {fileID: 5545652762918832821, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7412391199606318376, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
       propertyPath: m_Name
       value: fx boss 9052 zd
       objectReference: {fileID: 0}
+    - target: {fileID: 7466353896069030335, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: randomSeed
+      value: 8481
+      objectReference: {fileID: 0}
+    - target: {fileID: 7466353896069030335, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7793222201525339119, guid: fd05e739cb2c20742a79f585f5b9df00, type: 3}
       propertyPath: delayTime
       value: 0
@@ -7541,6 +7602,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 7195369486424068322}
     m_Modifications:
+    - target: {fileID: 207747949691329516, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: randomSeed
+      value: 1986
+      objectReference: {fileID: 0}
+    - target: {fileID: 207747949691329516, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 230855408383006387, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -7581,10 +7650,42 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1993756371232986761, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: randomSeed
+      value: 1986
+      objectReference: {fileID: 0}
+    - target: {fileID: 1993756371232986761, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4010778492265488964, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: randomSeed
+      value: 1986
+      objectReference: {fileID: 0}
+    - target: {fileID: 4010778492265488964, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4765789636255116902, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: randomSeed
+      value: 1986
+      objectReference: {fileID: 0}
+    - target: {fileID: 4765789636255116902, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5847547875862285597, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
       propertyPath: m_Name
       value: fx boss 9051 sf
       objectReference: {fileID: 0}
+    - target: {fileID: 7720397496157222367, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: randomSeed
+      value: 1986
+      objectReference: {fileID: 0}
+    - target: {fileID: 7720397496157222367, guid: bcca1f66c17cbbb45b58433bac44a5c7, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -7731,10 +7832,58 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 7195369486424068322}
     m_Modifications:
+    - target: {fileID: 679303826025916112, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: randomSeed
+      value: 6322
+      objectReference: {fileID: 0}
+    - target: {fileID: 679303826025916112, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2243807396185824965, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: randomSeed
+      value: 6322
+      objectReference: {fileID: 0}
+    - target: {fileID: 2243807396185824965, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3241869324439274115, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: randomSeed
+      value: 6322
+      objectReference: {fileID: 0}
+    - target: {fileID: 3241869324439274115, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3605159315127850307, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
       propertyPath: m_Name
       value: fx boss 9052 sf
       objectReference: {fileID: 0}
+    - target: {fileID: 3953099181854472599, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: randomSeed
+      value: 6322
+      objectReference: {fileID: 0}
+    - target: {fileID: 3953099181854472599, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5112779987951641395, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: randomSeed
+      value: 6322
+      objectReference: {fileID: 0}
+    - target: {fileID: 5112779987951641395, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5745128270494218590, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: randomSeed
+      value: 6322
+      objectReference: {fileID: 0}
+    - target: {fileID: 5745128270494218590, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8774471309740253525, guid: a2edf1cf5fa48dd4ab55ae9bf938c74f, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0

Assets/Res/CombatHero/Boss_QiongQi.prefab

@@ -33,38 +33,6 @@ Transform:
   - {fileID: 7266440096477041774}
   m_Father: {fileID: 6635153773524047823}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &445112444672048021
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6569276941279617078}
-  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 &6569276941279617078
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 445112444672048021}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.57464385, y: -0.40343943, z: 0.585116, w: -0.4057836}
-  m_LocalPosition: {x: -0.01358, y: 0.0045, z: -0.00007}
-  m_LocalScale: {x: 1.1645318, y: 0.99918985, z: 0.9936156}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3662133332091766463}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &468828643675112998
 GameObject:
   m_ObjectHideFlags: 0
@@ -144,7 +112,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2649847854921583511}
-  - {fileID: 4987179897824908330}
+  - {fileID: 1316694671990514352}
   m_Father: {fileID: 1839027638732501379}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1107205835458973224
@@ -870,10 +838,10 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 70, y: 70, z: 70}
+  m_LocalScale: {x: 60, y: 60, z: 60}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6219197314825707725}
+  - {fileID: 936208179901832997}
   - {fileID: 8866586502446609696}
   m_Father: {fileID: 5594557919007481883}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -931,7 +899,7 @@ Transform:
   - {fileID: 3061702981416354676}
   m_Father: {fileID: 5144844492582153830}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3851283933072623592
+--- !u!1 &3887671386790472400
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -939,133 +907,46 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6219197314825707725}
-  - component: {fileID: 8358312527989616805}
+  - component: {fileID: 1487973321784167694}
+  - component: {fileID: 7721494676031552480}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: 5_qiongqi_01
+  m_Name: zdpos3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6219197314825707725
+--- !u!4 &1487973321784167694
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3851283933072623592}
+  m_GameObject: {fileID: 3887671386790472400}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.42, y: 2.17, z: 1.13}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7916124759235835689}
+  m_Father: {fileID: 5594557919007481883}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8358312527989616805
-SkinnedMeshRenderer:
+--- !u!114 &7721494676031552480
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3851283933072623592}
+  m_GameObject: {fileID: 3887671386790472400}
   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
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos3
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &3971255325800405735
 GameObject:
   m_ObjectHideFlags: 0
@@ -1296,6 +1177,141 @@ Transform:
   - {fileID: 8354466962305243695}
   m_Father: {fileID: 337121520835448642}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5030706329135382793
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 936208179901832997}
+  - component: {fileID: 6812576889491592327}
+  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 &936208179901832997
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5030706329135382793}
+  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 &6812576889491592327
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5030706329135382793}
+  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 &5252162661765136573
 GameObject:
   m_ObjectHideFlags: 0
@@ -1492,6 +1508,38 @@ Transform:
   - {fileID: 4480251382408127652}
   m_Father: {fileID: 1875747591968747186}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7174188160415291772
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1316694671990514352}
+  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 &1316694671990514352
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7174188160415291772}
+  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 &7403903608763739942
 GameObject:
   m_ObjectHideFlags: 0
@@ -1648,12 +1696,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7988770818887351333}
   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_LocalRotation: {x: -0.57464385, y: -0.40343943, z: 0.585116, w: -0.4057836}
+  m_LocalPosition: {x: -0.01358, y: 0.0045, z: -0.00007}
+  m_LocalScale: {x: 1.1645318, y: 0.99918985, z: 0.9936156}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 864886980770349194}
+  m_Father: {fileID: 3662133332091766463}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8035876589473224738
 GameObject:
@@ -1750,7 +1798,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6569276941279617078}
+  - {fileID: 4987179897824908330}
   - {fileID: 5449816872763640192}
   - {fileID: 7420362354437776553}
   - {fileID: 3908171818875745106}
@@ -1836,7 +1884,7 @@ GameObject:
   - component: {fileID: 275845537028252308}
   - component: {fileID: 4028887229881904680}
   - component: {fileID: 5962849931983630885}
-  m_Layer: 9
+  m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Boss_QiongQi
   m_TagString: Untagged
@@ -1853,13 +1901,15 @@ Transform:
   m_GameObject: {fileID: 8510300678846815063}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: -0.23, y: 20.34, z: 14.91}
+  m_LocalPosition: {x: -0.23, y: 20.34, z: 15}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5650346118568658345}
   - {fileID: 3518954429267262038}
   - {fileID: 4249026852245187915}
+  - {fileID: 489922255668315934}
+  - {fileID: 1487973321784167694}
   - {fileID: 6988438844480241587}
   - {fileID: 7916124759235835689}
   m_Father: {fileID: 0}
@@ -1925,7 +1975,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _Animator: {fileID: 5962849931983630885}
-  _Transitions: {fileID: 11400000, guid: 866e079dfb7a50c4b970e0c8119ac1a5, type: 2}
+  _Transitions: {fileID: 11400000, guid: 8d881769684440445bbdb2a17a7ce951, type: 2}
   _ActionOnDisable: 0
 --- !u!95 &5962849931983630885
 Animator:
@@ -1936,7 +1986,7 @@ Animator:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8510300678846815063}
   m_Enabled: 1
-  m_Avatar: {fileID: 9000000, guid: aef33c378f6ca8747bbf8d823efde1aa, type: 3}
+  m_Avatar: {fileID: 0}
   m_Controller: {fileID: 0}
   m_CullingMode: 0
   m_UpdateMode: 0
@@ -2159,6 +2209,54 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &9064134781106849333
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 489922255668315934}
+  - component: {fileID: 1151447861996580574}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &489922255668315934
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9064134781106849333}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1.72, y: 2.17, z: 1.13}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5594557919007481883}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1151447861996580574
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9064134781106849333}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos2
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &9163963114688533826
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/fb_3101.prefab

@@ -73,6 +73,38 @@ MonoBehaviour:
   _Animator: {fileID: 6919295934107179613}
   _Transitions: {fileID: 11400000, guid: 230f24058e9f56b42ad6a34f9a45652d, type: 2}
   _ActionOnDisable: 0
+--- !u!1 &1550929271176819182
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7957620272237725477}
+  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 &7957620272237725477
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1550929271176819182}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.0000034666066, y: -0.0000034454445, z: -0.7092684, w: 0.7049386}
+  m_LocalPosition: {x: -0.0014843316, y: 0.255734, z: 0.0000000111784875}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1419627869443203312}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2913977674401134542
 GameObject:
   m_ObjectHideFlags: 0
@@ -186,38 +218,6 @@ Transform:
   - {fileID: 1419627869443203312}
   m_Father: {fileID: 1367215891999932367}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3812342299926378125
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 127035851773669870}
-  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 &127035851773669870
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3812342299926378125}
-  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 &4451722197817941589
 GameObject:
   m_ObjectHideFlags: 0
@@ -5082,7 +5082,7 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 127035851773669870}
+  - {fileID: 7957620272237725477}
   m_Father: {fileID: 327998283763961317}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5707983376449416818
@@ -9995,6 +9995,54 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!1 &6125301719052470970
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5000677187945994894}
+  - component: {fileID: 90004782235532248}
+  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 &5000677187945994894
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6125301719052470970}
+  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 &90004782235532248
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6125301719052470970}
+  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 &6191024932668128543
 GameObject:
   m_ObjectHideFlags: 0
@@ -14887,54 +14935,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!1 &6332065981605231321
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4368848299966494746}
-  - component: {fileID: 7063361077694487313}
-  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 &4368848299966494746
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6332065981605231321}
-  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 &7063361077694487313
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6332065981605231321}
-  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: 4368848299966494746}
+  - {fileID: 5000677187945994894}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!54 &3322395613801196915

Assets/Res/CombatHero/fb_dao1.prefab

@@ -1,5 +1,97 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &221485913023254377
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2563527163398389628}
+  - component: {fileID: 7955635726327654505}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbdao1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2563527163398389628
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 221485913023254377}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068}
+  m_LocalPosition: {x: 0.0017127597, y: 0.0099856565, z: -0.0027135524}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3762066587073657769}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &7955635726327654505
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 221485913023254377}
+  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: f58524814877b3e40882cfc86b50263f, 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: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
+  m_Bones:
+  - {fileID: 3562723674201918496}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 3562723674201918496}
+  m_AABB:
+    m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
+    m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &809572923017224122
 GameObject:
   m_ObjectHideFlags: 0
@@ -80,7 +172,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3562723674201918496}
-  - {fileID: 6577228952058162210}
+  - {fileID: 2563527163398389628}
   m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &1164658870965195
@@ -135,7 +227,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3762066587073657769}
+  m_Father: {fileID: 8565182548359739858}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &8034404278502932050
 SkinnedMeshRenderer:
@@ -160,7 +252,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f58524814877b3e40882cfc86b50263f, type: 2}
+  - {fileID: 2100000, guid: 86993dbe6487a364cbe7896811a1b5bd, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -187,9 +279,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 3562723674201918496}
+  - {fileID: 3285308603298060150}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3562723674201918496}
+  m_RootBone: {fileID: 3285308603298060150}
   m_AABB:
     m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
     m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
@@ -226,102 +318,10 @@ Transform:
   m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2103796638270892891}
-  - {fileID: 3672056792140815145}
+  - {fileID: 3285308603298060150}
+  - {fileID: 6577228952058162210}
   m_Father: {fileID: 3562723674201918496}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3825783677995233061
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3672056792140815145}
-  - component: {fileID: 8669223192563138852}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbdao1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3672056792140815145
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3825783677995233061}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068}
-  m_LocalPosition: {x: 0.0017127597, y: 0.0099856565, z: -0.0027135524}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8565182548359739858}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8669223192563138852
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3825783677995233061}
-  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: 86993dbe6487a364cbe7896811a1b5bd, 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: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
-  m_Bones:
-  - {fileID: 2103796638270892891}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2103796638270892891}
-  m_AABB:
-    m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
-    m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &4841319616322308277
 GameObject:
   m_ObjectHideFlags: 0
@@ -402,6 +402,38 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &5728342120370595607
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3285308603298060150}
+  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 &3285308603298060150
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5728342120370595607}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.4986345, y: 0.50136185, z: 0.50136185, w: 0.4986345}
+  m_LocalPosition: {x: -0.000023143375, y: 0, z: -0.0119704185}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8565182548359739858}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6215354488376093969
 GameObject:
   m_ObjectHideFlags: 0
@@ -521,35 +553,3 @@ Transform:
   - {fileID: 8565182548359739858}
   m_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7243194679412677736
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2103796638270892891}
-  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 &2103796638270892891
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7243194679412677736}
-  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

@@ -180,11 +180,11 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6253486908084636868}
-  - {fileID: 2057899741326335530}
+  - {fileID: 543081513309316129}
+  - {fileID: 4010400476793450784}
   m_Father: {fileID: 8679617179344489080}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2564401739933394410
+--- !u!1 &4033669629132829777
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -192,8 +192,56 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2057899741326335530}
-  - component: {fileID: 5670067181833944262}
+  - component: {fileID: 1595346372736176473}
+  - component: {fileID: 3779295641664235391}
+  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 &1595346372736176473
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4033669629132829777}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.056, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6372163822679039326}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3779295641664235391
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4033669629132829777}
+  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 &4201754938529491140
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2035781471110586611}
+  - component: {fileID: 457212544669207908}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbding1
@@ -202,28 +250,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2057899741326335530
+--- !u!4 &2035781471110586611
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2564401739933394410}
+  m_GameObject: {fileID: 4201754938529491140}
   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_Father: {fileID: 1894970939113486830}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &5670067181833944262
+--- !u!137 &457212544669207908
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2564401739933394410}
+  m_GameObject: {fileID: 4201754938529491140}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -240,7 +288,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: e51f6fe61916bdc429f5c50f1883dbf0, type: 2}
+  - {fileID: 2100000, guid: ac736dc4828e57d49ab30b5a3414c1bf, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -267,16 +315,16 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 6253486908084636868}
+  - {fileID: 8679617179344489080}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6253486908084636868}
+  m_RootBone: {fileID: 8679617179344489080}
   m_AABB:
     m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
     m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
---- !u!1 &4033669629132829777
+--- !u!1 &4964752053523695783
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -284,46 +332,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1595346372736176473}
-  - component: {fileID: 3779295641664235391}
+  - component: {fileID: 543081513309316129}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: hitpos
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1595346372736176473
+--- !u!4 &543081513309316129
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4033669629132829777}
+  m_GameObject: {fileID: 4964752053523695783}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.056, z: 0}
+  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: 6372163822679039326}
+  m_Father: {fileID: 8990132256551677773}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3779295641664235391
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4033669629132829777}
-  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 &5064081042845336680
 GameObject:
   m_ObjectHideFlags: 0
@@ -356,7 +388,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8679617179344489080}
-  - {fileID: 4010400476793450784}
+  - {fileID: 2035781471110586611}
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &748615157677977061
@@ -380,38 +412,6 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &6690856086018913405
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6253486908084636868}
-  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 &6253486908084636868
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6690856086018913405}
-  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 &7652285821121640782
 GameObject:
   m_ObjectHideFlags: 0
@@ -443,7 +443,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1894970939113486830}
+  m_Father: {fileID: 8990132256551677773}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &3140323038025354207
 SkinnedMeshRenderer:
@@ -468,7 +468,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: ac736dc4828e57d49ab30b5a3414c1bf, type: 2}
+  - {fileID: 2100000, guid: e51f6fe61916bdc429f5c50f1883dbf0, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -495,9 +495,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 8679617179344489080}
+  - {fileID: 543081513309316129}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8679617179344489080}
+  m_RootBone: {fileID: 543081513309316129}
   m_AABB:
     m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
     m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}

Assets/Res/CombatHero/fb_huohulu.prefab

@@ -135,7 +135,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9160172853801646544}
-  - {fileID: 3934407957788527041}
+  - {fileID: 805353284619814488}
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4119005012996295677
@@ -159,6 +159,98 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &1408370736814008535
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 805353284619814488}
+  - component: {fileID: 8033530781258372230}
+  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 &805353284619814488
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1408370736814008535}
+  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 &8033530781258372230
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1408370736814008535}
+  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 &2590654586827996216
 GameObject:
   m_ObjectHideFlags: 0
@@ -221,8 +313,8 @@ Transform:
   m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4140055598756149905}
-  - {fileID: 1194253344484022492}
+  - {fileID: 3053659765094089890}
+  - {fileID: 3934407957788527041}
   m_Father: {fileID: 9160172853801646544}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3646339959159431542
@@ -256,7 +348,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 &6105118779120398302
 SkinnedMeshRenderer:
@@ -281,7 +373,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
@@ -308,9 +400,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 9160172853801646544}
+  - {fileID: 3053659765094089890}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9160172853801646544}
+  m_RootBone: {fileID: 3053659765094089890}
   m_AABB:
     m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
     m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}
@@ -365,38 +457,6 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &5131005768962359213
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4140055598756149905}
-  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 &4140055598756149905
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5131005768962359213}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000054321042, y: -0.000000054323817, z: -0.7071068, w: 0.7071067}
-  m_LocalPosition: {x: 0.0017814379, y: 0.089754246, z: 0.0000000039232826}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8763248839805234681}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5946700858606240778
 GameObject:
   m_ObjectHideFlags: 0
@@ -532,7 +592,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &8038829671138809389
+--- !u!1 &7785768529899527881
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -540,87 +600,27 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1194253344484022492}
-  - component: {fileID: 8291219563815427122}
+  - component: {fileID: 3053659765094089890}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_hulu
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1194253344484022492
+--- !u!4 &3053659765094089890
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8038829671138809389}
+  m_GameObject: {fileID: 7785768529899527881}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
+  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!137 &8291219563815427122
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8038829671138809389}
-  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: 4140055598756149905}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4140055598756149905}
-  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

Assets/Res/CombatHero/fb_jian1.prefab

@@ -78,11 +78,11 @@ Transform:
   m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7603725527017331336}
-  - {fileID: 5155238928209473630}
+  - {fileID: 6559076526238138736}
+  - {fileID: 7343501561500064399}
   m_Father: {fileID: 7466859698293448862}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1295764715805793093
+--- !u!1 &1685215910820465413
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -90,90 +90,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2553369526246511571}
-  - component: {fileID: 167587199295380567}
+  - component: {fileID: 6559076526238138736}
   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 &2553369526246511571
+--- !u!4 &6559076526238138736
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1295764715805793093}
+  m_GameObject: {fileID: 1685215910820465413}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, 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: 1028615347405319678}
+  m_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &167587199295380567
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1295764715805793093}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
-  m_Bones:
-  - {fileID: 7466859698293448862}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7466859698293448862}
-  m_AABB:
-    m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
-    m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &2778996064610124439
 GameObject:
   m_ObjectHideFlags: 0
@@ -206,7 +146,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7466859698293448862}
-  - {fileID: 2553369526246511571}
+  - {fileID: 478325356673352587}
   m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5295049769349527351
@@ -364,7 +304,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &5067605215026806870
+--- !u!1 &4927119704336791525
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -372,30 +312,90 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7603725527017331336}
+  - component: {fileID: 478325356673352587}
+  - component: {fileID: 7644888099662079681}
   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 &7603725527017331336
+--- !u!4 &478325356673352587
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5067605215026806870}
+  m_GameObject: {fileID: 4927119704336791525}
   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.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 &7644888099662079681
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4927119704336791525}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
+  m_Bones:
+  - {fileID: 7466859698293448862}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 7466859698293448862}
+  m_AABB:
+    m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
+    m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &5182842215280330390
 GameObject:
   m_ObjectHideFlags: 0
@@ -429,7 +429,7 @@ Transform:
   - {fileID: 1439812933337521677}
   m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5186776817899998992
+--- !u!1 &7849891338208220805
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -437,8 +437,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5155238928209473630}
-  - component: {fileID: 5063570157924564076}
+  - component: {fileID: 5973240175850598617}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -447,13 +446,46 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5155238928209473630
+--- !u!4 &5973240175850598617
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5186776817899998992}
+  m_GameObject: {fileID: 7849891338208220805}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2850277934501199321}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7952309380255984530
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7343501561500064399}
+  - component: {fileID: 3518727037226896555}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_jian1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7343501561500064399
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7952309380255984530}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
@@ -462,13 +494,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &5063570157924564076
+--- !u!137 &3518727037226896555
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5186776817899998992}
+  m_GameObject: {fileID: 7952309380255984530}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -512,44 +544,12 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
   m_Bones:
-  - {fileID: 7603725527017331336}
+  - {fileID: 6559076526238138736}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7603725527017331336}
+  m_RootBone: {fileID: 6559076526238138736}
   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 &7849891338208220805
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5973240175850598617}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_jian1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5973240175850598617
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7849891338208220805}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2850277934501199321}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/CombatHero/fb_jian2.prefab

@@ -134,38 +134,6 @@ 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 &3547840326533097748
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3674750209951507394}
-  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 &3674750209951507394
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3547840326533097748}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.50025254, y: 0.4997474, z: 0.4997474, w: 0.50025254}
-  m_LocalPosition: {x: 0.0041293018, y: 0, z: -0.39396098}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6865594351597376310}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5291855315857285515
 GameObject:
   m_ObjectHideFlags: 0
@@ -196,8 +164,8 @@ Transform:
   m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3674750209951507394}
-  - {fileID: 4641385828037891717}
+  - {fileID: 2977006525964362835}
+  - {fileID: 1125861858612937447}
   m_Father: {fileID: 7074505583183483981}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6360724120513573557
@@ -248,7 +216,7 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &6720673606928801386
+--- !u!1 &6382409632671653291
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -256,8 +224,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4641385828037891717}
-  - component: {fileID: 3535231502440056023}
+  - component: {fileID: 8938292813373800602}
+  - component: {fileID: 3004988338819223009}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbjian2
@@ -266,28 +234,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4641385828037891717
+--- !u!4 &8938292813373800602
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6720673606928801386}
+  m_GameObject: {fileID: 6382409632671653291}
   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 &3535231502440056023
+--- !u!137 &3004988338819223009
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6720673606928801386}
+  m_GameObject: {fileID: 6382409632671653291}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -304,7 +272,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
@@ -331,9 +299,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
   m_Bones:
-  - {fileID: 3674750209951507394}
+  - {fileID: 7074505583183483981}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3674750209951507394}
+  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}
@@ -437,7 +405,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7074505583183483981}
-  - {fileID: 1125861858612937447}
+  - {fileID: 8938292813373800602}
   m_Father: {fileID: 9057844881385621598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7120436569189825082
@@ -461,6 +429,38 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &7959427010395085294
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2977006525964362835}
+  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 &2977006525964362835
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7959427010395085294}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.50025254, y: 0.4997474, z: 0.4997474, w: 0.50025254}
+  m_LocalPosition: {x: 0.0041293018, y: 0, z: -0.39396098}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6865594351597376310}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8372896854056501704
 GameObject:
   m_ObjectHideFlags: 0
@@ -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 &6057663879661385279
 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: 2977006525964362835}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7074505583183483981}
+  m_RootBone: {fileID: 2977006525964362835}
   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 &678857942664911356
+--- !u!1 &2853221564033797514
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6147498505651127763}
-  - component: {fileID: 4172004392093691994}
+  - component: {fileID: 3229702076746228403}
+  - component: {fileID: 3808244328899282246}
+  - component: {fileID: 8374485055632873607}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_linglongta
@@ -18,81 +19,122 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6147498505651127763
+--- !u!4 &3229702076746228403
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 678857942664911356}
+  m_GameObject: {fileID: 2853221564033797514}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.13, y: 7.46, z: 1.97}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 589998100047264782}
+  m_Children:
+  - {fileID: 4724784017856295453}
+  - {fileID: 1831017494247033119}
+  - {fileID: 6835743044111215408}
+  - {fileID: 120756530494083055}
+  m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4172004392093691994
-SkinnedMeshRenderer:
+--- !u!54 &3808244328899282246
+Rigidbody:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 678857942664911356}
+  m_GameObject: {fileID: 2853221564033797514}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &8374485055632873607
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2853221564033797514}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
   m_Enabled: 1
-  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: 3
+  m_Size: {x: 0.5, y: 0.9786749, z: 0.51}
+  m_Center: {x: 0, y: 0.09983301, z: 0}
+--- !u!1 &4020983649939190267
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1831017494247033119}
+  - component: {fileID: 7365029092108843876}
+  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 &1831017494247033119
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4020983649939190267}
   serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
-  m_Bones:
-  - {fileID: 4443572372084557061}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4443572372084557061}
-  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 &2842002047253897965
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.015, z: 0.39}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3229702076746228403}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7365029092108843876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4020983649939190267}
+  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 &4413275210817262351
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -100,8 +142,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8902510669791388290}
-  - component: {fileID: 4887858839450074154}
+  - component: {fileID: 3251443510392418180}
+  - component: {fileID: 1268268157829592764}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_linglongta
@@ -110,28 +152,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8902510669791388290
+--- !u!4 &3251443510392418180
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2842002047253897965}
+  m_GameObject: {fileID: 4413275210817262351}
   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: 120756530494083055}
+  m_Father: {fileID: 589998100047264782}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4887858839450074154
+--- !u!137 &1268268157829592764
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2842002047253897965}
+  m_GameObject: {fileID: 4413275210817262351}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -148,7 +190,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, type: 2}
+  - {fileID: 2100000, guid: 838f24e6b06702f4e9c1920dbaac2574, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -175,16 +217,16 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
   m_Bones:
-  - {fileID: 4887794763406024427}
+  - {fileID: 5305808837950062172}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4887794763406024427}
+  m_RootBone: {fileID: 5305808837950062172}
   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 &2853221564033797514
+--- !u!1 &4440905463427676986
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -192,9 +234,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3229702076746228403}
-  - component: {fileID: 3808244328899282246}
-  - component: {fileID: 8374485055632873607}
+  - component: {fileID: 4724784017856295453}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_linglongta
@@ -203,74 +243,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3229702076746228403
+--- !u!4 &4724784017856295453
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2853221564033797514}
+  m_GameObject: {fileID: 4440905463427676986}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.13, y: 7.46, z: 1.97}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4724784017856295453}
-  - {fileID: 1831017494247033119}
-  - {fileID: 6835743044111215408}
-  - {fileID: 120756530494083055}
-  m_Father: {fileID: 0}
+  m_Children: []
+  m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!54 &3808244328899282246
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2853221564033797514}
-  serializedVersion: 4
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
-  m_UseGravity: 1
-  m_IsKinematic: 1
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
---- !u!65 &8374485055632873607
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2853221564033797514}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.5, y: 0.9786749, z: 0.51}
-  m_Center: {x: 0, y: 0.09983301, z: 0}
---- !u!1 &3812255469014442130
+--- !u!1 &5473511212704554151
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -278,7 +266,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4443572372084557061}
+  - component: {fileID: 5305808837950062172}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -287,13 +275,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4443572372084557061
+--- !u!4 &5305808837950062172
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3812255469014442130}
+  m_GameObject: {fileID: 5473511212704554151}
   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}
@@ -302,7 +290,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 589998100047264782}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4020983649939190267
+--- !u!1 &6069193922456573349
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -310,47 +298,33 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1831017494247033119}
-  - component: {fileID: 7365029092108843876}
+  - component: {fileID: 589998100047264782}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: pengpos
+  m_Name: fb_linglongta_run (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1831017494247033119
+--- !u!4 &589998100047264782
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4020983649939190267}
+  m_GameObject: {fileID: 6069193922456573349}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.015, z: 0.39}
+  m_LocalRotation: {x: -0.0000008506696, y: 0.00000077682074, z: 0.7026459, w: 0.7115397}
+  m_LocalPosition: {x: 0.3101634, y: -0.0069049597, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3229702076746228403}
+  m_Children:
+  - {fileID: 5305808837950062172}
+  - {fileID: 3251443510392418180}
+  m_Father: {fileID: 4887794763406024427}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7365029092108843876
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4020983649939190267}
-  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 &4440905463427676986
+--- !u!1 &6162039366867283795
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -358,7 +332,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4724784017856295453}
+  - component: {fileID: 6703534002916531042}
+  - component: {fileID: 7885533630138160007}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_linglongta
@@ -367,55 +342,80 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4724784017856295453
+--- !u!4 &6703534002916531042
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4440905463427676986}
+  m_GameObject: {fileID: 6162039366867283795}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  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: 3229702076746228403}
+  m_Father: {fileID: 120756530494083055}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6069193922456573349
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 589998100047264782}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_linglongta_run (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &589998100047264782
-Transform:
+--- !u!137 &7885533630138160007
+SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6069193922456573349}
+  m_GameObject: {fileID: 6162039366867283795}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0000008506696, y: 0.00000077682074, z: 0.7026459, w: 0.7115397}
-  m_LocalPosition: {x: 0.3101634, y: -0.0069049597, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4443572372084557061}
-  - {fileID: 6147498505651127763}
-  m_Father: {fileID: 4887794763406024427}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
+  m_Bones:
+  - {fileID: 4887794763406024427}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 4887794763406024427}
+  m_AABB:
+    m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
+    m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &6525093672149038688
 GameObject:
   m_ObjectHideFlags: 0
@@ -530,7 +530,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4887794763406024427}
-  - {fileID: 8902510669791388290}
+  - {fileID: 6703534002916531042}
   m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8112392103606109572

Assets/Res/CombatHero/fb_wulonglun.prefab

@@ -1,97 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &1315910667570148184
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1423174344303964230}
-  - component: {fileID: 1695881243504372251}
-  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 &1423174344303964230
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1315910667570148184}
-  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 &1695881243504372251
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1315910667570148184}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: a78f967665a433842a8fa465bd7675d2, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
-  m_Bones:
-  - {fileID: 8985698407474411210}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8985698407474411210}
-  m_AABB:
-    m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
-    m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &2106655689270820769
 GameObject:
   m_ObjectHideFlags: 0
@@ -178,38 +86,6 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.5, y: 0.86799335, z: 0.91047573}
   m_Center: {x: 0, y: 0.044492245, z: 0.009610653}
---- !u!1 &2115591586795041508
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4636426011991072170}
-  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 &4636426011991072170
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2115591586795041508}
-  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 &2161800469378632090
 GameObject:
   m_ObjectHideFlags: 0
@@ -323,7 +199,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &6701506158277672718
+--- !u!1 &5100182317857351258
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -331,8 +207,100 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3977806747228995560}
-  - component: {fileID: 1200065056464794138}
+  - component: {fileID: 543176352250882726}
+  - component: {fileID: 5409519697240635854}
+  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 &543176352250882726
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5100182317857351258}
+  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 &5409519697240635854
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5100182317857351258}
+  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 &5206886569905644003
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6730570420517842774}
+  - component: {fileID: 8517466691776715912}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: wulonglun2
@@ -341,13 +309,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3977806747228995560
+--- !u!4 &6730570420517842774
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6701506158277672718}
+  m_GameObject: {fileID: 5206886569905644003}
   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}
@@ -356,13 +324,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8019158978286339551}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1200065056464794138
+--- !u!137 &8517466691776715912
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6701506158277672718}
+  m_GameObject: {fileID: 5206886569905644003}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -406,15 +374,47 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
   m_Bones:
-  - {fileID: 4636426011991072170}
+  - {fileID: 1412400906056452368}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4636426011991072170}
+  m_RootBone: {fileID: 1412400906056452368}
   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 &5490234436814271455
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1412400906056452368}
+  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 &1412400906056452368
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5490234436814271455}
+  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 &7141257263086483798
 GameObject:
   m_ObjectHideFlags: 0
@@ -445,8 +445,8 @@ Transform:
   m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4636426011991072170}
-  - {fileID: 3977806747228995560}
+  - {fileID: 1412400906056452368}
+  - {fileID: 6730570420517842774}
   m_Father: {fileID: 8985698407474411210}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!1 &7179850442623262044
@@ -530,7 +530,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8985698407474411210}
-  - {fileID: 1423174344303964230}
+  - {fileID: 543176352250882726}
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!95 &852375880241615242

Assets/Res/CombatHero/fb_yuping.prefab

@@ -32,40 +32,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1267724782336671835
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1561176577912287655}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_yuping_show
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1561176577912287655
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1267724782336671835}
-  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: 276888563751202682}
-  - {fileID: 3277839360882572417}
-  m_Father: {fileID: 6598966518811955930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1753474551093225905
 GameObject:
   m_ObjectHideFlags: 0
@@ -233,7 +199,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6598966518811955930}
-  - {fileID: 80387022022361396}
+  - {fileID: 4851966763126522593}
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8285792300048012968
@@ -272,7 +238,7 @@ MonoBehaviour:
   _Animator: {fileID: 8285792300048012968}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &5854779061204003106
+--- !u!1 &3798028077484469751
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -280,29 +246,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 276888563751202682}
+  - component: {fileID: 5671924048216613631}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fb_yuping_show
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &276888563751202682
+--- !u!4 &5671924048216613631
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5854779061204003106}
+  m_GameObject: {fileID: 3798028077484469751}
   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_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: []
-  m_Father: {fileID: 1561176577912287655}
+  m_Children:
+  - {fileID: 4116219887377950827}
+  - {fileID: 80387022022361396}
+  m_Father: {fileID: 6598966518811955930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6270621986596136450
 GameObject:
@@ -335,7 +303,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8974866603299107661}
+  m_Father: {fileID: 5671924048216613631}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &7927879858843203150
 SkinnedMeshRenderer:
@@ -345,7 +313,7 @@ SkinnedMeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6270621986596136450}
   m_Enabled: 1
-  m_CastShadows: 0
+  m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -360,7 +328,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
@@ -387,9 +355,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 6598966518811955930}
+  - {fileID: 4116219887377950827}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6598966518811955930}
+  m_RootBone: {fileID: 4116219887377950827}
   m_AABB:
     m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
     m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
@@ -444,40 +412,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &8219916005125797274
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6598966518811955930}
-  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 &6598966518811955930
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8219916005125797274}
-  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:
-  - {fileID: 1561176577912287655}
-  m_Father: {fileID: 8974866603299107661}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &9044111365336093968
+--- !u!1 &7060139510499901460
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -485,8 +420,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3277839360882572417}
-  - component: {fileID: 6075267982849489222}
+  - component: {fileID: 4851966763126522593}
+  - component: {fileID: 5070273253595254486}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: yuping
@@ -495,30 +430,30 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3277839360882572417
+--- !u!4 &4851966763126522593
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9044111365336093968}
+  m_GameObject: {fileID: 7060139510499901460}
   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: 1561176577912287655}
+  m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6075267982849489222
+--- !u!137 &5070273253595254486
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9044111365336093968}
+  m_GameObject: {fileID: 7060139510499901460}
   m_Enabled: 1
-  m_CastShadows: 1
+  m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -533,7 +468,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
@@ -560,12 +495,77 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 276888563751202682}
+  - {fileID: 6598966518811955930}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 276888563751202682}
+  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 &8219916005125797274
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6598966518811955930}
+  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 &6598966518811955930
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8219916005125797274}
+  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:
+  - {fileID: 5671924048216613631}
+  m_Father: {fileID: 8974866603299107661}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8658942476906983657
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4116219887377950827}
+  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 &4116219887377950827
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8658942476906983657}
+  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: 5671924048216613631}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/Config/BuffConfig.json

@@ -183,7 +183,7 @@
     },
     {
       "ID": 10101,
-      "nameTest": "灼痛",
+      "nameTest": "痛苦",
       "decTest": "敌人皮肤和静脉被火焰灼烧溃烂，使用功法时自身受到当前生命{0}%伤",
       "icon": "icon_b1010",
       "buffName": 500003,
@@ -244,8 +244,8 @@
     },
     {
       "ID": 10131,
-      "nameTest": "细尘",
-      "decTest": "敌人吸入细尘，细尘会累计到一定{0}数量后随机封锁一个筋脉",
+      "nameTest": "土沙",
+      "decTest": "每一层土沙降低敌人{0}防御",
       "icon": "icon_b1013",
       "buffName": 500003,
       "buffEffectDes": 500044,

Assets/Res/Config/HeroModelConfig.json

@@ -701,7 +701,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5007",
-      "model": "Guixiu01",
+      "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 95,

Assets/Res/Config/SkillConfig.json

@@ -10156,6 +10156,600 @@
         1
       ],
       "PromoteLan": null
+    },
+    {
+      "ID": 90510,
+      "PieceID": null,
+      "power": 100.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9051",
+      "scriptName": "S9051",
+      "IDGroup": 9051,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 1,
+      "effectValue": [
+        3.0,
+        150.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90511,
+      "PieceID": null,
+      "power": 150.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9051",
+      "scriptName": "S9051",
+      "IDGroup": 9051,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 2,
+      "effectValue": [
+        3.0,
+        170.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90512,
+      "PieceID": null,
+      "power": 225.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9051",
+      "scriptName": "S9051",
+      "IDGroup": 9051,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 3,
+      "effectValue": [
+        3.0,
+        190.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90513,
+      "PieceID": null,
+      "power": 337.5,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9051",
+      "scriptName": "S9051",
+      "IDGroup": 9051,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 4,
+      "effectValue": [
+        3.0,
+        210.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90514,
+      "PieceID": null,
+      "power": 506.25,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9051",
+      "scriptName": "S9051",
+      "IDGroup": 9051,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 5,
+      "effectValue": [
+        3.0,
+        230.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90515,
+      "PieceID": null,
+      "power": 759.375,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9051",
+      "scriptName": "S9051",
+      "IDGroup": 9051,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 6,
+      "effectValue": [
+        3.0,
+        250.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90520,
+      "PieceID": null,
+      "power": 100.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9052",
+      "scriptName": "S9052",
+      "IDGroup": 9052,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 1,
+      "effectValue": [
+        3.0,
+        150.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90521,
+      "PieceID": null,
+      "power": 150.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9052",
+      "scriptName": "S9052",
+      "IDGroup": 9052,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 2,
+      "effectValue": [
+        3.0,
+        170.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90522,
+      "PieceID": null,
+      "power": 225.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9052",
+      "scriptName": "S9052",
+      "IDGroup": 9052,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 3,
+      "effectValue": [
+        3.0,
+        190.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90523,
+      "PieceID": null,
+      "power": 337.5,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9052",
+      "scriptName": "S9052",
+      "IDGroup": 9052,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 4,
+      "effectValue": [
+        3.0,
+        210.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90524,
+      "PieceID": null,
+      "power": 506.25,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9052",
+      "scriptName": "S9052",
+      "IDGroup": 9052,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 5,
+      "effectValue": [
+        3.0,
+        230.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90525,
+      "PieceID": null,
+      "power": 759.375,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9052",
+      "scriptName": "S9052",
+      "IDGroup": 9052,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 6,
+      "effectValue": [
+        3.0,
+        250.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90530,
+      "PieceID": null,
+      "power": 100.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9053",
+      "scriptName": "S9053",
+      "IDGroup": 9053,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 1,
+      "effectValue": [
+        30.0,
+        3.0,
+        5.0,
+        20.0,
+        10.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90531,
+      "PieceID": null,
+      "power": 150.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9053",
+      "scriptName": "S9053",
+      "IDGroup": 9053,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 2,
+      "effectValue": [
+        30.0,
+        3.0,
+        5.0,
+        20.0,
+        10.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90532,
+      "PieceID": null,
+      "power": 225.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9053",
+      "scriptName": "S9053",
+      "IDGroup": 9053,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 3,
+      "effectValue": [
+        30.0,
+        3.0,
+        5.0,
+        20.0,
+        10.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90533,
+      "PieceID": null,
+      "power": 337.5,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9053",
+      "scriptName": "S9053",
+      "IDGroup": 9053,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 4,
+      "effectValue": [
+        30.0,
+        3.0,
+        5.0,
+        20.0,
+        10.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90534,
+      "PieceID": null,
+      "power": 506.25,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9053",
+      "scriptName": "S9053",
+      "IDGroup": 9053,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 5,
+      "effectValue": [
+        30.0,
+        3.0,
+        5.0,
+        20.0,
+        10.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90535,
+      "PieceID": null,
+      "power": 759.375,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9053",
+      "scriptName": "S9053",
+      "IDGroup": 9053,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 6,
+      "effectValue": [
+        30.0,
+        3.0,
+        5.0,
+        20.0,
+        10.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90540,
+      "PieceID": null,
+      "power": 100.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9054",
+      "scriptName": "S9054",
+      "IDGroup": 9054,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 1,
+      "effectValue": [
+        3.0,
+        150.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90541,
+      "PieceID": null,
+      "power": 150.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9054",
+      "scriptName": "S9054",
+      "IDGroup": 9054,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 2,
+      "effectValue": [
+        3.0,
+        170.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90542,
+      "PieceID": null,
+      "power": 225.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9054",
+      "scriptName": "S9054",
+      "IDGroup": 9054,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 3,
+      "effectValue": [
+        3.0,
+        190.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90543,
+      "PieceID": null,
+      "power": 337.5,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9054",
+      "scriptName": "S9054",
+      "IDGroup": 9054,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 4,
+      "effectValue": [
+        3.0,
+        210.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90544,
+      "PieceID": null,
+      "power": 506.25,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9054",
+      "scriptName": "S9054",
+      "IDGroup": 9054,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 5,
+      "effectValue": [
+        3.0,
+        230.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
+    },
+    {
+      "ID": 90545,
+      "PieceID": null,
+      "power": 759.375,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9054",
+      "scriptName": "S9054",
+      "IDGroup": 9054,
+      "timelineName": "Boss_QiongQi_TD",
+      "cd": 1.0,
+      "addcd": 0.0,
+      "SkillType": 1,
+      "level": 6,
+      "effectValue": [
+        3.0,
+        250.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": null
     }
   ]
 }

Assets/Res/UI/MainHeroPanel/FaBaoAttributeWidget.prefab

@@ -42,7 +42,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 233, y: 88}
+  m_SizeDelta: {x: 233, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5451924722642203252
 CanvasRenderer:
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1536137278090661796}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -90,6 +90,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 88
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -166,10 +167,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7749405585876328868}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -22.5, y: 6.5156}
-  m_SizeDelta: {x: 29, y: 25}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 66, y: -17.767}
+  m_SizeDelta: {x: 23.267303, y: 20.057999}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6171417124027095956
 CanvasRenderer:
@@ -217,6 +218,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 20.058
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -239,7 +241,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8526466749311363744
 RectTransform:
   m_ObjectHideFlags: 0
@@ -305,6 +307,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 44
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -342,11 +345,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7749405585876328868}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 88.736, y: -22.033}
-  m_SizeDelta: {x: 61.3275, y: 34.73}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 30.5, y: 25.369003}
+  m_SizeDelta: {x: 61.3275, y: 34.729996}
+  m_Pivot: {x: -0.12784432, y: 1.9532585}
 --- !u!222 &4400891513561527877
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -377,7 +380,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 22
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -422,10 +425,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7749405585876328868}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 13.336102, y: -22.033}
-  m_SizeDelta: {x: 92.0722, y: 34.73}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 35.897, y: -25.103}
+  m_SizeDelta: {x: 92.0722, y: 34.729996}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2682902642707814625
 CanvasRenderer:
@@ -448,7 +451,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7254902, g: 0.8078432, b: 0.7411765, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -457,7 +460,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
@@ -502,10 +505,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7749405585876328868}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 39.4, y: 12}
-  m_SizeDelta: {x: 160, y: 33.3358}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -58.9195, y: -25.8}
+  m_SizeDelta: {x: 97.5609, y: 33.3358}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7266792496980045858
 CanvasRenderer:
@@ -528,7 +531,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7254902, g: 0.8078432, b: 0.7411765, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -537,11 +540,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 222
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -209,6 +209,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -298,6 +299,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -551,7 +553,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 97, y: -530.9}
+  m_AnchoredPosition: {x: 5.4, y: -531.3}
   m_SizeDelta: {x: 514.76996, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6326345466183093196
@@ -639,8 +641,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 101.26538, y: 70.29089}
-  m_SizeDelta: {x: 516.3287, y: 240.8118}
+  m_AnchoredPosition: {x: 13.6895, y: -29}
+  m_SizeDelta: {x: 691.4804, y: 160.0778}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6929743905255865244
 CanvasRenderer:
@@ -688,6 +690,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 240.8118
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -727,7 +730,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -272, y: 197.92}
+  m_AnchoredPosition: {x: -246, y: 313.21997}
   m_SizeDelta: {x: 164.0966, y: 204.2354}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4755960994092275630
@@ -776,6 +779,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 204.23534
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -865,6 +869,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 35
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1126,7 +1131,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 60.8, y: 0.7}
+  m_AnchoredPosition: {x: 268, y: 54}
   m_SizeDelta: {x: 0, y: 75.668}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7359437752171597100
@@ -1461,7 +1466,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 143.6, y: -518.2}
+  m_AnchoredPosition: {x: 0, y: -518.2}
   m_SizeDelta: {x: 543.1503, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6922482407468544096
@@ -1552,6 +1557,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u57F9\u517B"
+--- !u!1 &3210136915528964078
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1618446015633265560}
+  - component: {fileID: 4658420417724510445}
+  - component: {fileID: 9054897281558856292}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1618446015633265560
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210136915528964078}
+  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: 7222205424052035792}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 271, y: -35}
+  m_SizeDelta: {x: 488.9567, y: 51.467896}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4658420417724510445
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210136915528964078}
+  m_CullTransparentMesh: 1
+--- !u!114 &9054897281558856292
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210136915528964078}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.30980393, g: 0.19607845, b: 0.08627451, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 42
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u57FA\u7840\u5C5E\u6027"
 --- !u!1 &3314419697092224364
 GameObject:
   m_ObjectHideFlags: 0
@@ -1642,8 +1727,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5788500819222458158}
   - component: {fileID: 6752312888180738513}
-  - component: {fileID: 8767632309005001914}
   - component: {fileID: 2323203369421012427}
+  - component: {fileID: 5265302759862248076}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: FaBaoAttributeWidgetRoot
@@ -1664,13 +1749,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6108060668469187376}
+  m_Father: {fileID: 7222205424052035792}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 218.1, y: 270}
-  m_SizeDelta: {x: 0, y: 60.0699}
-  m_Pivot: {x: 0, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -55.1}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &6752312888180738513
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1679,7 +1764,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3341266077164049528}
   m_CullTransparentMesh: 1
---- !u!114 &8767632309005001914
+--- !u!114 &2323203369421012427
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1688,16 +1773,30 @@ MonoBehaviour:
   m_GameObject: {fileID: 3341266077164049528}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &5265302759862248076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3341266077164049528}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
+    m_Left: 21
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 45.18
+  m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -1705,20 +1804,6 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!114 &2323203369421012427
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3341266077164049528}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
 --- !u!1 &3346857730111124697
 GameObject:
   m_ObjectHideFlags: 0
@@ -1991,7 +2076,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 85.5, y: -3.2299805}
+  m_AnchoredPosition: {x: 132.5, y: -3.2299805}
   m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8390928313110045558
@@ -2040,6 +2125,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2175,6 +2261,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 385.6781
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2357,8 +2444,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.00071645, y: 408.73486}
-  m_SizeDelta: {x: 750, y: 78.1416}
+  m_AnchoredPosition: {x: 12.524, y: 319.21933}
+  m_SizeDelta: {x: 693.81, y: 213.3123}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8870171658625692314
 CanvasRenderer:
@@ -2406,6 +2493,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 78.1416
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2494,6 +2582,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2584,6 +2673,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2663,8 +2753,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4961536466157608292}
-  - {fileID: 5788500819222458158}
   - {fileID: 8695863786727674304}
+  - {fileID: 7222205424052035792}
   - {fileID: 3562230635030506916}
   - {fileID: 6136655831423186836}
   - {fileID: 7897417943919571100}
@@ -2720,8 +2810,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 101.26, y: -268.95367}
-  m_SizeDelta: {x: 516.33, y: 417}
+  m_AnchoredPosition: {x: 10.299, y: -303.2641}
+  m_SizeDelta: {x: 684.93, y: 359.5283}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6680631196129598971
 CanvasRenderer:
@@ -2769,6 +2859,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 417
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2808,7 +2899,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -272, y: 207.7}
+  m_AnchoredPosition: {x: -246, y: 323}
   m_SizeDelta: {x: 110, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7714047007213359072
@@ -2857,6 +2948,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: 7fb091d8ea8692b1350a9fd8f408874a
+  imageH: 99.84776
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2972,7 +3064,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 13.686, y: 81.2}
+  m_AnchoredPosition: {x: -75, y: 45}
   m_SizeDelta: {x: 488.9567, y: 51.4679}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9160311939306131453
@@ -3101,6 +3193,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3189,6 +3282,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3310,8 +3404,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 4.8672, y: -24.7863}
-  m_SizeDelta: {x: 473.8917, y: 323.5725}
+  m_AnchoredPosition: {x: 7.267, y: -32.2116}
+  m_SizeDelta: {x: 635.3597, y: 261.9957}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2646367918689829722
 CanvasRenderer:
@@ -3467,6 +3561,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3550,8 +3645,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 4.3, y: -23.6509}
-  m_SizeDelta: {x: 464.8343, y: 153.9226}
+  m_AnchoredPosition: {x: 15.9969, y: -31.696}
+  m_SizeDelta: {x: 646.8281, y: 101.9244}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8091370797186559976
 CanvasRenderer:
@@ -3630,7 +3725,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 12.4, y: 167.79465}
+  m_AnchoredPosition: {x: -81, y: 139}
   m_SizeDelta: {x: 488.9567, y: 43.4929}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9184616767057802106
@@ -3711,7 +3806,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -678.4, y: 0.1}
+  m_AnchoredPosition: {x: -455, y: 54}
   m_SizeDelta: {x: 65, y: 66}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &7965205304804970307
@@ -3760,6 +3855,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+  imageH: 66
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3864,6 +3960,97 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53D6\u6D88"
+--- !u!1 &6891933565934835835
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7222205424052035792}
+  - component: {fileID: 927692187906011649}
+  - component: {fileID: 1075030266377417913}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: JichuShuXingRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7222205424052035792
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6891933565934835835}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1618446015633265560}
+  - {fileID: 5788500819222458158}
+  m_Father: {fileID: 6108060668469187376}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 13.6895, y: 130.7}
+  m_SizeDelta: {x: 691.4804, y: 140.954}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &927692187906011649
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6891933565934835835}
+  m_CullTransparentMesh: 1
+--- !u!114 &1075030266377417913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6891933565934835835}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9294118, g: 0.9568628, b: 0.9960785, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xiadiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 240.8118
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7007869723404515456
 GameObject:
   m_ObjectHideFlags: 0
@@ -4030,6 +4217,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4403,7 +4591,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -173, y: -3.2299805}
+  m_AnchoredPosition: {x: -126, y: -3.2299805}
   m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5534412852682778287
@@ -4452,6 +4640,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4538,7 +4727,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 519.5, y: 2}
+  m_AnchoredPosition: {x: 186.76, y: -42}
   m_SizeDelta: {x: 0, y: 75.668}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7271376927170581440

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -411,7 +411,6 @@ GameObject:
   m_Component:
   - component: {fileID: 868834413672771607}
   - component: {fileID: 8716127586724495292}
-  - component: {fileID: 4822715704095626536}
   - component: {fileID: 494562200636583715}
   m_Layer: 0
   m_HasEditorInfo: 1
@@ -433,13 +432,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8468219431132250151}
+  m_Father: {fileID: 5142448662693722814}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 63.1, y: -2.6}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 65, y: 66}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8716127586724495292
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -448,26 +447,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1087223624327040953}
   m_CullTransparentMesh: 1
---- !u!114 &4822715704095626536
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1087223624327040953}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!114 &494562200636583715
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -542,11 +521,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1896441137542441893}
+  m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -177.4202, y: 225.87369}
+  m_AnchoredPosition: {x: -183.19, y: 338}
   m_SizeDelta: {x: 257.0179, y: 56.6005}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5543201938969055767
@@ -790,9 +769,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1977479323307174205}
-  - {fileID: 5964692562241983256}
-  - {fileID: 2507585154746067127}
   - {fileID: 1617875011636537765}
   - {fileID: 1450357347166671142}
   m_Father: {fileID: 6694772361877173011}
@@ -923,6 +899,9 @@ RectTransform:
   - {fileID: 5473342035507285947}
   - {fileID: 4962336735051820175}
   - {fileID: 1062516556747891371}
+  - {fileID: 1977479323307174205}
+  - {fileID: 5964692562241983256}
+  - {fileID: 2507585154746067127}
   - {fileID: 1219834969852229682}
   - {fileID: 753562404598425228}
   - {fileID: 1896441137542441893}
@@ -1151,6 +1130,7 @@ GameObject:
   - component: {fileID: 1028954343504435061}
   - component: {fileID: 5014666907463259958}
   - component: {fileID: 8363264617899274196}
+  - component: {fileID: 8328474867077985396}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Level1
@@ -1166,18 +1146,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3256041832133504665}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 6754618905932910559}
+  m_Father: {fileID: 5142448662693722814}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 315, y: -35.1352}
+  m_SizeDelta: {x: 100, y: 82.181}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5014666907463259958
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1199,7 +1179,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.3647059, g: 0.35686275, b: 0.24705884, a: 1}
+  m_Color: {r: 0.9607844, g: 0.9333334, b: 0.8313726, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1207,19 +1187,33 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 26
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 50
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 4
+    m_MaxSize: 50
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: LV18
+--- !u!114 &8328474867077985396
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256041832133504665}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &3978450814364350242
 GameObject:
   m_ObjectHideFlags: 0
@@ -1336,19 +1330,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4731082921620160257}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 868834413672771607}
-  m_Father: {fileID: 1062516556747891371}
+  m_Children: []
+  m_Father: {fileID: 5142448662693722814}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 10.920685, y: -23.199997}
-  m_SizeDelta: {x: 0, y: 82.1818}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 140, y: -35.1352}
+  m_SizeDelta: {x: 150, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4678360464258838821
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1443,7 +1436,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -2.4597, y: 1.2}
+  m_AnchoredPosition: {x: -2.4597, y: -371}
   m_SizeDelta: {x: 655.84, y: 542}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8956727549716453988
@@ -2412,6 +2405,96 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u8FD0\u4F5C\u5468\u671F\uFF1A1\u8F6C"
+--- !u!1 &6293138216003236845
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5142448662693722814}
+  - component: {fileID: 7897920450247940872}
+  - component: {fileID: 3100931331409758646}
+  - component: {fileID: 7950843913956157427}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5142448662693722814
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6293138216003236845}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 868834413672771607}
+  - {fileID: 8468219431132250151}
+  - {fileID: 1028954343504435061}
+  m_Father: {fileID: 1062516556747891371}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -38.1}
+  m_SizeDelta: {x: 0, y: 70.2704}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &7897920450247940872
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6293138216003236845}
+  m_CullTransparentMesh: 1
+--- !u!114 &3100931331409758646
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6293138216003236845}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &7950843913956157427
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6293138216003236845}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &6394406755354776696
 GameObject:
   m_ObjectHideFlags: 0
@@ -2430,7 +2513,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6754618905932910559
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2442,8 +2525,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1028954343504435061}
+  m_Children: []
   m_Father: {fileID: 7374263567999719867}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -2610,7 +2692,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5964692562241983256
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2624,11 +2706,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5154046706560764311}
-  m_Father: {fileID: 1896441137542441893}
+  m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -34.330193, y: 467.52502}
+  m_AnchoredPosition: {x: -40.099968, y: 1131.4963}
   m_SizeDelta: {x: 117, y: 37}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2416628555568723737
@@ -2805,7 +2887,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8468219431132250151}
+  - {fileID: 5142448662693722814}
   - {fileID: 7374263567999719867}
   - {fileID: 7957023652684022640}
   m_Father: {fileID: 6694772361877173011}
@@ -2898,11 +2980,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3289851963449376272}
-  m_Father: {fileID: 1896441137542441893}
+  m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 3.3101058, y: 41.57431}
+  m_AnchoredPosition: {x: -2.4597, y: 153.70065}
   m_SizeDelta: {x: 655.8428, y: 284.9714}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4415456503076877641

Assets/Scenes/testCombat.scene

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

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

@@ -10,6 +10,15 @@ namespace GameLogic.Combat.Buff
 {
     public class BuffBasic : CObject
     {
+        public CombatHeroEntity Source
+        {
+            get { return source; }
+        }
+
+        public CombatHeroEntity CombatHeroEntity
+        {
+            get { return combatHeroEntity; }
+        }
         protected CombatHeroEntity combatHeroEntity;
         public BuffInfo buffInf;
         protected CombatHeroEntity source;

Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillSlots.cs

@@ -234,11 +234,7 @@ namespace GameLogic.Combat.Hero.Turntable
                 }
 
                 
-                TriggerSkillSlotsEventData triggerSkillSlotsEventData = TriggerSkillSlotsEventData.Create();
-                triggerSkillSlotsEventData.SkillBasic = SkillBasic;
-                triggerSkillSlotsEventData.SkillSlots = this;
-                triggerSkillSlotsEventData.triggerType = triggerType;
-                CombatEventManager.Instance.Dispatch(CombatEventType.TriggerSkillSlots, triggerSkillSlotsEventData);
+             
                 switch (SkillBasic.wuXingType)
                 {
                     case WuXingType.Gold:
@@ -285,6 +281,11 @@ namespace GameLogic.Combat.Hero.Turntable
                 }
 
                 triggerCount = 0;
+                TriggerSkillSlotsEventData triggerSkillSlotsEventData = TriggerSkillSlotsEventData.Create();
+                triggerSkillSlotsEventData.SkillBasic = SkillBasic;
+                triggerSkillSlotsEventData.SkillSlots = this;
+                triggerSkillSlotsEventData.triggerType = triggerType;
+                CombatEventManager.Instance.Dispatch(CombatEventType.TriggerSkillSlots, triggerSkillSlotsEventData);
             }
 
             useTriggerType = triggerType;

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

@@ -0,0 +1,50 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 血祭神通
+    /// 所有流血状态照成的伤害会转换成充能值，2圈后对全体敌人造成{0}%充能值的伤害
+    /// </summary>
+    public class S2011 : SkillBasic
+    {
+        private long addHarm;
+        protected override void ProUseSkill()
+        {
+        }
+
+        protected override void ProActiveSkill()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
+        }
+
+        protected override void ProDispose()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroInjured, HeroInjured);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
+        }
+
+        private void TriggerSkillSlots(IEventData ieventData)
+        {
+            
+        }
+
+        private void HeroInjured(IEventData ieventData)
+        {
+            HeroInjuredEventData heroInjuredEventData = ieventData as HeroInjuredEventData;
+            b_1011 b1011=  heroInjuredEventData.HarmReturnInfo.triggerData.Source as b_1011;
+            if (b1011 == null||b1011.Source!=CombatHeroEntity)
+            {
+                return;
+            }
+
+            long harm = heroInjuredEventData.HarmReturnInfo.att;
+            addHarm+=harm;
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1bd19bd16b7647b58baf873d23cf11cc
+timeCreated: 1752825279

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

@@ -15,6 +15,7 @@ namespace GameLogic.Combat.Skill
         protected override void ProUseSkill()
         {
             ballisticsCount = (int)effectValue[0];
+            ActivationTimeLineData("9051");
             for (int i = 0; i < effectValue[0]; i++)
             {
                 CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
@@ -23,8 +24,7 @@ namespace GameLogic.Combat.Skill
                 BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
                 currTarget.Add(combatHeroHitPoint);
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
-                ActivationTimeLineData("1101", currTarget: currTarget,
-                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+                ActivationTimeLineData("9051_fashe", currTarget: currTarget, indexCount: i,startTime:i*-0.2f);
             }
         }
 

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

@@ -15,6 +15,7 @@ namespace GameLogic.Combat.Skill
     {
         protected override void ProUseSkill()
         {
+            ActivationTimeLineData("9052");
             ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
@@ -24,7 +25,7 @@ namespace GameLogic.Combat.Skill
                 BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
                 currTarget.Add(combatHeroHitPoint);
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
-                ActivationTimeLineData("1101", currTarget: currTarget,
+                ActivationTimeLineData("9052_fashe", currTarget: currTarget,
                     customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
             }
         }

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -170,7 +170,10 @@ namespace Fort23.Mono
 
 
             Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
-            Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name);
+            Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name) + " ";
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Text_GongFaName.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Level.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Text_GongFaName.transform.parent.GetComponent<RectTransform>());
 
             switch (skillConfig.attribute)
             {