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

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

Assets/Art/ArtHero/Guixiu01.prefab

@@ -443,6 +443,54 @@ Transform:
   - {fileID: 9194957888180987578}
   m_Father: {fileID: 3578999007944717061}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2188454189642440273
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7649121817527702905}
+  - component: {fileID: 4629997502076020925}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos7
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7649121817527702905
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2188454189642440273}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.35, y: 1.5911384, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4629997502076020925
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2188454189642440273}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos7
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &2241405278101951849
 GameObject:
   m_ObjectHideFlags: 0
@@ -1088,6 +1136,54 @@ Transform:
   - {fileID: 590893318597525942}
   m_Father: {fileID: 8026928801919200722}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4589747371710912723
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6918415816277117746}
+  - component: {fileID: 4525768745745096632}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos1 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6918415816277117746
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4589747371710912723}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.22, z: 0.772}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4525768745745096632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4589747371710912723}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos1
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &4858143919617593341
 GameObject:
   m_ObjectHideFlags: 0
@@ -1219,6 +1315,54 @@ Transform:
   - {fileID: 6956876488994635527}
   m_Father: {fileID: 3716420664218977360}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5181656312818326225
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 911167043991522730}
+  - component: {fileID: 6072937630066070546}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &911167043991522730
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5181656312818326225}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.74600005, y: 0.8011384, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6072937630066070546
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5181656312818326225}
+  m_Enabled: 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 &5182632157696764087
 GameObject:
   m_ObjectHideFlags: 0
@@ -1259,6 +1403,15 @@ Transform:
   - {fileID: 535411768846301338}
   - {fileID: 7775990846120498310}
   - {fileID: 7314545036509322813}
+  - {fileID: 6918415816277117746}
+  - {fileID: 1990604743196221156}
+  - {fileID: 911167043991522730}
+  - {fileID: 1937315283244121846}
+  - {fileID: 6566301125029207643}
+  - {fileID: 8569452214799341639}
+  - {fileID: 7649121817527702905}
+  - {fileID: 6502282551303855741}
+  - {fileID: 8496617486720812937}
   - {fileID: 8807355335296103306}
   - {fileID: 7504899610413469283}
   - {fileID: 2918780800185193696}
@@ -1763,6 +1916,102 @@ Transform:
   - {fileID: 3470714753449572358}
   m_Father: {fileID: 1319047019158166992}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6131287128406480321
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8496617486720812937}
+  - component: {fileID: 3459476308114634051}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos9
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8496617486720812937
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6131287128406480321}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.040000044, y: 1.1001387, z: 1.952}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3459476308114634051
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6131287128406480321}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos9
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &6144531394673771379
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6502282551303855741}
+  - component: {fileID: 6342370706628144997}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos8
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6502282551303855741
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6144531394673771379}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.44700006, y: 1.6181383, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6342370706628144997
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6144531394673771379}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos8
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &6385020075804404867
 GameObject:
   m_ObjectHideFlags: 0
@@ -1796,6 +2045,54 @@ Transform:
   - {fileID: 8898299663344668003}
   m_Father: {fileID: 2705862797502191873}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6406441287912571213
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6566301125029207643}
+  - component: {fileID: 5146768303006693769}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos5
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6566301125029207643
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6406441287912571213}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.64500004, y: 1.2491384, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5146768303006693769
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6406441287912571213}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos5
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &6775706043774256139
 GameObject:
   m_ObjectHideFlags: 0
@@ -2212,6 +2509,54 @@ Transform:
   - {fileID: 1995570593602782427}
   m_Father: {fileID: 8198697379558389055}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6952912511514677233
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1990604743196221156}
+  - component: {fileID: 1419712724118572211}
+  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 &1990604743196221156
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6952912511514677233}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.040000044, y: 1.8601384, z: 0.77199996}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1419712724118572211
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6952912511514677233}
+  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 &6999858288545426485
 GameObject:
   m_ObjectHideFlags: 0
@@ -2367,6 +2712,102 @@ Transform:
   - {fileID: 8026928801919200722}
   m_Father: {fileID: 2181063651519465}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7173695698407568342
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8569452214799341639}
+  - component: {fileID: 9070386412261059083}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos6
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8569452214799341639
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7173695698407568342}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.57299995, y: 1.293138, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9070386412261059083
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7173695698407568342}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos6
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &7195978942745805940
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1937315283244121846}
+  - component: {fileID: 5936357530736930340}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos4
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1937315283244121846
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7195978942745805940}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.75699997, y: 0.76913834, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5936357530736930340
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7195978942745805940}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos4
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &7652799225265932595
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/HeroTimeLine/gf_1101_timeline.playable

@@ -347,6 +347,16 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: 
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -382,7 +392,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.9
+    m_Start: 0.3333333333333333
     m_ClipIn: 0
     m_Asset: {fileID: -1891357024015680945}
     m_Duration: 1
@@ -593,6 +603,16 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: 
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -792,7 +812,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.9
+    m_Start: 0.3333333333333333
     m_ClipIn: 0
     m_Asset: {fileID: 3170206750459385421}
     m_Duration: 1

Assets/Art/VFX/FXPrefabs/fx_gf_1101.prefab

@@ -9803,10 +9803,10 @@ GameObject:
   m_Component:
   - component: {fileID: 8611236716987058458}
   - component: {fileID: 20188554618317400}
-  - component: {fileID: 6296073204381576855}
   - component: {fileID: 1636458392407865816}
   - component: {fileID: 518704643645044999}
   - component: {fileID: 3725183313190313579}
+  - component: {fileID: 69591897721369811}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_gf_1101
@@ -9856,42 +9856,6 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.33, y: 0.3, z: 1.7026665}
   m_Center: {x: 0, y: -0.011964202, z: 0.26296198}
---- !u!114 &6296073204381576855
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3092355231103515585}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  moveTarget: {fileID: 0}
-  delayTime: 0.3
-  multipleTargetDelayTime: 0.1
-  hitFxName: fx_gf_1101_hit
-  hitAudioName: 
-  extraMoveSpeed: 0
-  isNotMove: 0
-  isPenetrate: 0
-  isUseCustomTargetEndPos: 0
-  customTargetEndPosIndex: 0
-  size: 1
-  isInit: 0
-  speed: 30
-  roatRoot: {fileID: 0}
-  raotIndex: 0
-  parabolaCurveType: 0
-  isTriggerGroundEnd: 0
-  GroundHitFxName: 
-  isUseX: 1
-  BesselPath:
-    isActive: 0
-    controlPoints: []
-    allDis: 0
-  maxDis: 20
 --- !u!54 &1636458392407865816
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -14719,6 +14683,42 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!114 &69591897721369811
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3092355231103515585}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 480de438e845cac40854ef243b9a8e35, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
+  delayTime: 0.3
+  multipleTargetDelayTime: 0.1
+  hitFxName: fx_gf_1101_hit
+  hitAudioName: 
+  extraMoveSpeed: 0
+  isNotMove: 0
+  isPenetrate: 0
+  isUseCustomTargetEndPos: 0
+  customTargetEndPosIndex: 0
+  size: 1
+  isInit: 0
+  speed: 30
+  roatRoot: {fileID: 0}
+  raotIndex: 0
+  parabolaCurveType: 0
+  isTriggerGroundEnd: 0
+  GroundHitFxName: 
+  isUseX: 1
+  BesselPath:
+    isActive: 0
+    controlPoints: []
+    allDis: 0
+  maxTime: 10
 --- !u!1 &3250564432927346646
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1101_1.prefab

