Merge branch 'master' of http://fort23.cn:3000/fort23/XY001

Assets/Art/ArtHero/GuaiwuBoss01.prefab

@@ -253,13 +253,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 945525911293424600}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.11482758, y: 0.025517581, z: -0.2154281, w: 0.9694092}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.73383313, y: 0.05537966, z: -0.6751489, w: -0.05095097}
+  m_LocalPosition: {x: 0.43, y: 1.78, z: 2.4}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 167030371512012641}
-  m_LocalEulerAnglesHint: {x: -12.218, y: 5.811, z: -25.68}
+  m_Father: {fileID: 2297707870892051097}
+  m_LocalEulerAnglesHint: {x: 180, y: 85.23, z: -8.630981}
 --- !u!65 &8595053930493011329
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -4479,8 +4479,7 @@ Transform:
   m_LocalPosition: {x: 0.052484885, y: 2.6296146, z: 0.38676363}
   m_LocalScale: {x: 1.0000006, y: 1.0000005, z: 0.9999989}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 937860326657549305}
+  m_Children: []
   m_Father: {fileID: 8927068557723739583}
   m_LocalEulerAnglesHint: {x: -6.482905, y: -94.91219, z: -177.50635}
 --- !u!1 &8183604212701967555
@@ -4715,6 +4714,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 937860326657549305}
   - {fileID: 8927068557723739583}
   - {fileID: 1766829178706411920}
   - {fileID: 7729981996650213010}

Assets/Art/ArtHero/GuaiwuBoss01_gpu.prefab

@@ -66,6 +66,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7212871048763467036}
   - {fileID: 6549130336701751161}
   - {fileID: 4821257167826258366}
   - {fileID: 6654386184663369782}
@@ -177,6 +178,77 @@ MonoBehaviour:
       y: 0
       z: 0
       w: 1
+  edgecolor: {r: 0, g: 0, b: 0, a: 0}
+  edgeStength: 0
+  injuriedStrength: 0
+--- !u!1 &3003038099736792099
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7212871048763467036}
+  - component: {fileID: 3361140118568766786}
+  - component: {fileID: 1804948347691038413}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7212871048763467036
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3003038099736792099}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.73383313, y: 0.05537966, z: -0.6751489, w: -0.05095097}
+  m_LocalPosition: {x: 0.43, y: 1.78, z: 2.4}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9029222622846882223}
+  m_LocalEulerAnglesHint: {x: 180, y: 85.23, z: -8.630981}
+--- !u!65 &3361140118568766786
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3003038099736792099}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 3.5966616, y: 2.44, z: 2.45}
+  m_Center: {x: -0.9683313, y: 0.00000003227703, z: -0.0000010776441}
+--- !u!114 &1804948347691038413
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3003038099736792099}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: sk2_trigger
 --- !u!1 &3190259573209026093
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/ArtHero/GuaiwuBoss02.prefab

@@ -1970,7 +1970,7 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 6, y: 1, z: 6}
+  m_Size: {x: 4, y: 1, z: 4}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &2414340729974440704
 MonoBehaviour:

Assets/Art/ArtHero/GuaiwuBoss02_anim.controller

@@ -26,10 +26,10 @@ AnimatorStateMachine:
     m_Position: {x: 460.9976, y: -214.70557, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -5462916905210494991}
-    m_Position: {x: 392.99704, y: -321.06543, z: 0}
+    m_Position: {x: 390, y: -320, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 3030034543484992197}
-    m_Position: {x: 375.56094, y: -436.1433, z: 0}
+    m_Position: {x: 380, y: -440, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Art/ArtHero/GuaiwuBoss02_gpu.prefab

@@ -208,7 +208,7 @@ Transform:
   m_GameObject: {fileID: 8299704600872603851}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 4}
+  m_LocalPosition: {x: 0, y: 0, z: 5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -233,7 +233,7 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 6, y: 1, z: 6}
+  m_Size: {x: 4, y: 1, z: 4}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7708574291932608004
 MonoBehaviour:

Assets/Art/Chapter/Chapter01.prefab

@@ -301,7 +301,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &5005442037198374209
 Transform:
   m_ObjectHideFlags: 0

Assets/Art/GuaiWuTimeline/GuaiwuBoss02.playable

@@ -392,7 +392,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 3833359314423472300}
-    m_Duration: 1.3333333333333333
+    m_Duration: 1.1666666666666667
     m_TimeScale: 1
     m_ParentTrack: {fileID: -6451078940464984751}
     m_EaseInDuration: 0
@@ -570,6 +570,100 @@ MonoBehaviour:
   isFindMyHero: 0
   angle: 0
   manualClose: 0
+  isNew: 1
+--- !u!114 &-5339079821170801131
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 7714894456577681812}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -4129685885304883801}
+    m_Duration: 0.8333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -5339079821170801131}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &-4381110610845372254
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -680,6 +774,18 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
+--- !u!114 &-4129685885304883801
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
 --- !u!114 &-3925239160933940660
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -830,7 +936,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -5803858015212097894}
-    m_Duration: 1.1333333333333333
+    m_Duration: 0.5666666666666667
     m_TimeScale: 1
     m_ParentTrack: {fileID: -2565394967089053431}
     m_EaseInDuration: 0
@@ -922,7 +1028,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -1395693688052696481}
-    m_Duration: 1.4
+    m_Duration: 0.8
     m_TimeScale: 1
     m_ParentTrack: {fileID: -2318835670921494728}
     m_EaseInDuration: 0
@@ -2365,6 +2471,7 @@ MonoBehaviour:
   - {fileID: -2699148646001001778}
   - {fileID: -7318956865521741931}
   - {fileID: -6651696207990093718}
+  - {fileID: -5339079821170801131}
   m_Clips: []
   m_Markers:
     m_Objects: []

Assets/Art/HeroTimeLine/Hero01.playable

@@ -2314,7 +2314,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -2595,7 +2595,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 4814330423193830107}
-    m_Duration: 0.8333333333333334
+    m_Duration: 0.8333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 1763569083830606840}
     m_EaseInDuration: 0
@@ -3211,6 +3211,7 @@ MonoBehaviour:
   isFindMyHero: 0
   angle: 0
   manualClose: 0
+  isNew: 0
 --- !u!114 &4548350470393579723
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3424,15 +3425,6 @@ MonoBehaviour:
       weightedMode: 0
       inWeight: 0
       outWeight: 0
-    - serializedVersion: 3
-      time: 0.8141565
-      value: 0.15265764
-      inSlope: 0.52793455
-      outSlope: 0.52793455
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.22059505
-      outWeight: 0.77579695
     - serializedVersion: 3
       time: 1
       value: 1

Assets/Art/HeroTimeLine/Hero03.playable

@@ -812,6 +812,7 @@ MonoBehaviour:
   isFindMyHero: 0
   angle: 0
   manualClose: 1
+  isNew: 0
 --- !u!114 &-4816001755073941460
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Res/CombatHero/Guaiwu02.prefab

@@ -131,6 +131,123 @@ Transform:
   - {fileID: 3027752528634627746}
   m_Father: {fileID: 612784583815757026}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &824016144726540097
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5244402482557082610}
+  - component: {fileID: 7426614638068395966}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Wolf Pup
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5244402482557082610
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 824016144726540097}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6572213520011745246}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &7426614638068395966
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 824016144726540097}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 173374ef366d1f6478fe2e3224ba1360, 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: 0
+  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: 4300006, guid: 59a580b3010c36843ae25f25e3bb9267, type: 3}
+  m_Bones:
+  - {fileID: 4533264110132480555}
+  - {fileID: 1521118278081261977}
+  - {fileID: 8206254641897354483}
+  - {fileID: 612784583815757026}
+  - {fileID: 111277410607119950}
+  - {fileID: 732057878990894287}
+  - {fileID: 5888695615478276962}
+  - {fileID: 5719316721725802442}
+  - {fileID: 3027752528634627746}
+  - {fileID: 7181156680153200373}
+  - {fileID: 109548609021787386}
+  - {fileID: 1400106286522510799}
+  - {fileID: 3521605445752978150}
+  - {fileID: 7305338718827448042}
+  - {fileID: 8858487257820384219}
+  - {fileID: 1169571848583448397}
+  - {fileID: 6407283189113060643}
+  - {fileID: 8772061910617123445}
+  - {fileID: 4998916166236898608}
+  - {fileID: 4357403531752916656}
+  - {fileID: 481171413724021122}
+  - {fileID: 6482819270561064127}
+  - {fileID: 1136119498356650471}
+  - {fileID: 5324194328449095362}
+  - {fileID: 7152012283195849323}
+  - {fileID: 5759665043600465540}
+  - {fileID: 3426265362406383418}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 612784583815757026}
+  m_AABB:
+    m_Center: {x: -0.14241624, y: 0.009094864, z: -0.00000029802322}
+    m_Extent: {x: 0.676462, y: 0.5697386, z: 0.2895527}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &889675726338156527
 GameObject:
   m_ObjectHideFlags: 0
@@ -698,7 +815,7 @@ Transform:
   - {fileID: 3941199216834719517}
   - {fileID: 429055222804024087}
   - {fileID: 7329074738507562806}
-  - {fileID: 9218363400185329688}
+  - {fileID: 5244402482557082610}
   m_Father: {fileID: 6001636383538241202}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3546143889832522247
