修改bug

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

@@ -1923,7 +1923,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/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: 6803541630123670628}
+  - {fileID: 5244402482557082610}
   m_Father: {fileID: 6001636383538241202}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3546143889832522247
@@ -895,123 +1012,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6572213520011745246}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4296953085065773557
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6803541630123670628}
-  - component: {fileID: 7768250788026869898}
-  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 &6803541630123670628
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4296953085065773557}
-  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 &7768250788026869898
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4296953085065773557}
-  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 &4341971217884042045
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/GuaiwuBoss01.prefab

@@ -170,7 +170,7 @@ Transform:
   - {fileID: 5604520466445514036}
   - {fileID: 7152154869661391420}
   - {fileID: 186394833937686985}
-  - {fileID: 4179773209861593466}
+  - {fileID: 2681985770085121986}
   m_Father: {fileID: 9186905882593900606}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &185306020276039974
@@ -1016,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
@@ -2007,175 +2007,6 @@ Transform:
   - {fileID: 3704955700275525601}
   m_Father: {fileID: 8770773769941151548}
   m_LocalEulerAnglesHint: {x: 0.03982899, y: -1.908675, z: -5.7134743}
---- !u!1 &3591580769421667774
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4179773209861593466}
-  - component: {fileID: 5258832792905881964}
-  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 &4179773209861593466
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3591580769421667774}
-  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 &5258832792905881964
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3591580769421667774}
-  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 &3931151716073885074
 GameObject:
   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

@@ -25,8 +25,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 86125562296384508}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.47034922, y: 0.52798855, z: 0.4703488, w: -0.5279883}
-  m_LocalPosition: {x: -0, y: 2.1191514, z: -0.030209715}
+  m_LocalRotation: {x: -0.5264593, y: 0.4720604, z: 0.526459, w: -0.4720599}
+  m_LocalPosition: {x: 0, y: 0.8208768, z: 0.029861292}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -61,8 +61,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 200590390949787114}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00030533338, y: 0.06031341, z: 0.4272641, w: 0.90211284}
-  m_LocalPosition: {x: -0.11690239, y: -0.00000015258789, z: 0}
+  m_LocalRotation: {x: -0.0077036307, y: 0.060617372, z: 0.3060166, w: 0.95006317}
+  m_LocalPosition: {x: -0.11690246, y: 0, z: 0}
   m_LocalScale: {x: 0.99999434, y: 1.0000086, z: 0.9999984}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -93,8 +93,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 270174568189249402}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.31164816, y: -0.55605876, z: -0.436805, w: 0.6347247}
-  m_LocalPosition: {x: 0.42137685, y: 1.557145, z: 0.34199747}
+  m_LocalRotation: {x: 0.4449965, y: -0.4449965, z: -0.5495254, w: 0.5495254}
+  m_LocalPosition: {x: 0.42137685, y: -0.0000000021784694, z: -0.09404188}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -125,8 +125,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 711179939441956389}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.29644576, y: -0.38416594, z: -0.6017675, w: 0.6343598}
-  m_LocalPosition: {x: 0.66296124, y: 3.8157866, z: 0.28427786}
+  m_LocalRotation: {x: 0.4516645, y: 0.76765454, z: -0.18636133, w: 0.4146989}
+  m_LocalPosition: {x: 1.1610225, y: 1.2583572, z: -0.21241707}
   m_LocalScale: {x: 1.0000049, y: 0.99999875, z: 0.9999997}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -157,8 +157,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1070476745202724230}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.6032169, y: 0.3468231, z: 0.62439024, w: -0.35493675}
-  m_LocalPosition: {x: 0.0054399334, y: 3.017741, z: 0.040918615}
+  m_LocalRotation: {x: -0.6322918, y: 0.29013866, z: 0.652663, w: -0.30009606}
+  m_LocalPosition: {x: 0.0054963897, y: 1.6878337, z: 0.28877723}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -217,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:
@@ -257,8 +257,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1231884649426587495}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000049879056, y: -0.00000007290854, z: -0.2329241, w: 0.97249496}
-  m_LocalPosition: {x: -0.32917708, y: 0.21105285, z: 0.000000057220458}
+  m_LocalRotation: {x: 0.000000019174742, y: 0.0000000053434586, z: -0.0150581375, w: 0.99988663}
+  m_LocalPosition: {x: -0.32917693, y: 0.21105331, z: 0.000000056028366}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -289,8 +289,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1619295435195580989}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.35003835, y: 0.17633721, z: -0.821382, w: 0.414379}
-  m_LocalPosition: {x: -0.8027895, y: 3.4113874, z: 0.4409453}
+  m_LocalRotation: {x: 0.5387542, y: 0.62956405, z: -0.20241477, w: 0.52193993}
+  m_LocalPosition: {x: -1.0393211, y: 1.4057944, z: -0.07282051}
   m_LocalScale: {x: 1, y: 1.0000051, z: 0.9999976}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -321,8 +321,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1724166033166439976}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.008243258, y: 0.008830596, z: 0.6336154, w: 0.7735539}