@@ -14853,10 +14853,10 @@ GameObject:
   m_Component:
   - component: {fileID: 3331003496340091113}
   - component: {fileID: 8851455499910683743}
-  - component: {fileID: 3408703915910062878}
   - component: {fileID: 804866501308229775}
   - component: {fileID: 5816346683345018086}
   - component: {fileID: 3429626508995587215}
+  - component: {fileID: 3174578351217099842}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_gf_1101_1
@@ -14907,39 +14907,6 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.33, y: 0.3, z: 1.7026665}
   m_Center: {x: 0, y: -0.011964202, z: 0.26296198}
---- !u!114 &3408703915910062878
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5829723469742105471}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  delayTime: 0
-  multipleTargetDelayTime: 0
-  hitFxName: fx_gf_1101_hit_1
-  hitAudioName: 
-  extraMoveSpeed: 0
-  isNotMove: 0
-  isPenetrate: 0
-  isUseCustomTargetEndPos: 0
-  customTargetEndPosIndex: 0
-  size: 1
-  isInit: 0
-  speed: 30
-  parabolaCurveType: 1
-  isTriggerGroundEnd: 0
-  GroundHitFxName: 
-  isUseX: 0
-  BesselPath:
-    isActive: 0
-    controlPoints: []
-    allDis: 0
-  maxDis: 20
 --- !u!54 &804866501308229775
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -19767,6 +19734,42 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!114 &3174578351217099842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5829723469742105471}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 480de438e845cac40854ef243b9a8e35, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
+  delayTime: 0.3
+  multipleTargetDelayTime: 0.1
+  hitFxName: fx_gf_1101_hit
+  hitAudioName: 
+  extraMoveSpeed: 0
+  isNotMove: 0
+  isPenetrate: 0
+  isUseCustomTargetEndPos: 0
+  customTargetEndPosIndex: 0
+  size: 1
+  isInit: 0
+  speed: 30
+  roatRoot: {fileID: 0}
+  raotIndex: 0
+  parabolaCurveType: 0
+  isTriggerGroundEnd: 0
+  GroundHitFxName: 
+  isUseX: 1
+  BesselPath:
+    isActive: 0
+    controlPoints: []
+    allDis: 0
+  maxTime: 10
 --- !u!1 &8674631516313932850
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/Guixiu01.prefab

@@ -267,6 +267,54 @@ Transform:
   m_Children: []
   m_Father: {fileID: 5253628818678954455}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &999409990876569316
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5023670096009217668}
+  - component: {fileID: 880119585607165125}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos8
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5023670096009217668
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 999409990876569316}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.44700006, y: 1.6181383, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &880119585607165125
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 999409990876569316}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos8
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &1094247144903698927
 GameObject:
   m_ObjectHideFlags: 0
@@ -1001,6 +1049,54 @@ Transform:
   - {fileID: 6515679057492588266}
   m_Father: {fileID: 3945533456387906032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2642483714366766989
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8293556228050543240}
+  - component: {fileID: 4222487700391895928}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos1 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8293556228050543240
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2642483714366766989}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.22, z: 0.772}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4222487700391895928
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2642483714366766989}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos1
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &2786666114794110787
 GameObject:
   m_ObjectHideFlags: 0
@@ -1133,6 +1229,54 @@ Transform:
   - {fileID: 278523522425179870}
   m_Father: {fileID: 5122749198777586761}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3239638929325756229
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7945764169659261882}
+  - component: {fileID: 8176234490239545279}
+  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 &7945764169659261882
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3239638929325756229}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.040000044, y: 1.8601384, z: 0.77199996}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8176234490239545279
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3239638929325756229}
+  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 &3376392059087109684
 GameObject:
   m_ObjectHideFlags: 0
@@ -1555,6 +1699,15 @@ Transform:
   - {fileID: 6962979753961269573}
   - {fileID: 7447676878574061612}
   - {fileID: 4892451167953402893}
+  - {fileID: 8293556228050543240}
+  - {fileID: 7945764169659261882}
+  - {fileID: 8535894236556063859}
+  - {fileID: 4637983285665354372}
+  - {fileID: 5049610456605884150}
+  - {fileID: 4621013781410057884}
+  - {fileID: 332716272135877973}
+  - {fileID: 5023670096009217668}
+  - {fileID: 2476216701449870842}
   - {fileID: 774881355960454443}
   - {fileID: 7508470614555230924}
   - {fileID: 7257332083816463963}
@@ -1644,6 +1797,54 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!1 &4699039435084406807
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8535894236556063859}
+  - component: {fileID: 3550075499636992636}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8535894236556063859
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4699039435084406807}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.74600005, y: 0.8011384, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3550075499636992636
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4699039435084406807}
+  m_Enabled: 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 &4786892911376131759
 GameObject:
   m_ObjectHideFlags: 0
@@ -1710,6 +1911,54 @@ Transform:
   - {fileID: 4337345874822292715}
   m_Father: {fileID: 4827576129712658731}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4879024448826358539
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4637983285665354372}
+  - component: {fileID: 4982973200053673461}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos4
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4637983285665354372
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4879024448826358539}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.75699997, y: 0.76913834, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4982973200053673461
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4879024448826358539}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos4
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &5069292447945338081
 GameObject:
   m_ObjectHideFlags: 0
@@ -1939,6 +2188,54 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3357049737731417567}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5900281924556208108
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5049610456605884150}
+  - component: {fileID: 1237835557377676031}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos5
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5049610456605884150
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5900281924556208108}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.64500004, y: 1.2491384, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1237835557377676031
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5900281924556208108}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos5
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &5998489015489896957
 GameObject:
   m_ObjectHideFlags: 0
@@ -2053,6 +2350,54 @@ MonoBehaviour:
   DotName: zdpos1
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &6313183016492976714
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4621013781410057884}
+  - component: {fileID: 4573828867751299360}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos6
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4621013781410057884
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6313183016492976714}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.57299995, y: 1.293138, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4573828867751299360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6313183016492976714}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos6
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &6335934894826526912
 GameObject:
   m_ObjectHideFlags: 0
@@ -2315,6 +2660,54 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6662418263075644721}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7169532617787827427
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2476216701449870842}
+  - component: {fileID: 8499994226821893911}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos9
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2476216701449870842
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7169532617787827427}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.040000044, y: 1.1001387, z: 1.952}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8499994226821893911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7169532617787827427}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos9
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &7170340862815359021
 GameObject:
   m_ObjectHideFlags: 0
@@ -2674,6 +3067,54 @@ Transform:
   m_Children: []
   m_Father: {fileID: 278523522425179870}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8415600776245415226
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 332716272135877973}
+  - component: {fileID: 7965483182846452214}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos7
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &332716272135877973
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8415600776245415226}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.35, y: 1.5911384, z: 0.75699997}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7965483182846452214
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8415600776245415226}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos7
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &8427465586952487318
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/Nanzhu.prefab