@@ -1643,123 +1760,6 @@ Transform:
   - {fileID: 1136119498356650471}
   m_Father: {fileID: 8206254641897354483}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8265699802302529118
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 9218363400185329688}
-  - component: {fileID: 4123329302787812240}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Wolf Pup
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &9218363400185329688
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8265699802302529118}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6572213520011745246}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4123329302787812240
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8265699802302529118}
-  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_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 173374ef366d1f6478fe2e3224ba1360, 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: 0
-  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: 4300006, guid: 59a580b3010c36843ae25f25e3bb9267, type: 3}
-  m_Bones:
-  - {fileID: 4533264110132480555}
-  - {fileID: 1521118278081261977}
-  - {fileID: 8206254641897354483}
-  - {fileID: 612784583815757026}
-  - {fileID: 111277410607119950}
-  - {fileID: 732057878990894287}
-  - {fileID: 5888695615478276962}
-  - {fileID: 5719316721725802442}
-  - {fileID: 3027752528634627746}
-  - {fileID: 7181156680153200373}
-  - {fileID: 109548609021787386}
-  - {fileID: 1400106286522510799}
-  - {fileID: 3521605445752978150}
-  - {fileID: 7305338718827448042}
-  - {fileID: 8858487257820384219}
-  - {fileID: 1169571848583448397}
-  - {fileID: 6407283189113060643}
-  - {fileID: 8772061910617123445}
-  - {fileID: 4998916166236898608}
-  - {fileID: 4357403531752916656}
-  - {fileID: 481171413724021122}
-  - {fileID: 6482819270561064127}
-  - {fileID: 1136119498356650471}
-  - {fileID: 5324194328449095362}
-  - {fileID: 7152012283195849323}
-  - {fileID: 5759665043600465540}
-  - {fileID: 3426265362406383418}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 612784583815757026}
-  m_AABB:
-    m_Center: {x: -0.14241624, y: 0.009094864, z: -0.00000029802322}
-    m_Extent: {x: 0.676462, y: 0.5697386, z: 0.2895527}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &8307874533316835084
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/GuaiwuBoss01.prefab

@@ -170,7 +170,7 @@ Transform:
   - {fileID: 5604520466445514036}
   - {fileID: 7152154869661391420}
   - {fileID: 186394833937686985}
-  - {fileID: 4389078509802701193}
+  - {fileID: 2681985770085121986}
   m_Father: {fileID: 9186905882593900606}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &185306020276039974
@@ -597,175 +597,6 @@ Transform:
   - {fileID: 3932329650191922194}
   m_Father: {fileID: 9090031560869534089}
   m_LocalEulerAnglesHint: {x: -15.588569, y: 43.038258, z: -44.959267}
---- !u!1 &1437772629046648238
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4389078509802701193}
-  - component: {fileID: 8114369233583555523}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Snake Naga
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4389078509802701193
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1437772629046648238}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0.00015357562, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3506611539735992363}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8114369233583555523
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1437772629046648238}
-  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_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: f3ffe8a1659fa484ab8dfbdbcc86d2c0, 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: 0
-  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: 4300012, guid: 56dd1c59a27e08a48b52d25989c46eaf, type: 3}
-  m_Bones:
-  - {fileID: 8684248612825461903}
-  - {fileID: 7848617762368157355}
-  - {fileID: 7615136760858222747}
-  - {fileID: 2360096382715338032}
-  - {fileID: 1273180218187790951}
-  - {fileID: 6575351459676362009}
-  - {fileID: 8772929726381357402}
-  - {fileID: 4705746175770072434}
-  - {fileID: 8567915752481089600}
-  - {fileID: 568114682532526111}
-  - {fileID: 3212430801861921411}
-  - {fileID: 1472307336645622628}
-  - {fileID: 7576260207511051711}
-  - {fileID: 1471519300583271657}
-  - {fileID: 5536519681405179078}
-  - {fileID: 7065992909484136661}
-  - {fileID: 8099548644093501754}
-  - {fileID: 2663355705917346182}
-  - {fileID: 2395373723625032885}
-  - {fileID: 1577729633248969363}
-  - {fileID: 8557276127581814096}
-  - {fileID: 722709168289681653}
-  - {fileID: 8770773769941151548}
-  - {fileID: 3762546868142799813}
-  - {fileID: 6887044235896176738}
-  - {fileID: 7084663215195366309}
-  - {fileID: 6614307007623921420}
-  - {fileID: 7572440970567933092}
-  - {fileID: 4364374098188844442}
-  - {fileID: 460749045765171845}
-  - {fileID: 6483702444462202340}
-  - {fileID: 3704955700275525601}
-  - {fileID: 385137281013094857}
-  - {fileID: 5793558758688584478}
-  - {fileID: 4222378861415565306}
-  - {fileID: 6064926725660801988}
-  - {fileID: 7476688359350209250}
-  - {fileID: 1680409490359051016}
-  - {fileID: 4955803892646688081}
-  - {fileID: 3166417931178366471}
-  - {fileID: 7970448180560165032}
-  - {fileID: 1137570478438367192}
-  - {fileID: 82461769213800776}
-  - {fileID: 6218354558533214390}
-  - {fileID: 4947111582429602973}
-  - {fileID: 550660714355134565}
-  - {fileID: 4448623087376528104}
-  - {fileID: 3239655829727480852}
-  - {fileID: 8044910768931508311}
-  - {fileID: 2520658530913993966}
-  - {fileID: 1749708118238801025}
-  - {fileID: 3148190171913077656}
-  - {fileID: 4157005748144925791}
-  - {fileID: 6983888326192427305}
-  - {fileID: 3399288132298630563}
-  - {fileID: 4982298390286083261}
-  - {fileID: 4593615582079333134}
-  - {fileID: 1239693437226710530}
-  - {fileID: 7955001359911357038}
-  - {fileID: 1552838576670509646}
-  - {fileID: 3706722098629703778}
-  - {fileID: 2969598778214206056}
-  - {fileID: 2660333797489600128}
-  - {fileID: 1188314041870792049}
-  - {fileID: 7440256923030130344}
-  - {fileID: 5711776609026815646}
-  - {fileID: 7303254475707296240}
-  - {fileID: 1559972068473476665}
-  - {fileID: 6243247794339573190}
-  - {fileID: 6188137163190283309}
-  - {fileID: 8020182800256829635}
-  - {fileID: 257462064006723395}
-  - {fileID: 4532660097433680384}
-  - {fileID: 7282240395114335893}
-  - {fileID: 5494198129253211837}
-  - {fileID: 5842436686954796164}
-  - {fileID: 4430780002469931888}
-  - {fileID: 8176269555628364002}
-  - {fileID: 3524597963351565075}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6575351459676362009}
-  m_AABB:
-    m_Center: {x: -0.580421, y: -2.2199645, z: 0.00015312433}
-    m_Extent: {x: 1.9573529, y: 2.9779105, z: 1.4714735}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &1522318116694483347
 GameObject:
   m_ObjectHideFlags: 0
@@ -1185,13 +1016,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2124651985580167562}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.11482758, y: 0.025517581, z: -0.2154281, w: 0.9694092}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.73383313, y: 0.05537966, z: -0.6751489, w: -0.05095097}
+  m_LocalPosition: {x: 0.43, y: 1.78, z: 2.4}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3153871768858593310}
-  m_LocalEulerAnglesHint: {x: -12.218, y: 5.811, z: -25.68}
+  m_Father: {fileID: 9186905882593900606}
+  m_LocalEulerAnglesHint: {x: 180, y: 85.23, z: -8.630981}
 --- !u!65 &5482358177539800702
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -2341,6 +2172,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 6553220541571655652}
   - {fileID: 3506611539735992363}
   - {fileID: 1051642316710782114}
   - {fileID: 3607763626407988915}
@@ -3305,6 +3137,175 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3506611539735992363}
   m_LocalEulerAnglesHint: {x: -5.591331, y: -76.90391, z: -7.6110306}
+--- !u!1 &5935396211531128544
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2681985770085121986}
+  - component: {fileID: 4211634192625944395}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Snake Naga
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2681985770085121986
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5935396211531128544}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0.00015357562, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3506611539735992363}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &4211634192625944395
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5935396211531128544}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: f3ffe8a1659fa484ab8dfbdbcc86d2c0, 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: 0
+  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: 4300012, guid: 56dd1c59a27e08a48b52d25989c46eaf, type: 3}
+  m_Bones:
+  - {fileID: 8684248612825461903}
+  - {fileID: 7848617762368157355}
+  - {fileID: 7615136760858222747}
+  - {fileID: 2360096382715338032}
+  - {fileID: 1273180218187790951}
+  - {fileID: 6575351459676362009}
+  - {fileID: 8772929726381357402}
+  - {fileID: 4705746175770072434}
+  - {fileID: 8567915752481089600}
+  - {fileID: 568114682532526111}
+  - {fileID: 3212430801861921411}
+  - {fileID: 1472307336645622628}
+  - {fileID: 7576260207511051711}
+  - {fileID: 1471519300583271657}
+  - {fileID: 5536519681405179078}
+  - {fileID: 7065992909484136661}
+  - {fileID: 8099548644093501754}
+  - {fileID: 2663355705917346182}
+  - {fileID: 2395373723625032885}
+  - {fileID: 1577729633248969363}
+  - {fileID: 8557276127581814096}
+  - {fileID: 722709168289681653}
+  - {fileID: 8770773769941151548}
+  - {fileID: 3762546868142799813}
+  - {fileID: 6887044235896176738}
+  - {fileID: 7084663215195366309}
+  - {fileID: 6614307007623921420}
+  - {fileID: 7572440970567933092}
+  - {fileID: 4364374098188844442}
+  - {fileID: 460749045765171845}
+  - {fileID: 6483702444462202340}
+  - {fileID: 3704955700275525601}
+  - {fileID: 385137281013094857}
+  - {fileID: 5793558758688584478}
+  - {fileID: 4222378861415565306}
+  - {fileID: 6064926725660801988}
+  - {fileID: 7476688359350209250}
+  - {fileID: 1680409490359051016}
+  - {fileID: 4955803892646688081}
+  - {fileID: 3166417931178366471}
+  - {fileID: 7970448180560165032}
+  - {fileID: 1137570478438367192}
+  - {fileID: 82461769213800776}
+  - {fileID: 6218354558533214390}
+  - {fileID: 4947111582429602973}
+  - {fileID: 550660714355134565}
+  - {fileID: 4448623087376528104}
+  - {fileID: 3239655829727480852}
+  - {fileID: 8044910768931508311}
+  - {fileID: 2520658530913993966}
+  - {fileID: 1749708118238801025}
+  - {fileID: 3148190171913077656}
+  - {fileID: 4157005748144925791}
+  - {fileID: 6983888326192427305}
+  - {fileID: 3399288132298630563}
+  - {fileID: 4982298390286083261}
+  - {fileID: 4593615582079333134}
+  - {fileID: 1239693437226710530}
+  - {fileID: 7955001359911357038}
+  - {fileID: 1552838576670509646}
+  - {fileID: 3706722098629703778}
+  - {fileID: 2969598778214206056}
+  - {fileID: 2660333797489600128}
+  - {fileID: 1188314041870792049}
+  - {fileID: 7440256923030130344}
+  - {fileID: 5711776609026815646}
+  - {fileID: 7303254475707296240}
+  - {fileID: 1559972068473476665}
+  - {fileID: 6243247794339573190}
+  - {fileID: 6188137163190283309}
+  - {fileID: 8020182800256829635}
+  - {fileID: 257462064006723395}
+  - {fileID: 4532660097433680384}
+  - {fileID: 7282240395114335893}
+  - {fileID: 5494198129253211837}
+  - {fileID: 5842436686954796164}
+  - {fileID: 4430780002469931888}
+  - {fileID: 8176269555628364002}
+  - {fileID: 3524597963351565075}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6575351459676362009}
+  m_AABB:
+    m_Center: {x: -0.580421, y: -2.2199645, z: 0.00015312433}
+    m_Extent: {x: 1.9573529, y: 2.9779105, z: 1.4714735}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &5942523598602234320
 GameObject:
   m_ObjectHideFlags: 0