-  m_LocalPosition: {x: -0.16466217, y: 0, z: 0}
+  m_LocalRotation: {x: 0.0053581134, y: 0.01082053, z: 0.38283032, w: 0.9237398}
+  m_LocalPosition: {x: -0.16466224, y: 0.00000015258789, z: 0}
   m_LocalScale: {x: 0.99999636, y: 1.0000073, z: 0.9999987}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -354,8 +354,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1788903297116605029}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.08650991, y: -0.68481386, z: 0.07817381, w: 0.7193294}
-  m_LocalPosition: {x: 0.0000001483014, y: 2.1708307, z: -0.35847753}
+  m_LocalRotation: {x: 0.046958175, y: -0.6571446, z: -0.053621057, w: 0.750387}
+  m_LocalPosition: {x: 0.00000020674452, y: 0.94424355, z: -0.2787017}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -386,7 +386,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1904817557381817786}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.9703173, y: 0.13854696, z: 0.17733243, w: 0.08855685}
+  m_LocalRotation: {x: -0.055628844, y: 0.8646477, z: 0.31489086, w: 0.38747072}
   m_LocalPosition: {x: 0.036696624, y: -0.023853835, z: 0.59173596}
   m_LocalScale: {x: 1, y: 1.0000025, z: 0.99999917}
   m_ConstrainProportionsScale: 0
@@ -419,8 +419,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2439839773977033699}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.04184752, y: -0.61671424, z: -0.24248756, w: 0.747738}
-  m_LocalPosition: {x: -0.19916545, y: 2.0215702, z: -1.1525521}
+  m_LocalRotation: {x: 0.25911745, y: -0.34766525, z: -0.53848916, w: 0.72250706}
+  m_LocalPosition: {x: -0.3141871, y: 1.2313658, z: -0.97081167}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -451,8 +451,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2551447232934125662}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0065703676, y: -0.0025758338, z: -0.079616114, w: 0.99680066}
-  m_LocalPosition: {x: -0.45112833, y: 0.000000038146986, z: 0.0000000019744042}
+  m_LocalRotation: {x: -0.00648959, y: -0.0027175497, z: -0.06967955, w: 0.99754465}
+  m_LocalPosition: {x: -0.4511282, y: -0.000000076293944, z: -5.9604643e-10}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -486,8 +486,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2571632436207155856}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.18069044, y: 0.72567576, z: -0.30853793, w: 0.587835}
-  m_LocalPosition: {x: 0.5955356, y: 2.9953277, z: -0.01698565}
+  m_LocalRotation: {x: 0.46377638, y: 0.45004553, z: 0.7288665, w: -0.22610633}
+  m_LocalPosition: {x: 0.5955909, y: 1.6759923, z: 0.22782657}
   m_LocalScale: {x: 1.0000001, y: 1.0000024, z: 1.0000012}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -518,8 +518,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2592031841202879942}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0041948245, y: 0.009663501, z: -0.13806367, w: 0.99036735}
-  m_LocalPosition: {x: -0.17086586, y: -0.00000030517577, z: 0}
+  m_LocalRotation: {x: -0.003378683, y: 0.012296183, z: -0.07949457, w: 0.99675375}
+  m_LocalPosition: {x: -0.17086586, y: 0.00000015258789, z: -0.0000000023841857}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -551,8 +551,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2665638312542976889}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.011188018, y: -0.018679572, z: 0.5222554, w: 0.8525111}
-  m_LocalPosition: {x: -0.43479612, y: -0.000000076293944, z: -0.00000030517577}
+  m_LocalRotation: {x: -0.0053104227, y: -0.020986756, z: 0.2533936, w: 0.967121}
+  m_LocalPosition: {x: -0.4347965, y: 0, z: -0.000000076293944}
   m_LocalScale: {x: 0.9999983, y: 1.0000036, z: 0.9999983}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -585,7 +585,7 @@ Transform:
   m_GameObject: {fileID: 2841529688900759015}
   serializedVersion: 2
   m_LocalRotation: {x: -2.7380778e-29, y: -1.926751e-15, z: -1.4210855e-14, w: 1}
-  m_LocalPosition: {x: -0.17374778, y: -0.00000015258789, z: 0}
+  m_LocalPosition: {x: -0.17374775, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -616,8 +616,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2878542815544745401}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.26597774, y: 0.5173486, z: -0.24530685, w: 0.7755197}
-  m_LocalPosition: {x: -0.5873293, y: 3.0011232, z: 0.020514403}
+  m_LocalRotation: {x: 0.70126206, y: -0.015738921, z: 0.3721794, w: 0.6078374}
+  m_LocalPosition: {x: -0.5872719, y: 1.67508, z: 0.26576075}
   m_LocalScale: {x: 1.0000004, y: 1.0000029, z: 0.9999995}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -648,8 +648,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3104221040812081716}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.03700229, y: 0.06439394, z: 0.37930396, w: 0.92228675}