@@ -13410,6 +13410,7 @@ MonoBehaviour:
     m_PostInfinity: 2
     m_RotationOrder: 4
   quanZhong: 5
+  disStrength: 0.5
   rootTran: {fileID: 6780273073672325338}
   count: 10
   maxDis: 2

Assets/Res/CombatHero/fb_3101.prefab

@@ -120,7 +120,7 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &3065594020889862084
+--- !u!1 &3409170944836336198
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -128,31 +128,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7579201356685928228}
+  - component: {fileID: 3342101726137091350}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fb_3101
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7579201356685928228
+--- !u!4 &3342101726137091350
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3065594020889862084}
+  m_GameObject: {fileID: 3409170944836336198}
   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_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: 1419627869443203312}
+  m_Father: {fileID: 2566871063108411739}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3409170944836336198
+--- !u!1 &3625346209016505485
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -160,31 +160,32 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3342101726137091350}
+  - component: {fileID: 327998283763961317}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_3101
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3342101726137091350
+--- !u!4 &327998283763961317
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3409170944836336198}
+  m_GameObject: {fileID: 3625346209016505485}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, 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: 2566871063108411739}
+  m_Children:
+  - {fileID: 1419627869443203312}
+  m_Father: {fileID: 1367215891999932367}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3625346209016505485
+--- !u!1 &4507369768421660872
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -192,7 +193,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 327998283763961317}
+  - component: {fileID: 5939923418149316059}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -201,21 +202,20 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &327998283763961317
+--- !u!4 &5939923418149316059
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3625346209016505485}
+  m_GameObject: {fileID: 4507369768421660872}
   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:
-  - {fileID: 1419627869443203312}
-  m_Father: {fileID: 1367215891999932367}
+  m_Children: []
+  m_Father: {fileID: 1419627869443203312}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5384636722700455879
 GameObject:
@@ -247,7 +247,7 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7579201356685928228}
+  - {fileID: 5939923418149316059}
   m_Father: {fileID: 327998283763961317}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6698746874094658648

Assets/Res/CombatHero/fb_dao1.prefab

@@ -80,7 +80,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3562723674201918496}
-  - {fileID: 8245466948754172835}
+  - {fileID: 2063897703820718646}
   m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &1164658870965195
@@ -104,7 +104,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &3315704827882945007
+--- !u!1 &1867154810938958677
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -112,90 +112,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 341433236240939723}
-  - component: {fileID: 2011055496560028418}
+  - component: {fileID: 2276837259330923319}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbdao1
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &341433236240939723
+--- !u!4 &2276837259330923319
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3315704827882945007}
+  m_GameObject: {fileID: 1867154810938958677}
   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_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!137 &2011055496560028418
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3315704827882945007}
-  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: 4758778187005788812}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4758778187005788812}
-  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 &3368977622504917241
 GameObject:
   m_ObjectHideFlags: 0
@@ -226,8 +166,8 @@ Transform:
   m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4758778187005788812}
-  - {fileID: 341433236240939723}
+  - {fileID: 2276837259330923319}
+  - {fileID: 8245466948754172835}
   m_Father: {fileID: 3562723674201918496}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4841319616322308277
@@ -262,6 +202,98 @@ Transform:
   m_Children: []
   m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5173330652979787894
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2063897703820718646}
+  - component: {fileID: 5569423509354802363}
+  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 &2063897703820718646
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5173330652979787894}
+  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 &5569423509354802363
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5173330652979787894}
+  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 &5502319039898907655
 GameObject:
   m_ObjectHideFlags: 0
@@ -396,38 +428,6 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.79, y: 0.27, z: 1.2742763}
   m_Center: {x: 0, y: 0, z: 0.05511415}
---- !u!1 &6817871901612172328
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4758778187005788812}
-  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 &4758778187005788812
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6817871901612172328}
-  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 &6825548459275086116
 GameObject:
   m_ObjectHideFlags: 0
@@ -492,7 +492,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 &3743049538284202516
 SkinnedMeshRenderer:
@@ -517,7 +517,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
@@ -544,9 +544,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 3562723674201918496}
+  - {fileID: 2276837259330923319}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3562723674201918496}
+  m_RootBone: {fileID: 2276837259330923319}
   m_AABB:
     m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
     m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}

Assets/Res/CombatHero/fb_ding1.prefab

@@ -70,6 +70,38 @@ SphereCollider:
   serializedVersion: 3
   m_Radius: 2.5
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &395001681646028524
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 912197011101760744}
+  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 &912197011101760744
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 395001681646028524}
+  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 &1623525566636903651
 GameObject:
   m_ObjectHideFlags: 0
@@ -180,8 +212,8 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1355158260515852681}
-  - {fileID: 3557722492346635764}
+  - {fileID: 912197011101760744}
+  - {fileID: 7837942025614824758}
   m_Father: {fileID: 8679617179344489080}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4033669629132829777
@@ -263,7 +295,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 &1385621059340038899
 SkinnedMeshRenderer:
@@ -288,7 +320,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
@@ -315,9 +347,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 8679617179344489080}
+  - {fileID: 912197011101760744}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8679617179344489080}
+  m_RootBone: {fileID: 912197011101760744}
   m_AABB:
     m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
     m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
@@ -356,7 +388,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8679617179344489080}
-  - {fileID: 7837942025614824758}
+  - {fileID: 7695816707529571016}
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &748615157677977061
@@ -380,7 +412,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &6495682075451654371
+--- !u!1 &7268656213240154305
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -388,8 +420,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3557722492346635764}
-  - component: {fileID: 2669355923862340939}
+  - component: {fileID: 7695816707529571016}
+  - component: {fileID: 7760403604084960193}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbding1
@@ -398,28 +430,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3557722492346635764
+--- !u!4 &7695816707529571016
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6495682075451654371}
+  m_GameObject: {fileID: 7268656213240154305}
   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 &2669355923862340939
+--- !u!137 &7760403604084960193
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6495682075451654371}
+  m_GameObject: {fileID: 7268656213240154305}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -436,7 +468,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
@@ -463,9 +495,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 1355158260515852681}
+  - {fileID: 8679617179344489080}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 1355158260515852681}
+  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}
@@ -559,38 +591,6 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.51, y: 0.78772473, z: 0.43}
   m_Center: {x: 0, y: 0.34613764, z: 0}
---- !u!1 &8626884845904779551
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1355158260515852681}
-  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 &1355158260515852681
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8626884845904779551}
-  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 &8843384990569662011
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/fb_huohulu.prefab

@@ -70,98 +70,6 @@ MonoBehaviour:
   DotName: lingyu
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &256385291667035159
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2611168779589616515}
-  - component: {fileID: 5842484068623255575}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_hulu
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2611168779589616515
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 256385291667035159}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8763248839805234681}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &5842484068623255575
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 256385291667035159}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 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: 7104250831759176454}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7104250831759176454}
-  m_AABB:
-    m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
-    m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &505536922449034425
 GameObject:
   m_ObjectHideFlags: 0