@@ -5117,8 +5118,7 @@ Transform:
   m_LocalPosition: {x: 0.052484885, y: 2.6296146, z: 0.38676363}
   m_LocalScale: {x: 1.0000006, y: 1.0000005, z: 0.9999989}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6553220541571655652}
+  m_Children: []
   m_Father: {fileID: 3506611539735992363}
   m_LocalEulerAnglesHint: {x: -6.482905, y: -94.91219, z: -177.50635}
 --- !u!1 &8963339440406373874

Assets/Res/CombatHero/GuaiwuBoss01_gpu.prefab

@@ -1,5 +1,73 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &725123664013469514
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7291772946166264191}
+  - component: {fileID: 7264673021540261048}
+  - component: {fileID: 7186529326954576793}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7291772946166264191
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 725123664013469514}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.73383313, y: 0.05537966, z: -0.6751489, w: -0.05095097}
+  m_LocalPosition: {x: 0.43, y: 1.78, z: 2.4}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8826459760975911344}
+  m_LocalEulerAnglesHint: {x: 180, y: 85.23, z: -8.630981}
+--- !u!65 &7264673021540261048
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 725123664013469514}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 3.5966616, y: 2.44, z: 2.45}
+  m_Center: {x: -0.9683313, y: 0.00000003227703, z: -0.0000010776441}
+--- !u!114 &7186529326954576793
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 725123664013469514}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: sk2_trigger
 --- !u!1 &2270492576576999659
 GameObject:
   m_ObjectHideFlags: 0
@@ -257,6 +325,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7291772946166264191}
   - {fileID: 3351031720789951900}
   - {fileID: 8306788222864425271}
   - {fileID: 5340824032857057636}

Assets/Res/CombatHero/GuaiwuBoss02.prefab

@@ -1,135 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &50851901877136216
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 336294836129028315}
-  - component: {fileID: 151369060759891627}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Werewolf
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &336294836129028315
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 50851901877136216}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: -0.000000005110991, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2543231225303990713}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &151369060759891627
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 50851901877136216}
-  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_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 702b1a5f5dbd6c5429531d1fed684fd2, 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: 0
-  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: 4300010, guid: 28f5370d627d60e42aa0738753feeff8, type: 3}
-  m_Bones:
-  - {fileID: 4845989422964750336}
-  - {fileID: 6097093408066898662}
-  - {fileID: 1548736135145920922}
-  - {fileID: 1820855933375340606}
-  - {fileID: 2548258092473772300}
-  - {fileID: 8062269003882476183}
-  - {fileID: 5996524417334975512}
-  - {fileID: 7744200647700778548}
-  - {fileID: 2407432736789458913}
-  - {fileID: 6158497477600254459}
-  - {fileID: 5543753061549880937}
-  - {fileID: 6977258398055739691}
-  - {fileID: 371332966315259067}
-  - {fileID: 8856731410933314689}
-  - {fileID: 5750204019671837433}
-  - {fileID: 8948141379807217074}
-  - {fileID: 1183776160754459712}
-  - {fileID: 3868057053778149876}
-  - {fileID: 2188289566342939738}
-  - {fileID: 7630551775567204699}
-  - {fileID: 3301477557582645936}
-  - {fileID: 7519855671315321363}
-  - {fileID: 3789994181355170666}
-  - {fileID: 3729254490185981618}
-  - {fileID: 2979450362900559607}
-  - {fileID: 3557966051369595726}
-  - {fileID: 3307467806386130166}
-  - {fileID: 8585635914702369870}
-  - {fileID: 8092212401915270093}
-  - {fileID: 6090346236786105205}
-  - {fileID: 9012130363583481157}
-  - {fileID: 8213856404078875766}
-  - {fileID: 8820166758582713905}
-  - {fileID: 1431699252048561567}
-  - {fileID: 4521011605196146351}
-  - {fileID: 1028013253989963222}
-  - {fileID: 7949627775557542382}
-  - {fileID: 3957223512543696435}
-  - {fileID: 5507874406070660391}
-  - {fileID: 1429662666202582614}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2548258092473772300}
-  m_AABB:
-    m_Center: {x: -0.48772103, y: 0.05480367, z: -0.000000059604645}
-    m_Extent: {x: 1.448802, y: 1.575206, z: 1.4642158}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &86125562296384508
 GameObject:
   m_ObjectHideFlags: 0
@@ -262,52 +132,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2543231225303990713}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &790794996549350488
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5117737829965005708}
-  - component: {fileID: 4693405927865755547}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: hitpos
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5117737829965005708
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 790794996549350488}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.83, z: 0.09}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6644446483243639435}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4693405927865755547
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 790794996549350488}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DotName: hitpos
 --- !u!1 &1070476745202724230
 GameObject:
   m_ObjectHideFlags: 0
@@ -393,7 +217,7 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 6, y: 1, z: 6}
+  m_Size: {x: 4, y: 1, z: 4}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &6650175938599432852
 MonoBehaviour:
@@ -1068,7 +892,6 @@ Transform:
   - {fileID: 2543231225303990713}
   - {fileID: 8837337532384287994}
   - {fileID: 1637867721205622754}
-  - {fileID: 5117737829965005708}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5648437607405580698
@@ -1994,7 +1817,7 @@ Transform:
   - {fileID: 1526026978610125936}
   - {fileID: 421740885926511694}
   - {fileID: 3406155893323543535}
-  - {fileID: 336294836129028315}
+  - {fileID: 3408970510815634287}
   m_Father: {fileID: 6644446483243639435}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6800229723977760576
@@ -2454,6 +2277,136 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2543231225303990713}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8888305268406872831
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3408970510815634287}
+  - component: {fileID: 957247224069031939}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Werewolf
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3408970510815634287
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8888305268406872831}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: -0.000000005110991, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2543231225303990713}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &957247224069031939
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8888305268406872831}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 702b1a5f5dbd6c5429531d1fed684fd2, 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: 0
+  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: 4300010, guid: 28f5370d627d60e42aa0738753feeff8, type: 3}
+  m_Bones:
+  - {fileID: 4845989422964750336}
+  - {fileID: 6097093408066898662}
+  - {fileID: 1548736135145920922}
+  - {fileID: 1820855933375340606}
+  - {fileID: 2548258092473772300}
+  - {fileID: 8062269003882476183}
+  - {fileID: 5996524417334975512}
+  - {fileID: 7744200647700778548}
+  - {fileID: 2407432736789458913}
+  - {fileID: 6158497477600254459}
+  - {fileID: 5543753061549880937}
+  - {fileID: 6977258398055739691}
+  - {fileID: 371332966315259067}
+  - {fileID: 8856731410933314689}
+  - {fileID: 5750204019671837433}
+  - {fileID: 8948141379807217074}
+  - {fileID: 1183776160754459712}
+  - {fileID: 3868057053778149876}
+  - {fileID: 2188289566342939738}
+  - {fileID: 7630551775567204699}
+  - {fileID: 3301477557582645936}
+  - {fileID: 7519855671315321363}
+  - {fileID: 3789994181355170666}
+  - {fileID: 3729254490185981618}
+  - {fileID: 2979450362900559607}
+  - {fileID: 3557966051369595726}
+  - {fileID: 3307467806386130166}
+  - {fileID: 8585635914702369870}
+  - {fileID: 8092212401915270093}
+  - {fileID: 6090346236786105205}
+  - {fileID: 9012130363583481157}
+  - {fileID: 8213856404078875766}
+  - {fileID: 8820166758582713905}
+  - {fileID: 1431699252048561567}
+  - {fileID: 4521011605196146351}
+  - {fileID: 1028013253989963222}
+  - {fileID: 7949627775557542382}
+  - {fileID: 3957223512543696435}
+  - {fileID: 5507874406070660391}
+  - {fileID: 1429662666202582614}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 2548258092473772300}
+  m_AABB:
+    m_Center: {x: -0.48772103, y: 0.05480367, z: -0.000000059604645}
+    m_Extent: {x: 1.448802, y: 1.575206, z: 1.4642158}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &8982368678241853565
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/GuaiwuBoss02_gpu.prefab

@@ -176,7 +176,7 @@ Transform:
   m_GameObject: {fileID: 2315329930324106118}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 4}
+  m_LocalPosition: {x: 0, y: 0, z: 5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -201,7 +201,7 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 6, y: 1, z: 6}
+  m_Size: {x: 4, y: 1, z: 4}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &1526340966186966416
 MonoBehaviour:

Assets/Res/CombatHero/GuaiwuJY01.prefab