-  m_LocalPosition: {x: -0.17699051, y: 0, z: 0}
+  m_LocalRotation: {x: 0.028608046, y: 0.0695861, z: 0.25587064, w: 0.9637788}
+  m_LocalPosition: {x: -0.17699027, y: 0, z: 0}
   m_LocalScale: {x: 0.9999981, y: 1.000006, z: 0.9999972}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -681,8 +681,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3287595047445388853}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.14761782, y: -0.61261183, z: -0.38641986, w: 0.67349494}
-  m_LocalPosition: {x: -0.2331781, y: 2.1373193, z: -1.4045836}
+  m_LocalRotation: {x: 0.31064558, y: -0.23734267, z: -0.7313786, w: 0.55879617}
+  m_LocalPosition: {x: -0.36401203, y: 1.4991314, z: -1.0332106}
   m_LocalScale: {x: 1.0000011, y: 0.999999, z: 0.9999991}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -713,8 +713,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3353322549378363692}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.7279612, y: 0.49338835, z: -0.40690446, w: 0.24712206}
-  m_LocalPosition: {x: 0.7479573, y: 3.3863802, z: 0.44706833}
+  m_LocalRotation: {x: 0.11894855, y: 0.4717918, z: 0.7546837, w: 0.44013217}
+  m_LocalPosition: {x: 0.88815236, y: 1.6210318, z: -0.32252556}
   m_LocalScale: {x: 0.9999993, y: 1.000001, z: 1.0000036}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -745,8 +745,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3385547748999296887}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.014778244, y: -0.010066984, z: -0.56216925, w: 0.8268289}
-  m_LocalPosition: {x: -0.39952844, y: 0.0000000030136034, z: 0.0000000012206822}
+  m_LocalRotation: {x: 0.01476124, y: -0.010035775, z: -0.56230915, w: 0.8267345}
+  m_LocalPosition: {x: -0.3995285, y: 0.000000019073486, z: 0.000000038146972}
   m_LocalScale: {x: 0.99998665, y: 1.0000135, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -778,7 +778,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3526959730678984865}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.020635974, y: 0.014303169, z: 0.74738854, w: 0.6639127}
+  m_LocalRotation: {x: -0.052233852, y: 0.04050861, z: 0.6935284, w: 0.7173904}
   m_LocalPosition: {x: -0.08911529, y: -0.32013878, z: 0.000000062137694}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -811,8 +811,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3545127674154143179}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.8824634, y: -0.17756322, z: -0.16931684, w: 0.4013246}
-  m_LocalPosition: {x: -0.46702772, y: 0, z: 0.000000019073486}
+  m_LocalRotation: {x: -0.85801625, y: -0.050859027, z: 0.047633246, w: 0.5088738}
+  m_LocalPosition: {x: -0.467028, y: 0, z: 0}
   m_LocalScale: {x: 1.0000021, y: 1.0000077, z: 0.99998784}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -845,7 +845,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3893271970294112426}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.97883856, y: 0.16250716, z: -0.11754532, w: 0.040615585}
+  m_LocalRotation: {x: 0.19988687, y: 0.8330007, z: -0.34796074, w: -0.3808915}
   m_LocalPosition: {x: 0.03669647, y: -0.023853911, z: -0.5917356}
   m_LocalScale: {x: 0.99999976, y: 1.000002, z: 1.0000008}
   m_ConstrainProportionsScale: 0
@@ -1173,8 +1173,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4046579494948202311}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0112056555, y: 0.018695556, z: 0.5228805, w: 0.8521273}
-  m_LocalPosition: {x: -0.43479612, y: 0.000000076293944, z: -0.00000015258789}
+  m_LocalRotation: {x: 0.0047409404, y: 0.02112287, z: 0.22713864, w: 0.9736218}
+  m_LocalPosition: {x: -0.43479595, y: -0.00000015258789, z: 0}
   m_LocalScale: {x: 1.0000026, y: 0.9999961, z: 1.0000024}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1238,8 +1238,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4197335696632431206}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.010561295, y: -0.027215894, z: 0.51705855, w: 0.85545206}
-  m_LocalPosition: {x: -0.1838971, y: 0, z: 0}
+  m_LocalRotation: {x: 0.018512305, y: -0.022440398, z: 0.22057085, w: 0.974937}
+  m_LocalPosition: {x: -0.18389694, y: -0.000000076293944, z: -0.000000076293944}
   m_LocalScale: {x: 1.0000057, y: 0.9999926, z: 1.0000015}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1270,8 +1270,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4812103388191995797}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.8422106, y: -0.08706564, z: -0.3171709, w: 0.42720437}
-  m_LocalPosition: {x: -0.4670282, y: 0, z: -0.000000019073486}
+  m_LocalRotation: {x: 0.8167242, y: -0.2208132, z: -0.27320942, w: 0.4577771}
+  m_LocalPosition: {x: -0.46702796, y: 0, z: 0}
   m_LocalScale: {x: 1.0000048, y: 0.9999959, z: 0.99999905}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1304,8 +1304,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4857992436370834085}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.020211399, y: -0.0014411723, z: -0.110039584, w: 0.99372065}