@@ -227,7 +135,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9160172853801646544}
-  - {fileID: 6064682056294105842}
+  - {fileID: 3487862140898488207}
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4119005012996295677
@@ -283,7 +191,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3081669193032925086
+--- !u!1 &3395690793032451430
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -291,31 +199,125 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7104250831759176454}
+  - component: {fileID: 8763248839805234681}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: hulu1run (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7104250831759176454
+--- !u!4 &8763248839805234681
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3081669193032925086}
+  m_GameObject: {fileID: 3395690793032451430}
   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_LocalRotation: {x: -0.000000054321042, y: 0.000000054323817, z: 0.7071068, w: 0.7071067}
+  m_LocalPosition: {x: 0.108, y: -0.002, z: -0}
+  m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4057443723115838154}
+  - {fileID: 6064682056294105842}
+  m_Father: {fileID: 9160172853801646544}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3522665322850695734
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3487862140898488207}
+  - component: {fileID: 1525020229980960456}
+  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 &3487862140898488207
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3522665322850695734}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8763248839805234681}
+  m_Father: {fileID: 5315834147508480038}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3395690793032451430
+--- !u!137 &1525020229980960456
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3522665322850695734}
+  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 &4794874684598925271
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -323,31 +325,29 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8763248839805234681}
+  - component: {fileID: 4057443723115838154}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: hulu1run (1)
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8763248839805234681
+--- !u!4 &4057443723115838154
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395690793032451430}
+  m_GameObject: {fileID: 4794874684598925271}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000054321042, y: 0.000000054323817, z: 0.7071068, w: 0.7071067}
-  m_LocalPosition: {x: 0.108, y: -0.002, z: -0}
-  m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
+  m_LocalRotation: {x: 0.000000054321042, y: -0.000000054323817, z: -0.7071068, w: 0.7071067}
+  m_LocalPosition: {x: 0.0017814379, y: 0.089754246, z: 0.0000000039232826}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7104250831759176454}
-  - {fileID: 2611168779589616515}
-  m_Father: {fileID: 9160172853801646544}
+  m_Children: []
+  m_Father: {fileID: 8763248839805234681}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4967031559869244623
 GameObject:
@@ -515,7 +515,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 &5277113897766828130
 SkinnedMeshRenderer:
@@ -540,7 +540,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
@@ -567,9 +567,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 9160172853801646544}
+  - {fileID: 4057443723115838154}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9160172853801646544}
+  m_RootBone: {fileID: 4057443723115838154}
   m_AABB:
     m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
     m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}

Assets/Res/CombatHero/fb_jian1.prefab

@@ -78,8 +78,8 @@ Transform:
   m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4583533526043772771}
-  - {fileID: 5831036503196434543}
+  - {fileID: 7197127685276578807}
+  - {fileID: 5547600438982151895}
   m_Father: {fileID: 7466859698293448862}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2778996064610124439
@@ -114,7 +114,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7466859698293448862}
-  - {fileID: 532612341500095367}
+  - {fileID: 1929291499423006907}
   m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5295049769349527351
@@ -138,98 +138,6 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &3591226219490448881
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5831036503196434543}
-  - component: {fileID: 3478538841222396097}
-  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 &5831036503196434543
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3591226219490448881}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1439812933337521677}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3478538841222396097
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3591226219490448881}
-  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: d96695fd0f201484a981206048a40479, 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: 4583533526043772771}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4583533526043772771}
-  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 &3749266543314816333
 GameObject:
   m_ObjectHideFlags: 0
@@ -316,6 +224,38 @@ 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 &4049606435916328950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7197127685276578807}
+  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 &7197127685276578807
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4049606435916328950}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00269293, y: 0.70710176, z: 0.00269293, w: 0.70710164}
+  m_LocalPosition: {x: -1.6448311e-10, y: 0.008153026, z: -0.0037629348}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1439812933337521677}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4062744336325871813
 GameObject:
   m_ObjectHideFlags: 0
@@ -397,7 +337,7 @@ Transform:
   - {fileID: 1439812933337521677}
   m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5525290983850545650
+--- !u!1 &5486912876241156701
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -405,31 +345,91 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4583533526043772771}
+  - component: {fileID: 5547600438982151895}
+  - component: {fileID: 1650193381931398832}
   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 &4583533526043772771
+--- !u!4 &5547600438982151895
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5525290983850545650}
+  m_GameObject: {fileID: 5486912876241156701}
   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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5813916709058577267
+--- !u!137 &1650193381931398832
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5486912876241156701}
+  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: d96695fd0f201484a981206048a40479, 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: 7197127685276578807}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 7197127685276578807}
+  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 &6928968046930442974
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -437,8 +437,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 532612341500095367}
-  - component: {fileID: 7201071171280630150}
+  - component: {fileID: 1929291499423006907}
+  - component: {fileID: 4492997153084804292}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -447,13 +447,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &532612341500095367
+--- !u!4 &1929291499423006907
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5813916709058577267}
+  m_GameObject: {fileID: 6928968046930442974}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
@@ -462,13 +462,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &7201071171280630150
+--- !u!137 &4492997153084804292
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5813916709058577267}
+  m_GameObject: {fileID: 6928968046930442974}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1

Assets/Res/CombatHero/fb_jian2.prefab

@@ -134,7 +134,7 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.34, y: 0.36, z: 1.3845047}
   m_Center: {x: 0, y: 0, z: 0.10598475}
---- !u!1 &4287526477644076915
+--- !u!1 &4459792424349916393
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -142,90 +142,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8952235792856624030}
-  - component: {fileID: 8335130374322843872}
+  - component: {fileID: 5005895393293444297}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbjian2
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8952235792856624030
+--- !u!4 &5005895393293444297
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4287526477644076915}
+  m_GameObject: {fileID: 4459792424349916393}
   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_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!137 &8335130374322843872
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4287526477644076915}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
-  m_Bones:
-  - {fileID: 5942435776367837928}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 5942435776367837928}
-  m_AABB:
-    m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
-    m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &5291855315857285515
 GameObject:
   m_ObjectHideFlags: 0
@@ -256,8 +196,8 @@ Transform:
   m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5942435776367837928}
-  - {fileID: 8952235792856624030}
+  - {fileID: 5005895393293444297}
+  - {fileID: 7171217475581033430}
   m_Father: {fileID: 7074505583183483981}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6360724120513573557
@@ -341,7 +281,7 @@ Transform:
   - {fileID: 6865594351597376310}
   m_Father: {fileID: 3525720028267400576}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6919156967391213043
+--- !u!1 &6968568073675785829
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -349,31 +289,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5942435776367837928}
+  - component: {fileID: 8125037036040820574}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fb_jian2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5942435776367837928
+--- !u!4 &8125037036040820574
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6919156967391213043}
+  m_GameObject: {fileID: 6968568073675785829}
   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_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: 6865594351597376310}
+  m_Father: {fileID: 9057844881385621598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6968568073675785829
+--- !u!1 &6986506569897743733
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -381,31 +321,91 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8125037036040820574}
+  - component: {fileID: 7171217475581033430}
+  - component: {fileID: 6331091477967942164}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_jian2
+  m_Name: fbjian2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8125037036040820574
+--- !u!4 &7171217475581033430
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6968568073675785829}
+  m_GameObject: {fileID: 6986506569897743733}
   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_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: 9057844881385621598}