@@ -965,72 +965,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8787205196784000687}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3569495279892638607
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7224103272104566440}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: RigTail10Gizmo
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &7224103272104566440
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3569495279892638607}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.29735288, y: 0.66933227, z: -0.27503395, w: 0.62284184}
-  m_LocalPosition: {x: 0.3030659, y: 0.13098225, z: -0.38204947}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4907045407575232226}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3796918544163000481
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6805580368367737891}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: RigNeck6IKPt
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6805580368367737891
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3796918544163000481}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.000000053756224, y: -0.000000029412174, z: -0.24983184, w: 0.96828926}
-  m_LocalPosition: {x: -0.13012245, y: 0.000000076293944, z: 0}
-  m_LocalScale: {x: 1.0000001, y: 1.0000002, z: 0.99999994}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1117106843507202134}
-  m_Father: {fileID: 1727154763341965548}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4044671917822012986
+--- !u!1 &3498946820109441183
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1038,8 +973,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 388170451651593772}
-  - component: {fileID: 3321332404033201023}
+  - component: {fileID: 4226182959879159077}
+  - component: {fileID: 8728936297736493323}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Snake
@@ -1048,13 +983,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &388170451651593772
+--- !u!4 &4226182959879159077
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4044671917822012986}
+  m_GameObject: {fileID: 3498946820109441183}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -1063,13 +998,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 4907045407575232226}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3321332404033201023
+--- !u!137 &8728936297736493323
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4044671917822012986}
+  m_GameObject: {fileID: 3498946820109441183}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -1146,6 +1081,71 @@ SkinnedMeshRenderer:
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
+--- !u!1 &3569495279892638607
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7224103272104566440}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: RigTail10Gizmo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7224103272104566440
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3569495279892638607}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.29735288, y: 0.66933227, z: -0.27503395, w: 0.62284184}
+  m_LocalPosition: {x: 0.3030659, y: 0.13098225, z: -0.38204947}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4907045407575232226}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3796918544163000481
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6805580368367737891}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: RigNeck6IKPt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6805580368367737891
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3796918544163000481}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.000000053756224, y: -0.000000029412174, z: -0.24983184, w: 0.96828926}
+  m_LocalPosition: {x: -0.13012245, y: 0.000000076293944, z: 0}
+  m_LocalScale: {x: 1.0000001, y: 1.0000002, z: 0.99999994}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1117106843507202134}
+  m_Father: {fileID: 1727154763341965548}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4209703492283450499
 GameObject:
   m_ObjectHideFlags: 0
@@ -1428,7 +1428,7 @@ Transform:
   - {fileID: 1758221673950266174}
   - {fileID: 5337298767159027132}
   - {fileID: 4611672840595664709}
-  - {fileID: 388170451651593772}
+  - {fileID: 4226182959879159077}
   m_Father: {fileID: 7760812738003230115}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5790529394969636121

Assets/Res/CombatHero/GuaiwuJY02.prefab

@@ -98,7 +98,7 @@ Transform:
   - {fileID: 4240516874693082975}
   m_Father: {fileID: 1039189444445265039}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2101966675930677955
+--- !u!1 &2017088198846713288
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -106,8 +106,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3620840260612235918}
-  - component: {fileID: 3651896586828132500}
+  - component: {fileID: 493194424238479749}
+  - component: {fileID: 6304163338602557005}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Wolf
@@ -116,13 +116,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3620840260612235918
+--- !u!4 &493194424238479749
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2101966675930677955}
+  m_GameObject: {fileID: 2017088198846713288}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
   m_LocalPosition: {x: -0, y: 0, z: 3.225772e-11}
@@ -131,13 +131,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3665228836952602755}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3651896586828132500
+--- !u!137 &6304163338602557005
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2101966675930677955}
+  m_GameObject: {fileID: 2017088198846713288}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -1423,7 +1423,7 @@ Transform:
   - {fileID: 1039189444445265039}
   - {fileID: 194680409552914847}
   - {fileID: 8642461612256899995}
-  - {fileID: 3620840260612235918}
+  - {fileID: 493194424238479749}
   m_Father: {fileID: 2266855535440488526}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5799352810247526486

Assets/Res/HeroAnimtion/Hero01_library.asset

@@ -261,6 +261,72 @@ MonoBehaviour:
     - _From: 1
       _To: 1
       _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 2
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 7
+      _Fade: 0
+    - _From: 1
+      _To: 7
+      _Fade: 0
+    - _From: 2
+      _To: 7
+      _Fade: 0
+    - _From: 3
+      _To: 7
+      _Fade: 0
+    - _From: 4
+      _To: 7
+      _Fade: 0
+    - _From: 6
+      _To: 7
+      _Fade: 0
+    - _From: 5
+      _To: 7
+      _Fade: 0
+    - _From: 7
+      _To: 7
+      _Fade: 0
+    - _From: 8
+      _To: 7
+      _Fade: 0
+    - _From: 9
+      _To: 7
+      _Fade: 0
+    - _From: 10
+      _To: 7
+      _Fade: 0
+    - _From: 11
+      _To: 7
+      _Fade: 0
+    - _From: 7
+      _To: 1
+      _Fade: 0
+    - _From: 7
+      _To: 2
+      _Fade: 0
+    - _From: 7
+      _To: 3
+      _Fade: 0
+    - _From: 7
+      _To: 4
+      _Fade: 0
+    - _From: 7
+      _To: 8
+      _Fade: 0
+    - _From: 7
+      _To: 9
+      _Fade: 0
+    - _From: 7
+      _To: 10
+      _Fade: 0
+    - _From: 7
+      _To: 11
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &723220657297123379

Assets/Res/HeroAnimtion/Hero02_library.asset

@@ -224,6 +224,54 @@ MonoBehaviour:
     - _From: 2
       _To: 0
       _Fade: 0
+    - _From: 1
+      _To: 5
+      _Fade: 0
+    - _From: 2
+      _To: 5
+      _Fade: 0
+    - _From: 3
+      _To: 5
+      _Fade: 0
+    - _From: 4
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 5
+      _Fade: 0
+    - _From: 6
+      _To: 5
+      _Fade: 0
+    - _From: 7
+      _To: 5
+      _Fade: 0
+    - _From: 8
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 0
+      _Fade: 0
+    - _From: 5
+      _To: 1
+      _Fade: 0
+    - _From: 5
+      _To: 2
+      _Fade: 0
+    - _From: 5
+      _To: 3
+      _Fade: 0
+    - _From: 5
+      _To: 4
+      _Fade: 0
+    - _From: 5
+      _To: 6
+      _Fade: 0
+    - _From: 5
+      _To: 7
+      _Fade: 0
+    - _From: 5
+      _To: 8
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &1802178590809212851

Assets/Res/HeroAnimtion/Hero03_library.asset

@@ -190,6 +190,57 @@ MonoBehaviour:
     - _From: 3
       _To: 0
       _Fade: 0
+    - _From: 0
+      _To: 5
+      _Fade: 0
+    - _From: 1
+      _To: 5
+      _Fade: 0
+    - _From: 2
+      _To: 5
+      _Fade: 0
+    - _From: 3
+      _To: 5
+      _Fade: 0
+    - _From: 4
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 5
+      _Fade: 0
+    - _From: 7
+      _To: 5
+      _Fade: 0
+    - _From: 6
+      _To: 5
+      _Fade: 0
+    - _From: 8
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 0
+      _Fade: 0
+    - _From: 5
+      _To: 1
+      _Fade: 0
+    - _From: 5
+      _To: 2
+      _Fade: 0
+    - _From: 5
+      _To: 3
+      _Fade: 0
+    - _From: 5
+      _To: 4
+      _Fade: 0
+    - _From: 5
+      _To: 6
+      _Fade: 0
+    - _From: 5
+      _To: 7
+      _Fade: 0
+    - _From: 5
+      _To: 8
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &2952580267153325199

Assets/Res/HeroAnimtion/Hero04_library.asset

@@ -198,6 +198,57 @@ MonoBehaviour:
     - _From: 0
       _To: 4
       _Fade: 0
+    - _From: 0
+      _To: 5
+      _Fade: 0
+    - _From: 1
+      _To: 5
+      _Fade: 0
+    - _From: 2
+      _To: 5
+      _Fade: 0
+    - _From: 3
+      _To: 5
+      _Fade: 0
+    - _From: 4
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 5
+      _Fade: 0
+    - _From: 6
+      _To: 5
+      _Fade: 0
+    - _From: 7
+      _To: 5
+      _Fade: 0
+    - _From: 8
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 0
+      _Fade: 0
+    - _From: 5
+      _To: 1
+      _Fade: 0
+    - _From: 5
+      _To: 2
+      _Fade: 0
+    - _From: 5
+      _To: 3
+      _Fade: 0
+    - _From: 5
+      _To: 4
+      _Fade: 0
+    - _From: 5
+      _To: 6
+      _Fade: 0
+    - _From: 5
+      _To: 7
+      _Fade: 0
+    - _From: 5
+      _To: 8
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &1025818789074120562

Assets/Scenes/testCombat.scene

@@ -781,6 +781,79 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 773560728}
   m_CullTransparentMesh: 1
+--- !u!1001 &821759682
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2060212283957060788, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7876193226129309935, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_Name
+      value: Chapter01
+      objectReference: {fileID: 0}
+    - target: {fileID: 8043597423336933199, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_NavMeshData
+      value: 
+      objectReference: {fileID: 23800000, guid: 82a0bc4b42bf68047b52527ce3f3544e, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      insertIndex: 6
+      addedObject: {fileID: 1782443779}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+--- !u!4 &821759683 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2752559100150043988, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+  m_PrefabInstance: {fileID: 821759682}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1080868191
 GameObject:
   m_ObjectHideFlags: 0
@@ -984,6 +1057,135 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1782443778
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1782443779}
+  - component: {fileID: 1782443783}
+  - component: {fileID: 1782443782}
+  - component: {fileID: 1782443781}
+  - component: {fileID: 1782443780}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Plane (16)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1782443779
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1782443778}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.5607, y: 0, z: 0.4466}
+  m_LocalScale: {x: 4.090593, y: 1, z: 5.94087}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 821759683}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1782443780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1782443778}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_OverrideArea: 1
+  m_Area: 0
+  m_OverrideGenerateLinks: 0
+  m_GenerateLinks: 0
+  m_IgnoreFromBuild: 0
+  m_ApplyToChildren: 1
+  m_AffectedAgents: ffffffff
+--- !u!64 &1782443781
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1782443778}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1782443782
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1782443778}
+  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: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1782443783
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1782443778}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -991,3 +1193,4 @@ SceneRoots:
   - {fileID: 376281607}
   - {fileID: 235899921}
   - {fileID: 123020045}