-  m_LocalPosition: {x: -0.33381596, y: 0, z: 0.000000019073486}
+  m_LocalRotation: {x: -0.019610394, y: 0.04251758, z: -0.1875666, w: 0.9811353}
+  m_LocalPosition: {x: -0.3338159, y: 0, z: 0.000000019073486}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1337,8 +1337,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4936482524222935355}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.008264174, y: -0.008849895, z: 0.6341845, w: 0.77308697}
-  m_LocalPosition: {x: -0.16466217, y: 0, z: -0.00000015258789}
+  m_LocalRotation: {x: -0.0050636474, y: -0.0109616015, z: 0.35770482, w: 0.93375665}
+  m_LocalPosition: {x: -0.16466217, y: 0.00000015258789, z: -0.000000038146972}
   m_LocalScale: {x: 1.0000054, y: 0.9999937, z: 1.0000015}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1370,8 +1370,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5090988702532517011}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.6801402, y: 0.19142015, z: -0.6799528, w: -0.1960404}
-  m_LocalPosition: {x: 0.017226918, y: 3.0114975, z: 0.76628274}
+  m_LocalRotation: {x: 0.70756125, y: 0.016955867, z: -0.7061334, w: -0.021098772}
+  m_LocalPosition: {x: 0.016578047, y: 1.6463248, z: 1.062619}
   m_LocalScale: {x: 1.0000008, y: 1.0000014, z: 0.9999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1402,8 +1402,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5145668203771053083}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7059388, y: 0.029711613, z: -0.7068201, w: -0.034250878}
-  m_LocalPosition: {x: 0.01827812, y: 3.2514296, z: 0.4575232}
+  m_LocalRotation: {x: 0.7077364, y: 0.0062994026, z: -0.70637107, w: -0.010463288}
+  m_LocalPosition: {x: 0.01847454, y: 1.8651162, z: 0.73853904}
   m_LocalScale: {x: 1.0000004, y: 1.000001, z: 0.99999946}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1434,7 +1434,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5479142369545944545}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5096928, y: 0.5290479, z: 0.26908475, w: 0.62282825}
+  m_LocalRotation: {x: 0.20333424, y: 0.43457133, z: 0.26247755, w: 0.83720285}
   m_LocalPosition: {x: -0.1369247, y: 0.00006164551, z: 0.19129841}
   m_LocalScale: {x: 1.0000062, y: 1.0000001, z: 0.99999374}
   m_ConstrainProportionsScale: 0
@@ -1467,7 +1467,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5538908480644949793}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.008424369, y: -0.0036844027, z: -0.283389, w: 0.958961}
+  m_LocalRotation: {x: -0.008322109, y: -0.0038738297, z: -0.2706587, w: 0.9626316}
   m_LocalPosition: {x: -0.3217127, y: 0, z: 4.6566128e-12}
   m_LocalScale: {x: 1, y: 0.9999999, z: 0.99999994}
   m_ConstrainProportionsScale: 0
@@ -1500,8 +1500,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5938929557149533814}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.092726596, y: -0.59866554, z: -0.038866546, w: 0.7946639}
-  m_LocalPosition: {x: -0.113414116, y: 2.0366445, z: -0.8591371}
+  m_LocalRotation: {x: 0.14523794, y: -0.4525876, z: -0.26883313, w: 0.8377345}
+  m_LocalPosition: {x: -0.17774957, y: 1.0532731, z: -0.76262724}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1532,8 +1532,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5981655541167571906}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.4499295, y: 0.8749093, z: -0.06710438, w: 0.16611487}
-  m_LocalPosition: {x: -0.00000015258789, y: 0, z: 0.23311856}
+  m_LocalRotation: {x: -0.4454432, y: 0.8754144, z: -0.065586045, w: 0.17586501}
+  m_LocalPosition: {x: -0.000000076293944, y: -0.0000000047683715, z: 0.23311827}
   m_LocalScale: {x: 0.999998, y: 1.0000001, z: 1.0000021}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1565,8 +1565,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6059128517831830223}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00293218, y: -0.10082991, z: 0.8610484, w: 0.49841788}
-  m_LocalPosition: {x: -0.38369223, y: 0.00000015258789, z: 0}
+  m_LocalRotation: {x: 0.00514352, y: -0.056454428, z: 0.4820993, w: 0.8742807}
+  m_LocalPosition: {x: -0.38369223, y: 0.000000009536743, z: 0}
   m_LocalScale: {x: 0.9999838, y: 0.99999875, z: 1.0000181}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1598,143 +1598,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6083851976247242217}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.141904, y: -0.58434296, z: 0.06078825, w: 0.79668766}