+  m_Father: {fileID: 6865594351597376310}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6986506569897743733
+--- !u!137 &6331091477967942164
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6986506569897743733}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
+  m_Bones:
+  - {fileID: 5005895393293444297}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 5005895393293444297}
+  m_AABB:
+    m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
+    m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
+--- !u!1 &7175041387728005935
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -413,8 +413,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7171217475581033430}
-  - component: {fileID: 6331091477967942164}
+  - component: {fileID: 946789200019453379}
+  - component: {fileID: 3261542051485961251}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbjian2
@@ -423,13 +423,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7171217475581033430
+--- !u!4 &946789200019453379
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6986506569897743733}
+  m_GameObject: {fileID: 7175041387728005935}
   serializedVersion: 2
   m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.001073494, y: -0.00010567544, z: -0.095695294}
@@ -438,13 +438,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3525720028267400576}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6331091477967942164
+--- !u!137 &3261542051485961251
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6986506569897743733}
+  m_GameObject: {fileID: 7175041387728005935}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -529,7 +529,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7074505583183483981}
-  - {fileID: 7171217475581033430}
+  - {fileID: 946789200019453379}
   m_Father: {fileID: 9057844881385621598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7120436569189825082

Assets/Res/CombatHero/fb_linglongta.prefab

@@ -1,189 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &75439441639021411
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5079019566142244443}
-  - component: {fileID: 6222260892179126651}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_linglongta
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5079019566142244443
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 75439441639021411}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 589998100047264782}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6222260892179126651
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 75439441639021411}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 838f24e6b06702f4e9c1920dbaac2574, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
-  m_Bones:
-  - {fileID: 8538278272939701458}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8538278272939701458}
-  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 &2780694596805329303
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6801670478767003253}
-  - component: {fileID: 6934019173797286554}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_linglongta
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6801670478767003253
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2780694596805329303}
-  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6934019173797286554
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2780694596805329303}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
-  m_Bones:
-  - {fileID: 4887794763406024427}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4887794763406024427}
-  m_AABB:
-    m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
-    m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &2853221564033797514
 GameObject:
   m_ObjectHideFlags: 0
@@ -270,6 +86,38 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.5, y: 0.9786749, z: 0.51}
   m_Center: {x: 0, y: 0.09983301, z: 0}
+--- !u!1 &3309807304859428806
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8908635920728814990}
+  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 &8908635920728814990
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3309807304859428806}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.0000008506696, y: -0.00000077682074, z: -0.7026459, w: 0.7115397}
+  m_LocalPosition: {x: 0.003003329, y: 0.3102259, z: 0.000000013560405}
+  m_LocalScale: {x: 1.0651475, y: 1.0651475, z: 1.0651475}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 589998100047264782}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4020983649939190267
 GameObject:
   m_ObjectHideFlags: 0
@@ -350,38 +198,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5545656068677740320
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8538278272939701458}
-  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 &8538278272939701458
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5545656068677740320}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.0000008506696, y: -0.00000077682074, z: -0.7026459, w: 0.7115397}
-  m_LocalPosition: {x: 0.003003329, y: 0.3102259, z: 0.000000013560405}
-  m_LocalScale: {x: 1.0651475, y: 1.0651475, z: 1.0651475}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 589998100047264782}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6069193922456573349
 GameObject:
   m_ObjectHideFlags: 0
@@ -412,8 +228,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8538278272939701458}
-  - {fileID: 5079019566142244443}
+  - {fileID: 8908635920728814990}
+  - {fileID: 1897009019411201638}
   m_Father: {fileID: 4887794763406024427}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6525093672149038688
@@ -464,6 +280,98 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &6595397228807725044
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1897009019411201638}
+  - component: {fileID: 7395378582701169468}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_linglongta
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1897009019411201638
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6595397228807725044}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 589998100047264782}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &7395378582701169468
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6595397228807725044}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 838f24e6b06702f4e9c1920dbaac2574, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
+  m_Bones:
+  - {fileID: 8908635920728814990}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 8908635920728814990}
+  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 &7493868076058049960
 GameObject:
   m_ObjectHideFlags: 0
@@ -530,7 +438,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4887794763406024427}
-  - {fileID: 6801670478767003253}
+  - {fileID: 3350332243373186340}
   m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8112392103606109572
@@ -569,3 +477,95 @@ MonoBehaviour:
   _Animator: {fileID: 8112392103606109572}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
+--- !u!1 &9189459839539581137
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3350332243373186340}
+  - component: {fileID: 7973528968400814148}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_linglongta
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3350332243373186340
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9189459839539581137}
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &7973528968400814148
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9189459839539581137}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
+  m_Bones:
+  - {fileID: 4887794763406024427}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 4887794763406024427}
+  m_AABB:
+    m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
+    m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1

Assets/Res/CombatHero/fb_wulonglun.prefab

@@ -1,97 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &777165039578857918
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3775030943927964318}
-  - component: {fileID: 4485414344044588124}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: wulonglun2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3775030943927964318
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 777165039578857918}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8019158978286339551}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4485414344044588124
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 777165039578857918}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: fbaa3d8e57dad6d4f92978954632c928, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
-  m_Bones:
-  - {fileID: 6251050109293279852}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6251050109293279852}
-  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
@@ -291,6 +199,130 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &3401887606551807094
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9196028451646578861}
+  - component: {fileID: 8359818982374429008}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: wulonglun2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9196028451646578861
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3401887606551807094}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8019158978286339551}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &8359818982374429008
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3401887606551807094}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: fbaa3d8e57dad6d4f92978954632c928, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
+  m_Bones:
+  - {fileID: 1391557200520203983}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 1391557200520203983}
+  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 &4334651543337606373
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1391557200520203983}
+  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 &1391557200520203983
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4334651543337606373}
+  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
@@ -321,8 +353,8 @@ Transform:
   m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6251050109293279852}
-  - {fileID: 3775030943927964318}
+  - {fileID: 1391557200520203983}
+  - {fileID: 9196028451646578861}
   m_Father: {fileID: 8985698407474411210}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!1 &7179850442623262044
@@ -406,7 +438,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8985698407474411210}
-  - {fileID: 3352787014668516678}
+  - {fileID: 7688698541955319489}
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!95 &852375880241615242
@@ -445,7 +477,7 @@ MonoBehaviour:
   _Animator: {fileID: 852375880241615242}
   _Transitions: {fileID: 11400000, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
   _ActionOnDisable: 0
---- !u!1 &8009151270446804029
+--- !u!1 &8624527749999722200
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -453,8 +485,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3352787014668516678}
-  - component: {fileID: 8531537228704807261}
+  - component: {fileID: 7688698541955319489}
+  - component: {fileID: 1646570208442297180}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: wulonglun
@@ -463,13 +495,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3352787014668516678
+--- !u!4 &7688698541955319489
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8009151270446804029}
+  m_GameObject: {fileID: 8624527749999722200}
   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}
@@ -478,13 +510,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2106735808395853295}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8531537228704807261
+--- !u!137 &1646570208442297180
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8009151270446804029}
+  m_GameObject: {fileID: 8624527749999722200}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -537,35 +569,3 @@ SkinnedMeshRenderer:
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
---- !u!1 &8993827255534157955
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6251050109293279852}
-  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 &6251050109293279852
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8993827255534157955}
-  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}

Assets/Res/CombatHero/fb_yuping.prefab