+  - {fileID: 821759682}

Assets/Scenes/testCombat/NavMesh-Chapter01 1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: B3hOtXj+VymoF73/cqUgvwI6GZqbAZFTZiNqfAsYkM3UygkqIxdccs0=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat/NavMesh-Chapter01.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: D3MctSz5Wy+lBOG0KFpoZk9bZOes7Tq459LE59xQ/2Pa0/rg+EOwRJQ=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -51,7 +51,7 @@ namespace GameLogic.Combat.CombatTool
             AttType attType, TriggerData triggerData,
             HarmType harmType = HarmType.Default)
         {
-            HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
+            HarmReturnInfo harmReturnInfo = CObjectPool.Instance.Fetch<HarmReturnInfo>();
             harmReturnInfo.source = source;
             harmReturnInfo.target = target;
             harmReturnInfo.att = att;
@@ -63,12 +63,20 @@ namespace GameLogic.Combat.CombatTool
                 return harmReturnInfo;
             }
 
+            if (target.combatHeroEntity.CombatAIBasic.stateControl.CurrStateName.Equals(CombatHeroStateType.rolling))
+            {
+                harmReturnInfo.isMiss = true;
+                return harmReturnInfo;
+            }
+
+            att = att - target.combatHeroEntity.CurrCombatHeroInfo.defense.Value;
             int odd = GetOdd(0, 100);
-            if (odd <= source.CurrCombatHeroInfo.crit+5)
+            if (odd <= source.CurrCombatHeroInfo.crit + 5)
             {
                 harmReturnInfo.harmType |= HarmType.BaoJi;
                 att += GetVlaueRatioForLong(att, source.CurrCombatHeroInfo.critDamage.Value);
             }
+
             harmReturnInfo.att = att;
             target.combatHeroEntity.HeroHurt(harmReturnInfo);
 

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

@@ -1,16 +1,41 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using Common.Utility.CombatTimer;
+using Fort23.Core;
 using GameLogic.Combat.Hero;
+using UnityEngine;
 
 namespace GameLogic.Combat.CombatTool
 {
-    public class HarmReturnInfo
+    /// <summary>
+    /// 该类请不要缓存
+    /// </summary>
+    public class HarmReturnInfo : CObject
     {
         public CombatHeroEntity source;
         public CombatHeroHitPoint target;
         public long att;
+        public bool isMiss;
         public AttType attType;
         public TriggerData triggerData;
         public HarmType harmType = HarmType.Default;
-         
+
+        public override void Dispose()
+        {
+            Debug.Log("回收了伤害信息类");
+        }
+
+        public override void ActiveObj()
+        {
+            CombatTimerManager.Instance.AddTimer(2, delegate { CObjectPool.Instance.Recycle(this); });
+        }
+
+        public override void DormancyObj()
+        {
+            source = null;
+            target = null;
+            attType = AttType.Normal;
+            harmType = HarmType.Default;
+            triggerData = new TriggerData();
+        }
     }
 }

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

@@ -213,22 +213,29 @@ namespace GameLogic.Combat.CombatType
 
         protected void BossKo()
         {
-            HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
-            harmReturnInfo.harmType = HarmType.SystemKo;
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
-            heroEntities.AddRange(allHero);
-            for (int i = 0; i < heroEntities.Count; i++)
+            if (allHero != null)
             {
-                heroEntities[i].HeroDie(harmReturnInfo);
+                HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
+                harmReturnInfo.harmType = HarmType.SystemKo;
+
+                List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
+                heroEntities.AddRange(allHero);
+                for (int i = 0; i < heroEntities.Count; i++)
+                {
+                    heroEntities[i].HeroDie(harmReturnInfo);
+                }
             }
 
+
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
             isBossCombat = false;
             LevelBattleConfig levelBattleConfig =
                 ConfigComponent.Instance.Get<LevelBattleConfig>(_levelBattleConfig.ID + 1);
             if (levelBattleConfig.ID > 0)
             {
+                AccountFileInfo.Instance.playerData.levelBattle = levelBattleConfig.ID;
+                AccountFileInfo.Instance.SavePlayerData();
                 _levelBattleConfig = levelBattleConfig;
             }
 
@@ -251,16 +258,20 @@ namespace GameLogic.Combat.CombatType
         {
             isBossCombat = true;
             CombatController.currActiveCombat.isStopAi = true;
-            HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
-            harmReturnInfo.harmType = HarmType.SystemKo;
+
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
-            heroEntities.AddRange(allHero);
-            for (int i = 0; i < heroEntities.Count; i++)
+            if (allHero != null)
             {
-                heroEntities[i].HeroDie(harmReturnInfo);
+                HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
+                harmReturnInfo.harmType = HarmType.SystemKo;
+                List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
+                heroEntities.AddRange(allHero);
+                for (int i = 0; i < heroEntities.Count; i++)
+                {
+                    heroEntities[i].HeroDie(harmReturnInfo);
+                }
             }
-            
+
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
             FindNextConfig();
             _currWavesConfig =
@@ -268,7 +279,7 @@ namespace GameLogic.Combat.CombatType
                     _levelBattleConfig.BossMonsterWavesId);
             _currNodeWavesIndex = -1;
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
-            CreateEnemy(cTaskAwaitBuffer, _levelBattleConfig.bossMonsterId, 
+            CreateEnemy(cTaskAwaitBuffer, _levelBattleConfig.bossMonsterId,
                 _levelBattleConfig.bossLv, _levelBattleConfig.bossStar, 0,
                 delegate(CombatHeroEntity entity)
                 {
@@ -278,11 +289,7 @@ namespace GameLogic.Combat.CombatType
                     EventManager.Instance.Dispatch(CustomEventType.StartBossBattle, null);
                 });
             CreateEnemy(cTaskAwaitBuffer);
-            CombatTimerManager.Instance.AddTimer(2, delegate
-            {
-                StartBossBattle();
-            });
-           
+            CombatTimerManager.Instance.AddTimer(2, delegate { StartBossBattle(); });
         }
 
         public void StartBossBattle()
@@ -305,7 +312,7 @@ namespace GameLogic.Combat.CombatType
         private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
             _currNodeWavesIndex++;
-           int nodeIndex= _currNodeWavesIndex % _currWavesConfig.monsterGroupConfigId.Length;
+            int nodeIndex = _currNodeWavesIndex % _currWavesConfig.monsterGroupConfigId.Length;
             int miniCount = _currWavesConfig.miniMonsterCount[nodeIndex];
             MonsterGroupConfig monsterGroupConfig =
                 ConfigComponent.Instance.Get<MonsterGroupConfig>(
@@ -316,7 +323,8 @@ namespace GameLogic.Combat.CombatType
                 int index = i;
                 int monsterIndex = Random.Range(0, monsterGroupConfig.miniMonsterId.Length);
                 int monsterId = monsterGroupConfig.miniMonsterId[monsterIndex];
-                CreateEnemy(cTaskAwaitBuffer, monsterId, _levelBattleConfig.monsterLv, _levelBattleConfig.monsterStar, index);
+                CreateEnemy(cTaskAwaitBuffer, monsterId, _levelBattleConfig.monsterLv, _levelBattleConfig.monsterStar,
+                    index);
             }
 
             int eliteCount = _currWavesConfig.eliteMonsterCount[nodeIndex];
@@ -325,7 +333,8 @@ namespace GameLogic.Combat.CombatType
                 int index = i;
                 int monsterIndex = Random.Range(0, monsterGroupConfig.eliteMonsterId.Length);
                 int monsterId = monsterGroupConfig.eliteMonsterId[monsterIndex];
-                CreateEnemy(cTaskAwaitBuffer, monsterId, _levelBattleConfig.monsterLv, _levelBattleConfig.monsterStar, index);
+                CreateEnemy(cTaskAwaitBuffer, monsterId, _levelBattleConfig.monsterLv, _levelBattleConfig.monsterStar,
+                    index);
             }
         }
 
@@ -366,7 +375,7 @@ namespace GameLogic.Combat.CombatType
                 return;
             }
 
-            if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length-1)
+            if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length - 1)
             {
                 _currTime += 0.016f;
                 if (_currTime > _currWavesConfig.wavesDelay)
@@ -380,7 +389,7 @@ namespace GameLogic.Combat.CombatType
         private void InitPlayerHero(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
             int i = 0;
-            foreach (KeyValuePair<int,HeroInfo> keyValuePair in PlayerManager.Instance.heroController.heroDicInLead)
+            foreach (KeyValuePair<int, HeroInfo> keyValuePair in PlayerManager.Instance.heroController.heroDicInLead)
             {
                 int index = i;
                 CombatHeroEntity heroEntity = new CombatHeroEntity();
@@ -398,7 +407,8 @@ namespace GameLogic.Combat.CombatType
             }
 
             Vector3 p = _combatScenesConfig.heroPoint[0].position;
-            combatController.CombatCameraControllder.root.position =new Vector3(p.x,  combatController.CombatCameraControllder.root.position.y, p.z + 13);
+            combatController.CombatCameraControllder.root.position = new Vector3(p.x,
+                combatController.CombatCameraControllder.root.position.y, p.z + 13);
         }
 
         // private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)

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

@@ -138,9 +138,9 @@ public class CombatAIBasic : IDisposable
         stateControl.AddState(CombatHeroStateType.Resurrection, new CombatResurrectionState(_combatHeroEntity));
     }
 
-    public void ChangeState(string name)
+    public void ChangeState(string name, IStateEnterData iStateEnterData = null)
     {
-        stateControl.ChangeState(name);
+        stateControl.ChangeState(name, iStateEnterData);
     }
 
     public void Update(float t)