-  m_LocalPosition: {x: -0.010032626, y: 2.124338, z: -0.5540875}
+  m_LocalRotation: {x: 0.06260583, y: -0.5121818, z: -0.10393041, w: 0.85026395}
+  m_LocalPosition: {x: -0.026285062, y: 0.97286767, z: -0.47622442}
   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!1 &6158791923464642931
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3215785956353651322}
-  - component: {fileID: 300817815350685178}
-  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 &3215785956353651322
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6158791923464642931}
-  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 &300817815350685178
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6158791923464642931}
-  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 &6295981056241540115
 GameObject:
   m_ObjectHideFlags: 0
@@ -1760,8 +1630,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6295981056241540115}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.005501823, y: 0.041120812, z: 0.35116333, w: 0.93539464}
-  m_LocalPosition: {x: -0.3836922, y: 0.00000015258789, z: 0.000000076293944}
+  m_LocalRotation: {x: -0.004897496, y: 0.06440701, z: 0.55002284, w: 0.832648}
+  m_LocalPosition: {x: -0.38369212, y: 0.000000076293944, z: 0}
   m_LocalScale: {x: 0.99997956, y: 1.0000025, z: 1.0000169}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1793,8 +1663,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6310608813353768762}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0186095, y: -0.01832407, z: -0.24587251, w: 0.9689503}
-  m_LocalPosition: {x: -0.3060604, y: -0.00000015258789, z: 0}
+  m_LocalRotation: {x: -0.03811323, y: 0.02719691, z: -0.32365632, w: 0.94501555}
+  m_LocalPosition: {x: -0.3060603, y: -0.000000038146972, z: 0.000000019073486}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1826,8 +1696,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6452323699050527433}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.22092287, y: 0.05679988, z: -0.6676955, w: 0.70862514}
-  m_LocalPosition: {x: -0.62569976, y: 0, z: 0.000000038146972}
+  m_LocalRotation: {x: 0.19258367, y: 0.048428625, z: -0.76725954, w: 0.6098189}
+  m_LocalPosition: {x: -0.62569976, y: 0.000000076293944, z: 0.00000015258789}
   m_LocalScale: {x: 0.99999774, y: 1.0000046, z: 0.9999978}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1859,8 +1729,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6491995867090373214}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.4744646, y: -0.5954122, z: -0.3814241, w: 0.5242932}
-  m_LocalPosition: {x: -0.42137682, y: 1.4208153, z: 0.613517}
+  m_LocalRotation: {x: 0.5396869, y: -0.5396869, z: -0.45687857, w: 0.45687857}
+  m_LocalPosition: {x: -0.42137685, y: -0.000000022923794, z: 0.3805559}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1891,8 +1761,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6494272691704038537}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.68218887, y: 0.6622943, z: -0.1826661, w: -0.25023523}
-  m_LocalPosition: {x: -0.610595, y: 3.7869606, z: 0.24064164}
+  m_LocalRotation: {x: -0.15398082, y: 0.44183606, z: 0.4346333, w: 0.7695224}
+  m_LocalPosition: {x: -1.0978652, y: 1.1876625, z: 0.33596575}
   m_LocalScale: {x: 1.0000023, y: 1.000007, z: 0.999991}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1947,7 +1817,7 @@ Transform:
   - {fileID: 1526026978610125936}
   - {fileID: 421740885926511694}
   - {fileID: 3406155893323543535}
-  - {fileID: 3215785956353651322}
+  - {fileID: 3408970510815634287}
   m_Father: {fileID: 6644446483243639435}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6800229723977760576
@@ -1976,7 +1846,7 @@ Transform:
   m_GameObject: {fileID: 6800229723977760576}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -1.926751e-15, z: -0, w: 1}
-  m_LocalPosition: {x: -0.17374778, y: 0.000000076293944, z: 0.000000057220458}
+  m_LocalPosition: {x: -0.1737477, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2007,7 +1877,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6978674707199995556}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.03911507, y: -0.064297564, z: 0.40313303, w: 0.9120415}
+  m_LocalRotation: {x: -0.026715083, y: -0.07033481, z: 0.22970837, w: 0.97034705}
   m_LocalPosition: {x: -0.17699035, y: 0, z: 0}
   m_LocalScale: {x: 1.000003, y: 0.99999326, z: 1.0000029}
   m_ConstrainProportionsScale: 0
@@ -2040,8 +1910,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7160393596367934207}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0007035992, y: -0.18528037, z: -0.8127722, w: 0.55233324}
-  m_LocalPosition: {x: -0.22972587, y: -0.00000015258789, z: 0}
+  m_LocalRotation: {x: 0.034235124, y: -0.13342366, z: -0.67233753, w: 0.72731584}
+  m_LocalPosition: {x: -0.22972585, y: -0.000000038146972, z: 0}
   m_LocalScale: {x: 0.9999842, y: 1.0000138, z: 1.0000014}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2106,8 +1976,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7193081258656841766}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.12961897, y: 0.094970666, z: -0.1345458, w: 0.97779185}