@@ -80,7 +80,7 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &2497106611140766073
+--- !u!1 &2589342828256907670
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -88,8 +88,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 816317365032727547}
-  - component: {fileID: 1797732577096249031}
+  - component: {fileID: 7295693295501642666}
+  - component: {fileID: 4515682385113539222}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: yuping
@@ -98,30 +98,30 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &816317365032727547
+--- !u!4 &7295693295501642666
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2497106611140766073}
+  m_GameObject: {fileID: 2589342828256907670}
   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: 7806458035559489486}
+  m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1797732577096249031
+--- !u!137 &4515682385113539222
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2497106611140766073}
+  m_GameObject: {fileID: 2589342828256907670}
   m_Enabled: 1
-  m_CastShadows: 1
+  m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -136,7 +136,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
@@ -163,9 +163,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 5475475197219280688}
+  - {fileID: 6598966518811955930}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 5475475197219280688}
+  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}
@@ -291,7 +291,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6598966518811955930}
-  - {fileID: 4060248071983921207}
+  - {fileID: 7295693295501642666}
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8285792300048012968
@@ -361,7 +361,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8974866603299107661}
+  m_Father: {fileID: 1424902656504729842}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &2718235377699317617
 SkinnedMeshRenderer:
@@ -371,7 +371,7 @@ SkinnedMeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4556668383224196772}
   m_Enabled: 1
-  m_CastShadows: 0
+  m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -386,7 +386,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
@@ -413,16 +413,16 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 6598966518811955930}
+  - {fileID: 4103132396443642048}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6598966518811955930}
+  m_RootBone: {fileID: 4103132396443642048}
   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 &5328206932401961649
+--- !u!1 &6642471949105620041
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -430,31 +430,47 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5475475197219280688}
+  - component: {fileID: 6761480731968705934}
+  - component: {fileID: 5388655931286758072}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: pengpos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5475475197219280688
+--- !u!4 &6761480731968705934
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5328206932401961649}
+  m_GameObject: {fileID: 6642471949105620041}
   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, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.015, z: 0.277}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7806458035559489486}
+  m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5585296564577881322
+--- !u!114 &5388655931286758072
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6642471949105620041}
+  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 &7022281575068823587
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -462,7 +478,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7806458035559489486}
+  - component: {fileID: 1424902656504729842}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_yuping_show
@@ -471,24 +487,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7806458035559489486
+--- !u!4 &1424902656504729842
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5585296564577881322}
+  m_GameObject: {fileID: 7022281575068823587}
   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: 5475475197219280688}
-  - {fileID: 816317365032727547}
+  - {fileID: 4103132396443642048}
+  - {fileID: 4060248071983921207}
   m_Father: {fileID: 6598966518811955930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6642471949105620041
+--- !u!1 &7562371850915654260
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -496,46 +512,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6761480731968705934}
-  - component: {fileID: 5388655931286758072}
+  - component: {fileID: 4103132396443642048}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: pengpos
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6761480731968705934
+--- !u!4 &4103132396443642048
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6642471949105620041}
+  m_GameObject: {fileID: 7562371850915654260}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.015, z: 0.277}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  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: 2307709339058834475}
+  m_Father: {fileID: 1424902656504729842}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5388655931286758072
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6642471949105620041}
-  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 &8219916005125797274
 GameObject:
   m_ObjectHideFlags: 0
@@ -566,6 +566,6 @@ Transform:
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7806458035559489486}
+  - {fileID: 1424902656504729842}
   m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/UI/SentimentPanel/SentimentEffectWidget.prefab

@@ -147,8 +147,98 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  data: []
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 1883704870943151130}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Level
+    gameObject: {fileID: 1883704870943151130}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &5573784481617384691
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 128510273463478622}
+  - component: {fileID: 3673796543482309853}
+  - component: {fileID: 1883704870943151130}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Level
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &128510273463478622
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5573784481617384691}
+  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: 3401713860920412346}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 44.1057}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &3673796543482309853
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5573784481617384691}
+  m_CullTransparentMesh: 1
+--- !u!114 &1883704870943151130
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5573784481617384691}
+  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: 1, g: 0.6362447, b: 0, 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: 20
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: lv.1
 --- !u!1 &6543777495714282891
 GameObject:
   m_ObjectHideFlags: 0
@@ -180,6 +270,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3793508176197929554}
+  - {fileID: 3963609122977541254}
+  - {fileID: 128510273463478622}
   m_Father: {fileID: 7864742459384017618}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -195,3 +287,83 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6543777495714282891}
   m_CullTransparentMesh: 1
+--- !u!1 &7486418551499705029
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3963609122977541254}
+  - component: {fileID: 317744552824960598}
+  - component: {fileID: 8918127053940308076}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3963609122977541254
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7486418551499705029}
+  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: 3401713860920412346}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 46.5238}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &317744552824960598
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7486418551499705029}
+  m_CullTransparentMesh: 1
+--- !u!114 &8918127053940308076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7486418551499705029}
+  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: 1, g: 1, b: 1, 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: 20
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 1111

Assets/Scenes/testCombat.scene

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

Assets/Scripts/Core/Utility/TailingLine.cs

@@ -17,7 +17,7 @@ public class TailingLine : MonoBehaviour
     public AnimationCurve offQuanZhong;
 
     public float quanZhong=5;
-
+    public float disStrength=0.5f;
     // public float addTime;
     public Transform rootTran;
     public int count;
@@ -31,6 +31,7 @@ public class TailingLine : MonoBehaviour
 
     private void Awake()
     {
+        _linePointInfo.Clear();
         _lineRenderer = GetComponent<LineRenderer>();
         Init();
     }
@@ -68,7 +69,7 @@ public class TailingLine : MonoBehaviour
         _lineRenderer.SetPosition(0, linePointInfo.pos);
         // float at = (1 - addTime) / _linePointInfo.Count;
 
-        int m = _linePointInfo.Count / 2;
+        int m = 2;
         int c = _linePointInfo.Count - m;
         float quanZhongWidget = 1.0f / c;
         for (int i = 1; i < _linePointInfo.Count; i++)
@@ -90,7 +91,7 @@ public class TailingLine : MonoBehaviour
             }
             else
             {
-                md = Mathf.Lerp(md, minDis, at);
+                md = Mathf.Lerp(md, minDis, at*disStrength);
             }
 
             if (m == i)

Assets/Scripts/GameData/ExcelConfig/XianTuLogConfig.cs

@@ -38,12 +38,6 @@ public int Title;
 public int Desc;
 
 
-		/// <summary>
-		///属于哪个章节
-		/// </summary>
-public int BigMapID;
-
-
 	}
 
 }

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

@@ -22,7 +22,8 @@ namespace GameLogic.Combat.Skill
                     .GetMainHotPoin<CombatHeroHitPoint>();
                 BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
                 currTarget.Add(combatHeroHitPoint);
-                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+                string dotName="zdpos" + (i%7 + 1);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo(dotName);
                 ActivationTimeLineData("1101", currTarget: currTarget,
                     customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
             }

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

@@ -215,7 +215,7 @@ namespace Common.Combat.FxAILogic
                 });
         }
 