@@ -199,9 +199,35 @@ public class CombatAIBasic : IDisposable
             }
         }
 
+        AreaUpdate();
         ProUpdate();
     }
 
+    private void AreaUpdate()
+    {
+        GameObject[] b = _combatHeroEntity.CombatAIBasic.AreaList;
+        if (b != null && b.Length > 0)
+        {
+            float dodge = _combatHeroEntity.CurrCombatHeroInfo.dodge;
+            int odds = CombatCalculateTool.Instance.GetOdd();
+            if (odds < dodge)
+            {
+                CombatHeroRollingState.RollingStateData rollingStateData =
+                    CObjectPool.Instance.Fetch<CombatHeroRollingState.RollingStateData>();
+                Vector3 pos = Vector3.zero;
+                for (int i = 0; i < b.Length; i++)
+                {
+                    pos += b[i].transform.position;
+                }
+
+                pos /= b.Length;
+                Vector3 dir = pos - _combatHeroEntity.combatHeroGameObject.position;
+                rollingStateData.dir = new Vector3(dir.x, _combatHeroEntity.dotPos.y, dir.z).normalized;
+                _combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.rolling, rollingStateData);
+            }
+        }
+    }
+
     protected virtual void ProUpdate()
     {
     }
@@ -236,7 +262,6 @@ public class CombatAIBasic : IDisposable
         }
 
         return minDistanceHero;
-        
     }
 
     public void Dispose()

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

@@ -20,6 +20,10 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
     /// </summary>
     public int heroDieNodeId;
 
+    public string guidName
+    {
+        get { return CurrCombatHeroInfo.modelName; }
+    }
     public bool IsEnemy { get; set; }
     public bool isDie { get; set; }
     public int number;
@@ -187,6 +191,8 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
         }
     }
 
+   
+
     public T This<T>()
     {
         return (T)(object)this;

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

@@ -38,7 +38,11 @@ public class CombatHeroInfo
     public HeroPowerUpConfig powerUpConfig;
     public HeroPromoteConfig promoteConfig;
     public HeroBasicEquipConfig basicEquipConfig;
-    
+
+    /// <summary>
+    /// 闪避 默认10%的几率
+    /// </summary>
+    public float dodge=10;
     /// <summary>
     /// 1=英雄 2=小怪 3=精英怪 4=boss
     /// </summary>

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

@@ -6,6 +6,9 @@ namespace GameLogic.Combat.Hero
         public static readonly string att = "att";
         public static readonly string move = "move";
         public static readonly string dile = "dile";
+        /// <summary>
+        /// 翻滚
+        /// </summary>
         public static readonly string rolling = "rolling";
         public static readonly string followMove = "followMove";
         public static readonly string followIdle= "followIdle";

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroIdleState.cs

@@ -35,12 +35,7 @@ namespace GameLogic.Combat.Hero.State
             }
             else
             {
-                GameObject[] b = combatHeroEntity.CombatAIBasic.AreaList;
-                if (b != null && b.Length > 0)
-                {
-                    combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.rolling);
-                }
-                else
+               
                 {
                     Vector3 nextPos = combatHeroEntity.CombatAIBasic.currFocusTarget.dotPos;
                     Vector3 p = nextPos - combatHeroEntity.dotPos;

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroRollingState.cs

@@ -1,6 +1,8 @@
 using System;
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using CombatLibrary.CombatLibrary.CombatCore.Utility;
+using Core.State;
+using Fort23.Core;
 using Fort23.UTool;
 using Unity.AI.Navigation;
 using UnityEngine;
@@ -10,20 +12,37 @@ namespace GameLogic.Combat.Hero.State
 {
     public class CombatHeroRollingState : CombatHeroStateBasic
     {
-        protected float speed = 3;
-        protected float dis = 2;
+        public class RollingStateData : CObject, IStateEnterData
+        {
+            public Vector3 dir;
+
+            public override void ActiveObj()
+            {
+            }
+
+            public override void DormancyObj()
+            {
+            }
+        }
+
+        protected float speed = 1.3f;
+        protected float dis = 3;
 
         private float _currTime;
         private Vector3 targetPos;
         private Vector3 startPos;
 
         protected ACurve ACurve;
+
+        private RollingStateData _rollingStateData;
+
         public CombatHeroRollingState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
         }
 
         protected override void ProEnter()
         {
+            _rollingStateData = iStateEnterData as RollingStateData;
             combatHeroEntity.combatHeroAnimtion.Play("idle");
 
             TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
@@ -32,10 +51,7 @@ namespace GameLogic.Combat.Hero.State
             try
             {
                 timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
-                timeLineEventLogicGroup.TimeLineUpdateEnd= delegate
-                {
-                    combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-                };
+                timeLineEventLogicGroup.TimeLineUpdateEnd = delegate { };
                 combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
             }
             catch (Exception e)
@@ -43,29 +59,42 @@ namespace GameLogic.Combat.Hero.State
                 LogTool.Error(e);
             }
 
-            ACurve=   combatHeroEntity.combatHeroTimeLineControl.TimeLineData.GetTimeLineEventACurve("fangun1", "fangun", null);
+            ACurve = combatHeroEntity.combatHeroTimeLineControl.TimeLineData.GetTimeLineEventACurve("fangun1", "fangun",
+                null);
+
+            Vector3 dir = combatHeroEntity.faceDir;
+            if (_rollingStateData != null)
+            {
+                dir = _rollingStateData.dir;
+            }
+
+            combatHeroEntity.GameObject.transform.rotation.SetLookRotation(dir);
             startPos = combatHeroEntity.dotPos;
-            targetPos = startPos + combatHeroEntity.combatHeroGameObject.rotation * new Vector3(0, 0, -dis);
+            targetPos = startPos + dir * -dis;
             _currTime = 0;
         }
 
+        protected override void ProExit()
+        {
+            CObjectPool.Instance.Recycle(_rollingStateData);
+            _rollingStateData = null;
+        }
+
         protected override void ProUpdate(float t)
         {
-            // _currTime += t * speed;
-            // // Vector3 moveToTarget = Vector3.Lerp(startPos, targetPos, ACurve.Evaluate(_currTime));
-            // //
-            // //
-            // // combatHeroEntity.CombatAIBasic.NavMeshAgent.Raycast(moveToTarget, out NavMeshHit hit);
-            // // if (!hit.hit)
-            // // {
-            // //     combatHeroEntity.combatHeroGameObject.SetPosition(moveToTarget);
-            // // }
-            //
-            // if (_currTime >= 1)
-            // {
-            //    
-            //     return;
-            // }
+            _currTime += t * speed;
+            Vector3 moveToTarget = Vector3.Lerp(startPos, targetPos, ACurve.Evaluate(_currTime));
+            combatHeroEntity.CombatAIBasic.NavMeshAgent.Raycast(moveToTarget, out NavMeshHit hit);
+            if (!hit.hit)
+            {
+                combatHeroEntity.combatHeroGameObject.SetPosition(moveToTarget);
+            }
+
+            if (_currTime >= 1)
+            {
+                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+                return;
+            }
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroStateBasic.cs

@@ -6,7 +6,7 @@ namespace GameLogic.Combat.Hero.State
     {
         public CombatHeroEntity combatHeroEntity;
 
-        private IStateEnterData iStateEnterData;
+        protected IStateEnterData iStateEnterData;
 
         public CombatHeroStateBasic(CombatHeroEntity combatHeroEntity)
         {

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

@@ -16,7 +16,7 @@ namespace GameLogic.Combat.Skill
         // protected 
         protected override void ProInitSkill()
         {
-            _harm = 400;
+            _harm = SelfSkillConfig.effectValue[0];
             AddTriggerCallBack("sk1_fashe", Sk1_fasheTrigger);
         }
 

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

@@ -88,7 +88,7 @@ namespace GameLogic.Combat.Skill
             int odds = CombatCalculateTool.Instance.GetOdd();
             float bl = CombatHeroEntity.CurrCombatHeroInfo.hp.Value * 100.0f /
                        CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
-            if (bl < 50 && odds < 50)
+            // if (bl < 50 && odds < 50)
             {
                 return true;
             }

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

@@ -25,7 +25,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProInitSkill()
         {
-            _harm = 200;
+            _harm = SelfSkillConfig.effectValue[0];
             _maxTime = 3;
         }
 

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -10,10 +10,9 @@ using Utility;
 
 public class AccountFileInfo : Singleton<AccountFileInfo>
 {
-    
     public string persistentDataPath = Application.persistentDataPath + "/playerData.txt";
     public PlayerData playerData = new PlayerData();
-    
+
     [System.Serializable]
     public class PlayerData
     {
@@ -24,12 +23,16 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// </summary>
         public List<HeroData> HeroListData = new List<HeroData>();
 
+        /// <summary>
+        /// 关卡进度
+        /// </summary>
+        public int levelBattle = 1;
         // /// <summary>
         // /// 后备英雄(共享等级)
         // /// </summary>
         // public List<HeroData> HeroListInBackDatas = new List<HeroData>();
     }
-    
+
     public void LoadPlayerData()
     {
 // #if UNITY_EDITOR || UNITY_STANDALONE_WIN
@@ -55,25 +58,23 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     }
 
 
-    
     private int lastHeroIdx = 0;
-    
+
     /// <summary>
     /// 保存英雄数据
     /// </summary>
     /// <param name="heroInfo"></param>
     public void SaveHeroData(HeroInfo heroInfo)
     {
-        
-        var lastHeroData= playerData.HeroListData[lastHeroIdx];
-        
+        var lastHeroData = playerData.HeroListData[lastHeroIdx];
+
         if (heroInfo.modelID == lastHeroData.heroModelId)
         {
             playerData.HeroListData[lastHeroIdx] = heroInfo.ToHeroData();
             SavePlayerData();
             return;
         }
-        
+
         for (int i = 0; i < playerData.HeroListData.Count; i++)
         {
             HeroData heroData = playerData.HeroListData[i];
@@ -87,7 +88,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             }
         }
     }
-    
+
     private int lastItemIdx = 0;
 
     /// <summary>
@@ -102,7 +103,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             SavePlayerData();
             return;
         }
-        
+
         for (int i = 0; i < playerData.ItemListData.Count; i++)
         {
             ItemData itemData = playerData.ItemListData[i];
@@ -116,7 +117,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             }
         }
     }
-    
+
     public void SavePlayerData()
     {
         if (!string.IsNullOrEmpty(persistentDataPath))
@@ -125,7 +126,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             File.WriteAllText(persistentDataPath, playerSettingJson);
         }
     }