-  m_LocalPosition: {x: -0.22972594, y: 0, z: 0}
+  m_LocalRotation: {x: -0.094174735, y: 0.104944296, z: -0.3356461, w: 0.9313751}
+  m_LocalPosition: {x: -0.22972591, y: -0.000000009536743, z: -0.000000038146972}
   m_LocalScale: {x: 0.99999076, y: 1.0000063, z: 1.0000025}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2139,8 +2009,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7203668380625466425}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.3738849, y: 0.8907417, z: 0.07804671, w: -0.2463697}
-  m_LocalPosition: {x: -0.000000028610238, y: -0.0000000011920841, z: -0.23311882}
+  m_LocalRotation: {x: 0.020367108, y: 0.9849794, z: -0.0051745963, w: -0.17138857}
+  m_LocalPosition: {x: -0, y: 0.000000009536743, z: -0.23311912}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2172,8 +2042,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7774619210802756602}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0075646034, y: -0.023094485, z: -0.1910286, w: 0.9812836}
-  m_LocalPosition: {x: -0.27941802, y: 0.00000015258789, z: 0.000000038146972}
+  m_LocalRotation: {x: -0.046818737, y: 0.0005585272, z: -0.2740218, w: 0.96058303}
+  m_LocalPosition: {x: -0.27941817, y: 0.000000076293944, z: 0.000000038146972}
   m_LocalScale: {x: 1.000001, y: 0.9999993, z: 0.99999976}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2204,8 +2074,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8265012657167822352}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.010568747, y: 0.0272223, z: 0.51642627, w: 0.85583365}
-  m_LocalPosition: {x: -0.18389678, y: -0.000000076293944, z: 0}
+  m_LocalRotation: {x: -0.017898379, y: 0.022932861, z: 0.24685687, w: 0.96861523}
+  m_LocalPosition: {x: -0.18389694, y: 0, z: 0}
   m_LocalScale: {x: 0.99999374, y: 1.0000075, z: 0.9999984}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2236,8 +2106,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8368151414826957885}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.03720603, y: 0.13108206, z: 0.028073031, w: 0.99027526}
-  m_LocalPosition: {x: -0.2013095, y: 0, z: 0.0000000023841857}
+  m_LocalRotation: {x: -0.03378188, y: 0.17288838, z: -0.0494859, w: 0.9831173}
+  m_LocalPosition: {x: -0.20130955, y: 0, z: 0.0000000047683715}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2270,7 +2140,7 @@ Transform:
   m_GameObject: {fileID: 8462637440063663762}
   serializedVersion: 2
   m_LocalRotation: {x: -0.0147555955, y: 0.01002882, z: -0.56203103, w: 0.8269237}
-  m_LocalPosition: {x: -0.39953047, y: 0, z: -0.000000019073486}
+  m_LocalPosition: {x: -0.39953056, y: -0.000000038146972, z: 0}
   m_LocalScale: {x: 0.9999824, y: 1.0000179, z: 1.0000002}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2302,8 +2172,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8548229733149848664}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0018375402, y: -0.06109568, z: 0.45052546, w: 0.89066875}
-  m_LocalPosition: {x: -0.116902314, y: 0, z: -0.00000030517577}
+  m_LocalRotation: {x: 0.009340803, y: -0.060386732, z: 0.2802105, w: 0.9579918}
+  m_LocalPosition: {x: -0.11690239, y: 0.000000076293944, z: 0}
   m_LocalScale: {x: 1.0000073, y: 0.9999909, z: 1.0000014}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2334,8 +2204,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8643451477295432694}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.2402163, y: -0.040379796, z: -0.60205895, w: 0.7603885}
-  m_LocalPosition: {x: -0.6256996, y: -0.00000015258789, z: 0}
+  m_LocalRotation: {x: -0.22678661, y: -0.04144811, z: -0.65670985, w: 0.71804047}
+  m_LocalPosition: {x: -0.6256998, y: 0.000000038146972, z: 0}
   m_LocalScale: {x: 0.9999972, y: 1.0000008, z: 1.0000023}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2367,7 +2237,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8694468699312487644}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.44866014, y: -0.49132648, z: 0.16787077, w: 0.72740763}
+  m_LocalRotation: {x: -0.21501389, y: -0.42891, z: 0.2850313, w: 0.8297967}
   m_LocalPosition: {x: -0.1369249, y: 0.00006164551, z: -0.19129702}
   m_LocalScale: {x: 1.0000029, y: 1.0000049, z: 0.999994}
   m_ConstrainProportionsScale: 0