-        public void CombatUpdate(float time)
+        public virtual void CombatUpdate(float time)
         {
             if (!_isUpdateBasic)
             {

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

@@ -0,0 +1,45 @@
+using System.Collections;
+using System.Collections.Generic;
+using Common.Combat.FxAILogic;
+using UnityEngine;
+
+public class S1101_FxLogic : FxParabolaBulletLogic
+{
+    // public float move101Speed=
+    private int moveState = 0;
+    private Vector3 moveStateOneStartPos;
+    protected float moveStateTime;
+
+
+    protected override void ProInit()
+    {
+        moveState = 0;
+        moveStateTime = 0;
+        base.ProInit();
+        CombatHeroEntity combatHeroEntity = TimeLineEventParticleLogicBasic.castEntity as CombatHeroEntity;
+        moveStateOneStartPos = combatHeroEntity.dotPos;
+    }
+
+    public override void CombatUpdate(float time)
+    {
+        if (!_isUpdateBasic)
+        {
+            return;
+        }
+
+        if (moveState == 0)
+        {
+            moveStateTime += time * 4;
+            Vector3 newPos = Vector3.Lerp(moveStateOneStartPos, startPos, moveStateTime);
+            moveTarget.transform.position = newPos;
+            if (moveStateTime >= 1)
+            {
+                moveState = 1;
+            }
+        }
+        else
+        {
+            base.CombatUpdate(time);
+        }
+    }
+}

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/S1101_FxLogic.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: C3If4X+pUHNDWddUXPuIyQPYYBGnerMKfTzZohy6hY3evySbZO2sZcg563in
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/EventManager/EventHelper.cs

@@ -31,6 +31,12 @@ public static class EventHelper
                 return "通用";
             case 4:
                 return "地图通用";
+            case 5:
+                return "道友";
+            case 6:
+                return "任务";
+            case 7:
+                return "资源";
             default:
                 return "没有";
         }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -329,8 +329,17 @@ public class EventSystemManager : Singleton<EventSystemManager>
                         int randomValue4 = Random.Range(0, 101);
                         if (randomValue4 <= eventConfig1.RefreshProbability)
                         {
-                            eventLists.Add(AddEvent(eventConfig1.ID));
-                            isRefence = true;
+                            var eventList1 = AddEvent(eventConfig1.ID);
+                            if (eventList1 != null)
+                            {
+                                eventLists.Add(AddEvent(eventConfig1.ID));
+                                isRefence = true;
+                            }
+                            else
+                            {
+                                LogTool.Error("管理事件没有刷新出来 id:" + eventConfig1.ID);
+                            }
+
                             break;
                         }
                     }
@@ -372,12 +381,29 @@ public class EventSystemManager : Singleton<EventSystemManager>
             {
                 int randomValue2 = Random.Range(0, candidateEvents.Count);
 
-                eventLists.Add(AddEvent(candidateEvents[randomValue2].ID));
+                var eventList = AddEvent(candidateEvents[randomValue2].ID);
+                if (eventList != null)
+                {
+                    eventLists.Add(eventList);
+                }
+                else
+                {
+                    LogTool.Error("场景没有刷新出来 id:" + candidateEvents[randomValue2].ID);
+                }
             }
             else if (globalEvents.Count > 0)
             {
                 int randomValue2 = Random.Range(0, globalEvents.Count);
-                eventLists.Add(AddEvent(globalEvents[randomValue2].ID));
+                var eventList = AddEvent(globalEvents[randomValue2].ID);
+
+                if (eventList != null)
+                {
+                    eventLists.Add(eventList);
+                }
+                else
+                {
+                    LogTool.Error("通用事件没有刷新出来 id:" + globalEvents[randomValue2].ID);
+                }
             }
         }
 
@@ -396,11 +422,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventID);
         AccountFileInfo.EventList eventList = null;
-        AccountFileInfo.EventList e = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e => e.eventID == eventID);
-        if (e == null)
+
+
+        //主线任务只能刷一次
+        if (eventConfig.EventTriggerType == 4 || eventConfig.EventTriggerType == 6)
         {
-            //主线任务只能刷一次
-            if (eventConfig.EventTriggerType == 4)
+            AccountFileInfo.EventList e = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e => e.eventID == eventID);
+            if (e == null)
             {
                 e = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(e => e.eventID == eventID);
                 if (e == null)
@@ -412,18 +440,23 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 {
                     return null;
                 }
+
+                eventList.guid = IdGenerater.GenerateIdInt();
+                eventList.curStep = eventConfig.EventLinksId[0];
+                eventList.selectEventLinkIds.Add(eventConfig.EventLinksId[0]);
             }
-            else
-            {
-                eventList = new AccountFileInfo.EventList();
-                eventList.eventID = eventID;
-            }
+        }
+        else
+        {
+            eventList = new AccountFileInfo.EventList();
+            eventList.eventID = eventID;
 
             eventList.guid = IdGenerater.GenerateIdInt();
             eventList.curStep = eventConfig.EventLinksId[0];
             eventList.selectEventLinkIds.Add(eventConfig.EventLinksId[0]);
         }
 
+
         //初始化神识链条，用于监听条件是否完成
         if (eventList != null && eventConfig.EventType != 2)
         {

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

@@ -30,6 +30,7 @@ namespace Fort23.Mono
 
         private void Button_onClick()
         {
+            EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
             // UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -16,6 +16,8 @@ namespace Fort23.Mono
         private ShengShiEventWidgetType2 mainShengShiEventWidgetType2;
 
         private int saixuanType = 1;
+        
+        bool isTriggerEvent = false;
 
 
         private void Init()
@@ -33,9 +35,16 @@ namespace Fort23.Mono
 
         public override CTask GetFocus()
         {
+            if (isTriggerEvent)
+                GObjectPoolInterface.SetActive(false);
             return base.GetFocus();
         }
 
+        public override CTask Show()
+        {
+            return base.Show();
+        }
+
         protected override void DelEvent()
         {
             EventManager.Instance.RemoveEventListener(CustomEventType.RemoveEvent, RemoveEvent);
@@ -150,12 +159,15 @@ namespace Fort23.Mono
             EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
+
+            isTriggerEvent = true;
             this.GObjectPoolInterface.SetActive(false);
-            EventSystemManager.Instance.isOpenUi = false;
+            // EventSystemManager.Instance.isOpenUi = false;
 
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
             {
                 this.GObjectPoolInterface.SetActive(true);
+                isTriggerEvent = false;
                 UpdateContent();
             });
         }
@@ -186,6 +198,7 @@ namespace Fort23.Mono
             EventSystemManager.Instance.isOpenUi = false;
             saixuanType = 1;
             mainShengShiEventWidgetType2 = null;
+            isTriggerEvent = false;
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs

@@ -1,9 +1,16 @@
+using Core.Language;
+using Excel2Json;
+using Fort23.UTool;
+
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "SentimentEffectWidget")]
     public partial class SentimentEffectWidget : ItemWidgetBasic
     {
         public AccountFileInfo.SentimentProperty sentimentProperty;
+
+        SentimentEffectConfig sentimentEffectConfig;
+
         private void Init()
         {
         }
@@ -24,6 +31,18 @@ namespace Fort23.Mono
         public void CustomInit(AccountFileInfo.SentimentProperty sentimentProperty)
         {
             this.sentimentProperty = sentimentProperty;
+            int level = sentimentProperty.level <= 0 ? 1 : sentimentProperty.level;
+            int conFigId = sentimentProperty.groupId * 100 + level;
+            sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
+            Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);
+            if (sentimentProperty.level == 0)
+            {
+                Text_Level.text = "未激活";
+            }
+            else
+            {
+                Text_Level.text = "lv." + level;
+            }
         }
     }
 }

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidgetData.cs