-    
+
     public void DeleteFile(string filePath)
     {
         if (File.Exists(filePath))
@@ -161,7 +162,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             itemId = GlobalParam.Item_HeroExp_ID,
             itemCount = 100000,
         };
-        
+
         playerData.ItemListData.Add(coin);
         playerData.ItemListData.Add(diamond);
         playerData.ItemListData.Add(heroExp);
@@ -173,7 +174,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             heroPromoteId = 3,
             isLead = true,
         };
-        
+
         HeroData heroData2 = new HeroData
         {
             heroModelId = 107,
@@ -181,7 +182,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             heroPromoteId = 3,
             isLead = true,
         };
-        
+
         HeroData heroData3 = new HeroData
         {
             heroModelId = 116,
@@ -202,7 +203,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         playerData.HeroListData.Add(heroData4);
         SavePlayerData();
     }
-    
+
     [System.Serializable]
     public class HeroData
     {
@@ -226,7 +227,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// </summary>
         public bool isLead;
     }
-    
+
     [System.Serializable]
     public class ItemData
     {
@@ -234,4 +235,4 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public long itemCount;
         public int guid;
     }
-}
+}

Assets/Scripts/GameTimeLine/CustomizeTime/TimeLineAlertAsset/TimeLineAlertAsset.cs

@@ -11,5 +11,7 @@ public class TimeLineAlertAsset : CustomizePlayableAsset
 
     [Header("前方角度")] public int angle;
     [Header("手动关闭")] public bool manualClose;
+
+    [Header("创建新的碰撞区域")] public bool isNew;
     // [Header("开始点GUID(英雄上的点，可以不填)")] public string startPosGuid;
 }

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineAlertLogic.cs

@@ -1,4 +1,5 @@
 using Core.Triiger;
+using Fort23.UTool;
 using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
@@ -10,6 +11,9 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
         private IUnRegister _exitRegister;
 
         protected GameObject _gameObject;
+        private GameObjectPool _newGameObjectPool;
+        private TimeLineAlertSeriailztion timeLineAlertSeriailztion;
+
         protected override void ProSetCombatInfo()
         {
         }
@@ -20,23 +24,41 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
             _exitRegister?.UnRegister();
             _enterRegister = null;
             _exitRegister = null;
-            TimeLineAlertSeriailztion timeLineAlertSeriailztion =
+            timeLineAlertSeriailztion =
                 mTimeLineAssetSerialization as TimeLineAlertSeriailztion;
             if (!string.IsNullOrEmpty(timeLineAlertSeriailztion.guid))
             {
                 SpecialDotInfo specialDotInfo = castEntity.GetMainHotPoin<ILifetCycleHitPoint>(true)
                     .GetSpecialDotInfo(timeLineAlertSeriailztion.guid);
-                _gameObject = specialDotInfo.targetTran.gameObject;
-                _gameObject.SetActive(false);
-                _enterRegister = specialDotInfo.targetTran.gameObject.OnTriggerEnterEvent(OnTriggerEnterEvent);
-                _exitRegister = specialDotInfo.targetTran.gameObject.OnTriggerExitEvent(OnTriggerExitEvent);
+
+
+                GameObject gameObject = specialDotInfo.targetTran.gameObject;
+                gameObject.SetActive(false);
+                if (timeLineAlertSeriailztion.isNew)
+                {
+                    string poolName = castEntity.guidName + timeLineAlertSeriailztion.groupName +
+                                      timeLineAlertSeriailztion.guid;
+                    _newGameObjectPool =
+                        GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, poolName);
+                    _gameObject = _newGameObjectPool.own;
+                    _gameObject.transform.position = gameObject.transform.position;
+                }
+                else
+                {
+                    _gameObject = gameObject;
+                }
+
+
+                _enterRegister = _gameObject.OnTriggerEnterEvent(OnTriggerEnterEvent);
+                _exitRegister = _gameObject.OnTriggerExitEvent(OnTriggerExitEvent);
                 ITimeLineAlertTargetEnter timeLineAlertTarget =
                     _timeLineTriggerEntity as ITimeLineAlertTargetEnter;
                 if (timeLineAlertTarget != null)
                 {
-                    timeLineAlertTarget.InitAlert(timeLineAlertSeriailztion,specialDotInfo.targetTran.gameObject);
+                    timeLineAlertTarget.InitAlert(timeLineAlertSeriailztion, _gameObject);
                 }
-                specialDotInfo.targetTran.gameObject.SetActive(true);
+
+                _gameObject.SetActive(true);
             }
         }
 
@@ -48,10 +70,10 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 _timeLineTriggerEntity as ITimeLineAlertTargetEnter;
             if (timeLineAlertTarget != null)
             {
-                ExitEventGameObject exitEventGameObject= collider.gameObject.GetOrAddComponent<ExitEventGameObject>();
+                ExitEventGameObject exitEventGameObject = collider.gameObject.GetOrAddComponent<ExitEventGameObject>();
                 exitEventGameObject.Collider = collider;
-                exitEventGameObject.OnCollisionExitEvent=(OnTriggerExitEvent);
-                timeLineAlertTarget.Enter(timeLineAlertSeriailztion, collider,_gameObject);
+                exitEventGameObject.OnCollisionExitEvent = (OnTriggerExitEvent);
+                timeLineAlertTarget.Enter(timeLineAlertSeriailztion, collider, _gameObject);
             }
         }
 
@@ -61,10 +83,10 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 mTimeLineAssetSerialization as TimeLineAlertSeriailztion;
             ITimeLineAlertTargetEnter timeLineAlertTarget =
                 _timeLineTriggerEntity as ITimeLineAlertTargetEnter;
-            
+
             if (timeLineAlertTarget != null)
             {
-                ExitEventGameObject exitEventGameObject= collider.gameObject.GetOrAddComponent<ExitEventGameObject>();
+                ExitEventGameObject exitEventGameObject = collider.gameObject.GetOrAddComponent<ExitEventGameObject>();
                 if (exitEventGameObject.OnCollisionExitEvent == null)
                 {
                     return;
@@ -72,7 +94,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
 
                 exitEventGameObject.Collider = null;
                 exitEventGameObject.OnCollisionExitEvent = null;
-                timeLineAlertTarget.Leave(timeLineAlertSeriailztion, collider,_gameObject);
+                timeLineAlertTarget.Leave(timeLineAlertSeriailztion, collider, _gameObject);
             }
         }
 
@@ -85,58 +107,50 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 return;
             }
 
-            if (!string.IsNullOrEmpty(timeLineAlertSeriailztion.guid))
-            {
-                SpecialDotInfo specialDotInfo = castEntity.GetMainHotPoin<ILifetCycleHitPoint>(true)
-                    .GetSpecialDotInfo(timeLineAlertSeriailztion.guid);
-                specialDotInfo.targetTran.gameObject.SetActive(false);
-                ITimeLineAlertTargetEnter timeLineAlertTarget =
-                    _timeLineTriggerEntity as ITimeLineAlertTargetEnter;
-                if (timeLineAlertTarget != null)
-                {
-                    timeLineAlertTarget.LeaveAlert(timeLineAlertSeriailztion,specialDotInfo.targetTran.gameObject);
-                }
-            }
-
-            _enterRegister?.UnRegister();
-            _exitRegister?.UnRegister();
-            _enterRegister = null;
-            _exitRegister = null;
+            ClearTrigger();
         }
 
         protected override void ProTimeUpdate()
         {
+            // if (_gameObject != null)
+            // {
+            //     if (timeLineAlertSeriailztion.isFixedPoint)
+            //     {
+            //         
+            //     }
+            // }
         }
 
         protected override void ProBreakTimeLine()
         {
-            TimeLineAlertSeriailztion timeLineAlertSeriailztion =
-                mTimeLineAssetSerialization as TimeLineAlertSeriailztion;
-            if (!string.IsNullOrEmpty(timeLineAlertSeriailztion.guid))
+            ClearTrigger();
+        }
+
+        protected void ClearTrigger()
+        {
+            if (_gameObject != null)
             {
-                SpecialDotInfo specialDotInfo = castEntity.GetMainHotPoin<ILifetCycleHitPoint>(true)
-                    .GetSpecialDotInfo(timeLineAlertSeriailztion.guid);
-                specialDotInfo.targetTran.gameObject.SetActive(false);
+                _gameObject.SetActive(false);
                 ITimeLineAlertTargetEnter timeLineAlertTarget =
                     _timeLineTriggerEntity as ITimeLineAlertTargetEnter;
                 if (timeLineAlertTarget != null)
                 {
-                    timeLineAlertTarget.LeaveAlert(timeLineAlertSeriailztion,specialDotInfo.targetTran.gameObject);
+                    timeLineAlertTarget.LeaveAlert(timeLineAlertSeriailztion, _gameObject);
                 }
             }
 
+            GObjectPool.Instance.Recycle(_newGameObjectPool);
             _enterRegister?.UnRegister();
             _exitRegister?.UnRegister();
             _enterRegister = null;
             _exitRegister = null;
+            _newGameObjectPool = null;
+            _gameObject = null;
         }
 
         protected override void ProDispose()
         {
-            _enterRegister?.UnRegister();
-            _exitRegister?.UnRegister();
-            _enterRegister = null;
-            _exitRegister = null;
+            ClearTrigger();
         }
     }
 }

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ILifeCycle.cs