@@ -2407,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
@@ -2432,8 +2432,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8982368678241853565}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.47034922, y: 0.52798855, z: 0.4703488, w: -0.5279883}
-  m_LocalPosition: {x: -0, y: 2.1191514, z: -0.030209715}
+  m_LocalRotation: {x: -0.5264593, y: 0.4720604, z: 0.526459, w: -0.4720599}
+  m_LocalPosition: {x: 0, y: 0.8208768, z: 0.029861292}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2464,7 +2464,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8985582254906064462}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0076571284, y: 0.0012852851, z: -0.4095583, w: 0.91225094}
+  m_LocalRotation: {x: 0.00882765, y: 0.00074191985, z: -0.35508573, w: 0.9347918}
   m_LocalPosition: {x: -0.29986525, y: 0.112408295, z: -0.000000018775463}
   m_LocalScale: {x: 0.9999999, y: 0.9999998, z: 1}
   m_ConstrainProportionsScale: 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,6 +965,122 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8787205196784000687}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3498946820109441183
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4226182959879159077}
+  - component: {fileID: 8728936297736493323}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Snake
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4226182959879159077
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  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}
+  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!137 &8728936297736493323
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3498946820109441183}
+  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: 6ce9e93c2002ac94cb085f8e956b979a, 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: 4300000, guid: a62c5c5d376520340aa80f2f3643c54e, type: 3}
+  m_Bones:
+  - {fileID: 5143234474626513360}
+  - {fileID: 5285919594899067276}
+  - {fileID: 3397348958077701037}
+  - {fileID: 8716847532705049779}
+  - {fileID: 5003350271741241538}
+  - {fileID: 4840958454781872170}
+  - {fileID: 5813257794237773505}
+  - {fileID: 8201221069484317407}
+  - {fileID: 1078899214313831993}
+  - {fileID: 6735320703583299998}
+  - {fileID: 367047842600741749}
+  - {fileID: 7573518848820368593}
+  - {fileID: 466200660489386939}
+  - {fileID: 3645342142042863319}
+  - {fileID: 4035317426346044846}
+  - {fileID: 2436724119264449505}
+  - {fileID: 5560808554936778689}
+  - {fileID: 9178408876606069835}
+  - {fileID: 8787205196784000687}
+  - {fileID: 6421891448395760146}
+  - {fileID: 9197793217300360267}
+  - {fileID: 8323974826564625335}
+  - {fileID: 6163235584362252033}
+  - {fileID: 2202811130362710149}
+  - {fileID: 2540533661632361194}
+  - {fileID: 5790668293197389476}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 4840958454781872170}
+  m_AABB:
+    m_Center: {x: 0.044933885, y: -0.59131086, z: 0.00000014901161}
+    m_Extent: {x: 0.8232857, y: 0.77953327, z: 0.19494277}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &3569495279892638607
 GameObject:
   m_ObjectHideFlags: 0
@@ -1312,7 +1428,7 @@ Transform:
   - {fileID: 1758221673950266174}
   - {fileID: 5337298767159027132}
   - {fileID: 4611672840595664709}
-  - {fileID: 3386122694379426552}
+  - {fileID: 4226182959879159077}
   m_Father: {fileID: 7760812738003230115}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5790529394969636121
@@ -1837,122 +1953,6 @@ Transform:
   - {fileID: 6805580368367737891}
   m_Father: {fileID: 7565395063929453049}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7409814381635794592
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3386122694379426552}
-  - component: {fileID: 3268828493489376079}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Snake
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3386122694379426552
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7409814381635794592}
-  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: 4907045407575232226}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3268828493489376079
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7409814381635794592}
-  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: 6ce9e93c2002ac94cb085f8e956b979a, 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: 4300000, guid: a62c5c5d376520340aa80f2f3643c54e, type: 3}
-  m_Bones:
-  - {fileID: 5143234474626513360}
-  - {fileID: 5285919594899067276}
-  - {fileID: 3397348958077701037}
-  - {fileID: 8716847532705049779}
-  - {fileID: 5003350271741241538}
-  - {fileID: 4840958454781872170}
-  - {fileID: 5813257794237773505}
-  - {fileID: 8201221069484317407}
-  - {fileID: 1078899214313831993}
-  - {fileID: 6735320703583299998}
-  - {fileID: 367047842600741749}
-  - {fileID: 7573518848820368593}
-  - {fileID: 466200660489386939}
-  - {fileID: 3645342142042863319}
-  - {fileID: 4035317426346044846}
-  - {fileID: 2436724119264449505}
-  - {fileID: 5560808554936778689}
-  - {fileID: 9178408876606069835}
-  - {fileID: 8787205196784000687}
-  - {fileID: 6421891448395760146}
-  - {fileID: 9197793217300360267}
-  - {fileID: 8323974826564625335}
-  - {fileID: 6163235584362252033}
-  - {fileID: 2202811130362710149}
-  - {fileID: 2540533661632361194}
-  - {fileID: 5790668293197389476}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4840958454781872170}
-  m_AABB:
-    m_Center: {x: 0.044933885, y: -0.59131086, z: 0.00000014901161}
-    m_Extent: {x: 0.8232857, y: 0.77953327, z: 0.19494277}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &7688313268560091805
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/GuaiwuJY02.prefab