@@ -0,0 +1,40 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class SentimentEffectWidget 
+	{
+	  #region 自定义数据 
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private Text _Text_Level;
+	  public Text Text_Level
+	   {
+	   get{
+	      if (_Text_Level == null)
+	       {
+	         _Text_Level  = GetUIUnit<Text>("Text_Level"); 
+	       }
+	      return _Text_Level;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: BnMcsHz4Bnm3wB+NwzpZlxUUHZoF5xCbSjG8QdVrTtbbu4J5N8IyBUPfgjtz
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -20,6 +20,8 @@ namespace Fort23.Mono
 
         private List<SentimentEffectConfig> currentGroupSentimentEffectConfigs;
 
+        private SentimentEffectWidget currentSentimentEffectWidget;
+
         private void Init()
         {
             isAddStack = false;
@@ -50,6 +52,7 @@ namespace Fort23.Mono
                     TipMessagePanel.OpenTipMessagePanel("已经达到最大等级");
                     return;
                 }
+
                 int level = curretnSentimentProperty.level <= 0 ? 1 : curretnSentimentProperty.level;
                 int conFigId = curretnSentimentProperty.groupId * 100 + level;
                 SentimentEffectConfig sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
@@ -62,6 +65,7 @@ namespace Fort23.Mono
 
                 AccountFileInfo.Instance.SavePlayerData();
                 UpdateUi();
+                currentSentimentEffectWidget.CustomInit(curretnSentimentProperty);
             });
         }
 
@@ -78,6 +82,10 @@ namespace Fort23.Mono
                 sentimentEffectWidget1.CustomInit(sentimentDataSentimentProperty);
                 sentimentEffectWidget1.OnClick = OnClick;
                 sentimentEffectWidgets.Add(sentimentEffectWidget1);
+                if (currentSentimentEffectWidget == null)
+                {
+                    sentimentEffectWidget1.OnPointerClick();
+                }
             }
 
             return await base.AsyncInit(uiData);
@@ -97,8 +105,10 @@ namespace Fort23.Mono
         private void OnClick(ItemWidgetBasic obj)
         {
             SentimentEffectWidget sentimentEffectWidget = obj as SentimentEffectWidget;
+            currentSentimentEffectWidget = sentimentEffectWidget;
             curretnSentimentProperty = sentimentEffectWidget.sentimentProperty;
 
+
             UpdateUi();
         }
 
@@ -116,6 +126,9 @@ namespace Fort23.Mono
 
             sentimentEffectWidgets.Clear();
 
+            currentSentimentEffectWidget = null;
+            curretnSentimentProperty = null;
+
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -33,6 +33,8 @@ namespace Fort23.Mono
 
         List<UIComponent> components = new List<UIComponent>();
 
+     
+
         // List<EventLogTitleWidget> titleWidgets = new List<EventLogTitleWidget>();
 
         private int type;
@@ -62,6 +64,8 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
+           
+
             CustomInit((int)uiData[0], (int)uiData[1]);
             return await base.AsyncInit(uiData);
         }
@@ -155,12 +159,12 @@ namespace Fort23.Mono
                             }
 
                             //选项文本
-                            if (eventLinkConfig.optionType == 1 && eventList.selectEventLinkIds.Count > i+1)
+                            if (eventLinkConfig.optionType == 1 && eventList.selectEventLinkIds.Count > i + 1)
                             {
                                 XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
                                 xianTuLogInfoData1.type = 3;
                                 xianTuLogInfoData1.id = eventConfig.ID;
-                                int index = eventLinkConfig.optionPara1.ToList().IndexOf(eventList.selectEventLinkIds[i+1]);
+                                int index = eventLinkConfig.optionPara1.ToList().IndexOf(eventList.selectEventLinkIds[i + 1]);
                                 if (eventLinkConfig.NPCID != 0)
                                 {
                                     xianTuLogInfoData1.message = $"<color=#A6A6A6>选项：{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
@@ -169,11 +173,9 @@ namespace Fort23.Mono
                                 {
                                     xianTuLogInfoData1.message = $"<color=#867169>选项：{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
                                 }
-                                
+
                                 showXianTuLogInfoData.Add(xianTuLogInfoData1);
                             }
-                            
-                         
                         }
                     }
                 }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -39,6 +39,8 @@ namespace Fort23.Mono
 
         private EventLogTitleWidget eventLogTitleWidget;
 
+        Map<int, List<int>> xianTuMapConfigd = new Map<int, List<int>>();
+
         private void Init()
         {
             isAddStack = true;
@@ -143,12 +145,18 @@ namespace Fort23.Mono
                 {
                     foreach (var xianTuLogConfig in configs)
                     {
-                        if (!xiantuMap.ContainsKey(xianTuLogConfig.BigMapID))
+                        if (xianTuMapConfigd.ContainsKey(xianTuLogConfig.ID))
                         {
-                            xiantuMap.Add(xianTuLogConfig.BigMapID, new List<XianTuLogConfig>());
-                        }
+                            foreach (var i in xianTuMapConfigd[xianTuLogConfig.ID])
+                            {
+                                if (!xiantuMap.ContainsKey(i))
+                                {
+                                    xiantuMap.Add(i, new List<XianTuLogConfig>());
+                                }
 
-                        xiantuMap[xianTuLogConfig.BigMapID].Add(xianTuLogConfig);
+                                xiantuMap[i].Add(xianTuLogConfig);
+                            }
+                        }
                     }
                 }
             }
@@ -223,6 +231,27 @@ namespace Fort23.Mono
         {
             xianTuLogConfigs = ConfigComponent.Instance.GetAll<XianTuLogConfig>().ToList();
 
+
+            List<EventConfig> eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
+            foreach (var xianTuLogConfig in xianTuLogConfigs)
+            {
+                List<EventConfig> configs = eventConfigs.Where(ec => ec.XiantuID == xianTuLogConfig.ID).ToList();
+                foreach (var eventConfig in configs)
+                {
+                    PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
+                    if (!xianTuMapConfigd.ContainsKey(xianTuLogConfig.ID))
+                    {
+                        xianTuMapConfigd.Add(xianTuLogConfig.ID, new List<int>());
+                    }
+
+                    if (!xianTuMapConfigd[xianTuLogConfig.ID].Contains(placesConfig.bigMapID))
+                    {
+                        xianTuMapConfigd[xianTuLogConfig.ID].Add(placesConfig.bigMapID);
+                    }
+                }
+            }
+
+
             XianTuSaiXuanWidget xianTuSaiXuanWidget1 = await UIManager.Instance.CreateGComponentForObject<XianTuSaiXuanWidget>(XianTuSaiXuanWidget1, null);
             xianTuSaiXuanWidget1.CustomInit(1, 0);
             xianTuSaiXuanWidget1.OnClick = OnClick;

UserSettings/EditorUserSettings.asset

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