@@ -5,6 +5,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface
 {
     public interface ILifeCycle
     {
+        string guidName { get; }
         T This<T>();
         T GetILifetCycleHitPoint<T>(string hitPoinName, bool isStandType, bool isIgnoreHind)where T : ILifetCycleHitPoint;
         T GetMainHotPoin<T>(bool isIgnoreHind)where T : ILifetCycleHitPoint;

Assets/Scripts/GameTimeLine/SerializationTimeLine/TimeLineSerialization/TimeLineAlertSeriailztion.cs

@@ -11,6 +11,8 @@ public class TimeLineAlertSeriailztion : TimeLineAssetSerialization
     public bool isFindMyHero;
     public TimeLineAlertType alertType;
     public bool manualClose;
+    public bool isFixedPoint;
+    public bool isNew;
     public enum TimeLineAlertType
     {
         /// <summary>
@@ -40,6 +42,7 @@ public class TimeLineAlertSeriailztion : TimeLineAssetSerialization
         isFindEnemy = audioPlayableAsset.isFindEnemy;
         isFindMyHero = audioPlayableAsset.isFindMyHero;
         manualClose = audioPlayableAsset.manualClose;
+        isNew = audioPlayableAsset.isNew;
     }
 #endif
     public override TimeLineEventLogicBasic CreateLogic()

Assets/Scripts/GameUI/GameApplction.cs

@@ -24,7 +24,9 @@ public class GameApplction : IGameStart
     public BundleLoadType BundleLoadType;
     public string h5Url;
     private Entity _root;
+
     private Entity _scene;
+
     // public bool isTest;
     public int levelBattleId = 1;
 
@@ -84,16 +86,16 @@ public class GameApplction : IGameStart
         MainSceneController.Instance.Init();
         await CombatDrive.Instance.Init();
         StartCombatInfo startCombatInfo = new StartCombatInfo();
-        startCombatInfo.CombatType =  CombatType.LevelBattle;
+        startCombatInfo.CombatType = CombatType.LevelBattle;
 #if UNITY_EDITOR
         TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
         if (testCombatHeroConfig != null)
         {
-            startCombatInfo.CombatType =  CombatType.TestCombat;
+            startCombatInfo.CombatType = CombatType.TestCombat;
         }
 #endif
-       
-        startCombatInfo.levelBattleId = levelBattleId;
+
+        startCombatInfo.levelBattleId = AccountFileInfo.Instance.playerData.levelBattle;
         CombatDrive.Instance.AddCombatController(new CombatController());
         gameStartUIPanel.ShowMassge("loadCombat");
         gameStartUIPanel.SetSlider(0.95f);

ProjectSettings/NavMeshAreas.asset

@@ -6,15 +6,15 @@ NavMeshProjectSettings:
   serializedVersion: 2
   areas:
   - name: Walkable
-    cost: 1
+    cost: 10
   - name: Not Walkable
     cost: 1
   - name: Jump
     cost: 2
-  - name: 
-    cost: 1
-  - name: 
+  - name: mainPath
     cost: 1
+  - name: overPath
+    cost: 5
   - name: 
     cost: 1
   - name: 
@@ -89,5 +89,43 @@ NavMeshProjectSettings:
     preserveTilesOutsideBounds: 0
     debug:
       m_Flags: 0
+  - serializedVersion: 3
+    agentTypeID: 1
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.75
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  - serializedVersion: 3
+    agentTypeID: 2
+    agentRadius: 1
+    agentHeight: 2
+    agentSlope: 36
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
   m_SettingNames:
   - Humanoid
+  - Humanoid for Navigation Sample
+  - Ogre for Navigation Sample

ProjectSettings/TagManager.asset

@@ -11,8 +11,8 @@ TagManager:
   - 
   - Water
   - UI
-  - 
-  - 
+  - zhuangshi
+  - hongpei
   - 
   - 
   - 

UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Game
+  m_Title: Project
   m_RootView: {fileID: 7}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -40,9 +40,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 756
+    y: 637
     width: 640
-    height: 142
+    height: 119
   m_MinSize: {x: 102, y: 121}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 17}
@@ -70,11 +70,11 @@ MonoBehaviour:
     x: 721
     y: 0
     width: 640
-    height: 898
+    height: 756
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 3368
+  controlID: 71
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -94,7 +94,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 721
-    height: 898
+    height: 756
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 18}
@@ -120,13 +120,13 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 401
+    y: 543
     width: 1361
-    height: 898
+    height: 756
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 0
-  controlID: 3367
+  controlID: 70
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -146,7 +146,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 640
-    height: 756
+    height: 637
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 22}
@@ -203,7 +203,7 @@ MonoBehaviour:
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: 2 by 3
+  m_LastLoadedLayoutName: 
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -230,7 +230,7 @@ MonoBehaviour:
   m_MinSize: {x: 500, y: 150}
   m_MaxSize: {x: 40480, y: 24288}
   vertical: 0
-  controlID: 766
+  controlID: 240
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -277,7 +277,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 150}
   m_MaxSize: {x: 16192, y: 24288}
   vertical: 1
-  controlID: 717
+  controlID: 69
   draggingID: 0
 --- !u!114 &12
 MonoBehaviour:
@@ -375,7 +375,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1361
-    height: 401
+    height: 543
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 23}
@@ -543,9 +543,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 721
-    y: 1230
+    y: 1253
     width: 638
-    height: 121
+    height: 98
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -586,9 +586,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 474
+    y: 616
     width: 720
-    height: 877
+    height: 735
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -636,20 +636,20 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 08b1faff
-      m_LastClickedID: -347896
-      m_ExpandedIDs: 7acffdff80cffdff04d2fdffc2e9fdffc8e9fdff32ecfdff1217feff1817feff6419feff6c1afeffd6f3ffffb8b40000d8b40000
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 4422fdff9a22fdff6673fdffbc73fdfffab8ffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: TestCombat
-        m_OriginalName: TestCombat
+        m_Name: water
+        m_OriginalName: water
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -314382
+        m_UserData: -187888
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
@@ -754,7 +754,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/VFX
+    - Assets/Art/Chapter
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -762,32 +762,32 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/VFX
+  - Assets/Art/Chapter
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 134}
-    m_SelectedIDs: 64b50000
-    m_LastClickedID: 46436
-    m_ExpandedIDs: 0000000032b5000034b5000036b5000038b500003ab500003cb500003eb5000040b5000042b5000044b5000046b5000048b500004ab500004cb500004eb5000050b5000052b5000054b5000056b5000058b500005ab500005cb500005eb5000060b5000062b5000082b7000090b700001ef800002cf800002ef8000030f8000032f8000038f800003ef800004cf8000050f8000054f8000056f8000064f8000066f8000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 5cbe0000
+    m_LastClickedID: 48732
+    m_ExpandedIDs: 00000000babb0000bcbb0000bebb0000c0bb0000c2bb0000c4bb0000c6bb0000c8bb0000cabb0000ccbb0000cebb0000d0bb0000d2bb0000d4bb0000d6bb0000d8bb0000dabb0000dcbb0000debb0000e0bb0000e2bb0000e4bb0000e6bb0000e8bb0000eabb0000ecbb0000eebb0000f0bb0000f2bb0000f4bb0000f6bb0000f8bb0000fabb0000fcbb0000febb000000bc000002bc000004bc00008abe000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: BakedAssets
+      m_OriginalName: BakedAssets
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 48730
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 13}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -799,7 +799,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000032b5000034b5000036b5000038b500003ab500003cb500003eb5000040b5000042b5000044b5000046b5000048b500004ab500004cb500004eb5000050b5000052b5000054b5000056b5000058b500005ab500005cb500005eb5000060b5000062b5000064b5000000ca9a3bffffff7f
+    m_ExpandedIDs: 00000000babb0000bcbb0000bebb0000c0bb0000c2bb0000c4bb0000c6bb0000c8bb0000cabb0000ccbb0000cebb0000d0bb0000d2bb0000d4bb0000d6bb0000d8bb0000dabb0000dcbb0000debb0000e0bb0000e2bb0000e4bb0000e6bb0000e8bb0000eabb0000ecbb0000eebb0000f0bb0000f2bb0000f4bb0000f6bb0000f8bb0000fabb0000fcbb0000febb000000bc000002bc000004bc0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -876,9 +876,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 721
-    y: 474
+    y: 616
     width: 638
-    height: 735
+    height: 616
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -932,22 +932,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 638
-      height: 714
-    m_Scale: {x: 0.43965518, y: 0.43965518}
-    m_Translation: {x: 319, y: 357}
+      height: 595
+    m_Scale: {x: 0.36637932, y: 0.36637932}
+    m_Translation: {x: 319, y: 297.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -725.5686
+      x: -870.6823
       y: -812
-      width: 1451.1372
+      width: 1741.3646
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.43965518
-  m_LastWindowPixelSize: {x: 638, y: 735}
+  m_defaultScale: 0.36637932
+  m_LastWindowPixelSize: {x: 638, y: 616}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -976,7 +976,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 1360
-    height: 380
+    height: 522
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -991,8 +991,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: -156, y: -26}
+      snapOffset: {x: -156, y: -26}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -1277,8 +1277,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: -114}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: 48, y: -172}
+      snapOffsetDelta: {x: 0, y: -70}
       snapCorner: 2
       id: AINavigationOverlay
       index: 9
@@ -1335,9 +1335,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.013046265, y: 0.92566824, z: 1.6749573}
+    m_Target: {x: 3.281315, y: 5.2639074, z: -1.1020046}
     speed: 2
-    m_Value: {x: -22.807297, y: -0.99843895, z: -6.5913196}
+    m_Value: {x: 3.281315, y: 5.2639074, z: -1.1020046}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1383,13 +1383,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.29046008, y: -0.081393495, z: 0.024800133, w: 0.95310694}
+    m_Target: {x: -0.14116073, y: -0.32993627, z: 0.049978696, w: -0.93207264}
     speed: 2
-    m_Value: {x: 0.29045722, y: -0.08139269, z: 0.024799887, w: 0.9530975}
+    m_Value: {x: -0.13983363, y: -0.32860526, z: 0.049272977, w: -0.932758}
   m_Size:
-    m_Target: 141.51425
+    m_Target: 23.085087
     speed: 2
-    m_Value: 11.976315
+    m_Value: 22.090992
   m_Ortho:
     m_Target: 0
     speed: 2