@@ -98,6 +98,128 @@ Transform:
   - {fileID: 4240516874693082975}
   m_Father: {fileID: 1039189444445265039}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2017088198846713288
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 493194424238479749}
+  - component: {fileID: 6304163338602557005}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Wolf
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &493194424238479749
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  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}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3665228836952602755}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &6304163338602557005
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2017088198846713288}
+  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: 2776642bf9c243944bcbb03410608365, 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: 4300002, guid: 8eadd92c0e25f804390fe2903af26fa2, type: 3}
+  m_Bones:
+  - {fileID: 3250246228065924720}
+  - {fileID: 6313861291323765841}
+  - {fileID: 8804664168530374896}
+  - {fileID: 1514987306245583375}
+  - {fileID: 1039189444445265039}
+  - {fileID: 4771943624022819204}
+  - {fileID: 3850487937799775239}
+  - {fileID: 6148231717063731526}
+  - {fileID: 8520048105073323991}
+  - {fileID: 4399240984143285753}
+  - {fileID: 211879067497048550}
+  - {fileID: 5728798273534396450}
+  - {fileID: 7638614886231894078}
+  - {fileID: 8008787526121630026}
+  - {fileID: 8855963201371202857}
+  - {fileID: 754882107918407004}
+  - {fileID: 2154522385534560725}
+  - {fileID: 4240516874693082975}
+  - {fileID: 2050264221842376410}
+  - {fileID: 5596594386043354487}
+  - {fileID: 7246796051898738685}
+  - {fileID: 2378874638722600492}
+  - {fileID: 8679352028111397258}
+  - {fileID: 4422801918118584005}
+  - {fileID: 1727344106771222428}
+  - {fileID: 8363210629668278776}
+  - {fileID: 7120748382630682270}
+  - {fileID: 417970869730461443}
+  - {fileID: 1547677811705414553}
+  - {fileID: 5632865545599300935}
+  - {fileID: 6652236709935994450}
+  - {fileID: 4502745552551221346}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 1039189444445265039}
+  m_AABB:
+    m_Center: {x: -0.19215691, y: 0.17340446, z: 0.00000011920929}
+    m_Extent: {x: 1.7381974, y: 0.8824247, z: 0.43128508}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &2514461600052707320
 GameObject:
   m_ObjectHideFlags: 0
@@ -1301,7 +1423,7 @@ Transform:
   - {fileID: 1039189444445265039}
   - {fileID: 194680409552914847}
   - {fileID: 8642461612256899995}
-  - {fileID: 3841987488969789209}
+  - {fileID: 493194424238479749}
   m_Father: {fileID: 2266855535440488526}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5799352810247526486
@@ -1554,128 +1676,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 7638614886231894078}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8662219322218734154
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3841987488969789209}
-  - component: {fileID: 4387616260403665242}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Wolf
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3841987488969789209
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8662219322218734154}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 3.225772e-11}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3665228836952602755}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4387616260403665242
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8662219322218734154}
-  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: 2776642bf9c243944bcbb03410608365, 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: 4300002, guid: 8eadd92c0e25f804390fe2903af26fa2, type: 3}
-  m_Bones:
-  - {fileID: 3250246228065924720}
-  - {fileID: 6313861291323765841}
-  - {fileID: 8804664168530374896}
-  - {fileID: 1514987306245583375}
-  - {fileID: 1039189444445265039}
-  - {fileID: 4771943624022819204}
-  - {fileID: 3850487937799775239}
-  - {fileID: 6148231717063731526}
-  - {fileID: 8520048105073323991}
-  - {fileID: 4399240984143285753}
-  - {fileID: 211879067497048550}
-  - {fileID: 5728798273534396450}
-  - {fileID: 7638614886231894078}
-  - {fileID: 8008787526121630026}
-  - {fileID: 8855963201371202857}
-  - {fileID: 754882107918407004}
-  - {fileID: 2154522385534560725}
-  - {fileID: 4240516874693082975}
-  - {fileID: 2050264221842376410}
-  - {fileID: 5596594386043354487}
-  - {fileID: 7246796051898738685}
-  - {fileID: 2378874638722600492}
-  - {fileID: 8679352028111397258}
-  - {fileID: 4422801918118584005}
-  - {fileID: 1727344106771222428}
-  - {fileID: 8363210629668278776}
-  - {fileID: 7120748382630682270}
-  - {fileID: 417970869730461443}
-  - {fileID: 1547677811705414553}
-  - {fileID: 5632865545599300935}
-  - {fileID: 6652236709935994450}
-  - {fileID: 4502745552551221346}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 1039189444445265039}
-  m_AABB:
-    m_Center: {x: -0.19215691, y: 0.17340446, z: 0.00000011920929}
-    m_Extent: {x: 1.7381974, y: 0.8824247, z: 0.43128508}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &8753561217433862340
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -984,63 +984,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!1001 &6393061959258754656
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -22.807297
-      objectReference: {fileID: 0}
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.99843895
-      objectReference: {fileID: 0}
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -6.5913196
-      objectReference: {fileID: 0}
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: m_Name
-      value: TestCombat
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -1048,4 +991,3 @@ SceneRoots:
   - {fileID: 376281607}
   - {fileID: 235899921}
   - {fileID: 123020045}
-  - {fileID: 6393061959258754656}

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);