修改bug

Assets/Art/ArtHero/Hero01.prefab

@@ -1381,6 +1381,74 @@ Transform:
   - {fileID: 3729826595992030205}
   m_Father: {fileID: 3334596988467430101}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6675141631739625367
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3066313911199420915}
+  - component: {fileID: 6345317746653850660}
+  - component: {fileID: 4426689747203413737}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: sk1_triiger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &3066313911199420915
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6675141631739625367}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5896097632680916319}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &6345317746653850660
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6675141631739625367}
+  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_Radius: 3
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4426689747203413737
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6675141631739625367}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: sk1_trigger
 --- !u!1 &6681690047214919232
 GameObject:
   m_ObjectHideFlags: 0
@@ -1585,6 +1653,7 @@ Transform:
   - {fileID: 365283492470292916}
   - {fileID: 9170187791938028038}
   - {fileID: 5028651688233441521}
+  - {fileID: 3066313911199420915}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!320 &6820652189447161084

Assets/Art/ArtHero/Hero03.prefab

@@ -620,6 +620,7 @@ Transform:
   - {fileID: 5566078678204379718}
   - {fileID: 8258860829733667266}
   - {fileID: 2469182456857218531}
+  - {fileID: 3704018649951556546}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &6073723472531861278
@@ -679,6 +680,8 @@ PlayableDirector:
   m_ExposedReferences:
     m_References:
     - 700512f659d2a464bbc3462b672232e8: {fileID: 8771452655161073577}
+    - 2c026a978a482e447b5162ac72a82006: {fileID: 8771452655161073577}
+    - 409133c37d0ae71498d7e81d9e688b67: {fileID: 2647377009172443046}
     - 3edb651f38011914c84d67518bb3b8d1: {fileID: 267511645236318593}
     - 171433121f07e474abd3a25264b07948: {fileID: 2647377009172443046}
 --- !u!195 &292476500467395602
@@ -1841,6 +1844,74 @@ SkinnedMeshRenderer:
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
+--- !u!1 &8839865434331080530
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3704018649951556546}
+  - component: {fileID: 7870945802598159749}
+  - component: {fileID: 5795258874944744551}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: sk1_trigger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &3704018649951556546
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8839865434331080530}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.56, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4976044481617295284}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &7870945802598159749
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8839865434331080530}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.67358756, y: 0.87, z: 6.4000006}
+  m_Center: {x: -0.0041404963, y: 0.042170584, z: 3.365047}
+--- !u!114 &5795258874944744551
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8839865434331080530}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: sk1_trigger
 --- !u!1 &9070808392034755482
 GameObject:
   m_ObjectHideFlags: 0
@@ -2302,6 +2373,30 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_hero03_sk_hit
       objectReference: {fileID: 0}
+    - target: {fileID: 2032633485484465298, guid: 89b1194c65203d64c97232b0e3f2de47, type: 3}
+      propertyPath: randomSeed
+      value: 3387
+      objectReference: {fileID: 0}
+    - target: {fileID: 2032633485484465298, guid: 89b1194c65203d64c97232b0e3f2de47, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2764550553641739945, guid: 89b1194c65203d64c97232b0e3f2de47, type: 3}
+      propertyPath: randomSeed
+      value: 3387
+      objectReference: {fileID: 0}
+    - target: {fileID: 2764550553641739945, guid: 89b1194c65203d64c97232b0e3f2de47, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2838725910021987666, guid: 89b1194c65203d64c97232b0e3f2de47, type: 3}
+      propertyPath: randomSeed
+      value: 3387
+      objectReference: {fileID: 0}
+    - target: {fileID: 2838725910021987666, guid: 89b1194c65203d64c97232b0e3f2de47, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6828286202281684576, guid: 89b1194c65203d64c97232b0e3f2de47, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0
@@ -2497,6 +2592,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 2469182456857218531}
     m_Modifications:
+    - target: {fileID: 1064939640433162620, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: randomSeed
+      value: 6054
+      objectReference: {fileID: 0}
+    - target: {fileID: 1064939640433162620, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2345877856508813684, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0.025
@@ -2537,10 +2640,46 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5206726521450854177, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: randomSeed
+      value: 6054
+      objectReference: {fileID: 0}
+    - target: {fileID: 5206726521450854177, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5268265382216720648, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: randomSeed
+      value: 6054
+      objectReference: {fileID: 0}
+    - target: {fileID: 5268265382216720648, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5917502201312437783, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
       propertyPath: m_Name
       value: fx_hero03_sk
       objectReference: {fileID: 0}
+    - target: {fileID: 6014203449385061748, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: randomSeed
+      value: 6054
+      objectReference: {fileID: 0}
+    - target: {fileID: 6014203449385061748, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6569235484077252477, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: m_IsTrigger
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7537391795600004029, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: randomSeed
+      value: 6054
+      objectReference: {fileID: 0}
+    - target: {fileID: 7537391795600004029, guid: eacedfcc89db0b942ba18663d44cdc6b, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Art/HeroTimeLine/Hero01.playable

@@ -256,6 +256,18 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &-8265305729015716198
+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 &-7780608259791060097
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -458,6 +470,98 @@ MonoBehaviour:
     m_DisplayName: TimeLineTriggerAsset
   m_Markers:
     m_Objects: []
+--- !u!114 &-7379477113019173770
+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: 3fc2695741642bd42a34534ca2286500, type: 3}
+  m_Name: Customize 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: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 4478583637327799870}
+    m_Duration: 0.4
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -7379477113019173770}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: TimeLineAlertAsset
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-7343053274705415923
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1756,6 +1860,99 @@ MonoBehaviour:
     m_DisplayName: fx_hero01_dg_sk1
   m_Markers:
     m_Objects: []
+--- !u!114 &1169797055110047173
+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: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -8265305729015716198}
+    m_Duration: 0.8666666666666667
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 1169797055110047173}
+    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 &1477730321033259709
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1997,8 +2194,8 @@ MonoBehaviour:
   searchHierarchy: 0
   active: 1
   postPlayback: 2
-  targetType: 0
-  LocationType: 0
+  targetType: 2
+  LocationType: 1
   targetSpecialDotName: 
   hitPointGroupName: 
   isGround: 0
@@ -2035,6 +2232,8 @@ MonoBehaviour:
   - {fileID: 1097836342402878407}
   - {fileID: 4575926026599301297}
   - {fileID: 7363228939947702508}
+  - {fileID: -7379477113019173770}
+  - {fileID: 1169797055110047173}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -2276,6 +2475,23 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &4478583637327799870
+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: c6efd434afc04c57ae511509bd0f10de, type: 3}
+  m_Name: TimeLineAlertAsset
+  m_EditorClassIdentifier: 
+  pointGuid: sk1_trigger
+  alertType: 0
+  isFindEnemy: 1
+  isFindMyHero: 0
+  angle: 0
 --- !u!114 &4575926026599301297
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/HeroTimeLine/Hero03.playable

@@ -244,6 +244,30 @@ 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 &-8829754799885646348
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "sk1_hit@\u7C7B\u4F3C\u5170\u535A\u7684Q (1)"
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 4109521933827806453}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-8763715666762063956
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -274,6 +298,7 @@ MonoBehaviour:
   isGround: 0
   isFollowTarget: 0
   isNotRotate: 0
+  isFollowRootTarget: 0
   isAttSpeed: 0
   isLoop: 1
   loopAlone: 0
@@ -414,98 +439,6 @@ 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 &-7489244471532758654
-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: 3fc2695741642bd42a34534ca2286500, type: 3}
-  m_Name: Customize Track (1)
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 2664366215323630651}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0.2
-    m_ClipIn: 0
-    m_Asset: {fileID: -3767543464806788740}
-    m_Duration: 0.2
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -7489244471532758654}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: -1
-    m_BlendOutDuration: -1
-    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: TimeLineTriggerAsset
-  m_Markers:
-    m_Objects: []
 --- !u!114 &-7083228526680016239
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -672,6 +605,116 @@ 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 &-5213821412162879996
+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: 3fc2695741642bd42a34534ca2286500, type: 3}
+  m_Name: Customize 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: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.2
+    m_ClipIn: 0
+    m_Asset: {fileID: -5013532422042071500}
+    m_Duration: 0.2
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -5213821412162879996}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: TimeLineAlertAsset
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-5013532422042071500
+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: c6efd434afc04c57ae511509bd0f10de, type: 3}
+  m_Name: TimeLineAlertAsset
+  m_EditorClassIdentifier: 
+  pointGuid: sk1_trigger
+  alertType: 0
+  isFindEnemy: 1
+  isFindMyHero: 0
+  angle: 0
+  manualClose: 1
 --- !u!114 &-4816001755073941460
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -899,21 +942,6 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
---- !u!114 &-3767543464806788740
-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: 42b647dab9a3401faf84053d24574f10, type: 3}
-  m_Name: TimeLineTriggerAsset(Clone)
-  m_EditorClassIdentifier: 
-  targetEntityType: 2
-  tineLineTrigerType: 0
-  tineLineTrigerData: 
 --- !u!114 &-3153904920175548778
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1102,6 +1130,7 @@ MonoBehaviour:
   isGround: 0
   isFollowTarget: 0
   isNotRotate: 0
+  isFollowRootTarget: 0
   isAttSpeed: 0
   isLoop: 0
   loopAlone: 0
@@ -1357,6 +1386,7 @@ MonoBehaviour:
   - {fileID: -1257232546480234104}
   - {fileID: 7243294715892543328}
   - {fileID: -2594963699011562397}
+  - {fileID: -8829754799885646348}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 30
@@ -1713,15 +1743,15 @@ 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}
   m_Children:
-  - {fileID: -7489244471532758654}
   - {fileID: -5700901883387235338}
   - {fileID: 1674232180069977348}
   - {fileID: 4462664296131566262}
+  - {fileID: -5213821412162879996}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -1835,6 +1865,98 @@ 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 &4109521933827806453
+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: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track (1)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -8829754799885646348}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 8267132716678229791}
+    m_Duration: 0.5333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 4109521933827806453}
+    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: fx_hero03_sk_hit
+  m_Markers:
+    m_Objects: []
 --- !u!114 &4462664296131566262
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2128,6 +2250,43 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!114 &8267132716678229791
+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: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 2c026a978a482e447b5162ac72a82006
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 0}
+  updateParticle: 1
+  particleRandomSeed: 3387
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 0
+  active: 1
+  postPlayback: 2
+  targetType: 2
+  LocationType: 6
+  targetSpecialDotName: hitpos
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 1
+  loopAlone: 0
+  isActivityCustomTargetPos: 0
+  CustomTargetPosIndex: 0
+  intervalTime: 0
 --- !u!114 &8877706161427265724
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2158,6 +2317,7 @@ MonoBehaviour:
   isGround: 0
   isFollowTarget: 0
   isNotRotate: 0
+  isFollowRootTarget: 1
   isAttSpeed: 0
   isLoop: 1
   loopAlone: 0

Assets/Art/RPGTinyHeroWavePBR/Animation/SwordAndShield/InPlace/Combo01_InPlace_SwordAndShield.fbx.meta

@@ -47,7 +47,7 @@ ModelImporter:
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 1
+      loopTime: 0
       loopBlend: 0
       loopBlendOrientation: 1
       loopBlendPositionY: 1

Assets/Art/RPGTinyHeroWavePBR/Animation/SwordAndShield/InPlace/Combo04_InPlace_SwordAndShield.fbx.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: ae5a37503dafc8c499545a44d0a7ccf5
+guid: Xi8a5CmqVnuCg7XnOfL9WbbVT+//T/8Y9k2yM6AJ35/hZOrjvO9MwBE=
 ModelImporter:
-  serializedVersion: 19301
+  serializedVersion: 22200
   internalIDToNameTable:
   - first:
       74: 1827226128182048838
@@ -17,6 +17,7 @@ ModelImporter:
     bakeSimulation: 0
     resampleCurves: 1
     optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
     motionNodeName: 
     rigImportErrors: 
     rigImportWarnings: 
@@ -46,7 +47,7 @@ ModelImporter:
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 1
+      loopTime: 0
       loopBlend: 0
       loopBlendOrientation: 1
       loopBlendPositionY: 1
@@ -162,6 +163,15 @@ ModelImporter:
       maskSource: {fileID: 31900000, guid: 0a2d610c66cc08b4492b8b3de93fdbde, type: 2}
       additiveReferencePoseFrame: 0
     isReadable: 0
+    virtualGeometry: 0
+    hasBoneWeight: 0
+    generateGeometryBuffer: 0
+    positionPrecision: -2147483648
+    normalPrecision: -1
+    tangentPrecision: -1
+    surfaceCompensation: 0
+    allMeshUse: 1
+    ignoreSimpleMesh: 0
   meshes:
     lODScreenPercentages: []
     globalScale: 1
@@ -169,27 +179,35 @@ ModelImporter:
     addColliders: 0
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
+    importPhysicalCameras: 1
     importVisibility: 1
     importBlendShapes: 1
     importCameras: 1
     importLights: 1
+    nodeNameCollisionStrategy: 0
     fileIdsGeneration: 2
     swapUVChannels: 0
     generateSecondaryUV: 0
     useFileUnits: 1
     keepQuads: 0
     weldVertices: 1
+    bakeAxisConversion: 0
     preserveHierarchy: 0
     skinWeightsMode: 0
     maxBonesPerVertex: 4
     minBoneWeight: 0.001
+    optimizeBones: 1
     meshOptimizationFlags: -1
     indexFormat: 0
     secondaryUVAngleDistortion: 8
     secondaryUVAreaDistortion: 15.000001
     secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 0
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
     secondaryUVPackMargin: 4
     useFileScale: 1
+    strictVertexDataChecks: 0
   tangentSpace:
     normalSmoothAngle: 60
     normalImportMode: 0
@@ -738,12 +756,14 @@ ModelImporter:
     hasTranslationDoF: 1
     hasExtraRoot: 1
     skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 0308cf4e83cf517488b60af58b290fe0,
-    type: 3}
+  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 0308cf4e83cf517488b60af58b290fe0, type: 3}
   autoGenerateAvatarMappingIfUnspecified: 1
   animationType: 3
   humanoidOversampling: 1
   avatarSetup: 2
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 0
+  importBlendShapeDeformPercent: 0
+  remapMaterialsIfMaterialImportModeIsNone: 1
   additionalBone: 0
   userData: 
   assetBundleName: 

Assets/Res/CombatHero/Hero01.prefab

@@ -1404,6 +1404,7 @@ Transform:
   - {fileID: 109362290393291742}
   - {fileID: 3999261170560408891}
   - {fileID: 6173809668919009486}
+  - {fileID: 1706276288271688283}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4364153793629314448
@@ -1873,6 +1874,74 @@ Transform:
   m_Children: []
   m_Father: {fileID: 227091514436154519}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6826184800880784811
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1706276288271688283}
+  - component: {fileID: 8571048187594035122}
+  - component: {fileID: 3913834080482057783}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: sk1_triiger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &1706276288271688283
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6826184800880784811}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7147530501131920534}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &8571048187594035122
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6826184800880784811}
+  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_Radius: 3
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &3913834080482057783
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6826184800880784811}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: sk1_trigger
 --- !u!1 &6917753280120050583
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/Hero02.prefab

@@ -1286,6 +1286,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7520372527214364784}
+  - {fileID: 1791596380523076711}
   m_Father: {fileID: 5661972379638722689}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4686837245462248509
@@ -1650,6 +1651,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5722463187919428001}
+  - component: {fileID: 5010351348781295694}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: spine_01
@@ -1674,6 +1676,65 @@ Transform:
   - {fileID: 5782977269866261079}
   m_Father: {fileID: 6963749982037965796}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5010351348781295694
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5596176128749520916}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos
+--- !u!1 &5718780871055645897
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1791596380523076711}
+  - component: {fileID: 6271474372669860554}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1791596380523076711
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5718780871055645897}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.8, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2182480392146322742}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6271474372669860554
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5718780871055645897}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos
 --- !u!1 &5922207239421255416
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/Hero03.prefab

@@ -790,6 +790,74 @@ Transform:
   - {fileID: 6873670191824290337}
   m_Father: {fileID: 5547309883159188663}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2655516361122234896
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 656111658581237766}
+  - component: {fileID: 3514638313694837158}
+  - component: {fileID: 5621530740691935533}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: sk1_trigger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &656111658581237766
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2655516361122234896}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.56, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7997587425070003535}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &3514638313694837158
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2655516361122234896}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.67358756, y: 0.87, z: 6.4000006}
+  m_Center: {x: -0.0041404963, y: 0.042170584, z: 3.365047}
+--- !u!114 &5621530740691935533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2655516361122234896}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: sk1_trigger
 --- !u!1 &2788215696191193884
 GameObject:
   m_ObjectHideFlags: 0
@@ -1257,6 +1325,7 @@ Transform:
   - {fileID: 3954233199834504366}
   - {fileID: 5139658906938405972}
   - {fileID: 8956626842180546784}
+  - {fileID: 656111658581237766}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5250060488684882498
@@ -2361,6 +2430,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5360091909227651561}
+  - component: {fileID: 7851629824544842478}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: spine_01
@@ -2385,3 +2455,16 @@ Transform:
   - {fileID: 1292447446994821927}
   m_Father: {fileID: 5395855127387717242}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7851629824544842478
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8841717109280710575}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos

Assets/Res/Config/SkillConfig.json

@@ -6,7 +6,32 @@
       "IDGroup": 1001,
       "SkillType": 1,
       "level": 1,
-      "name": 405077
+      "name": 405077,
+      "effectValue": [
+        100.0
+      ]
+    },
+    {
+      "ID": 100011,
+      "scriptName": "S10001",
+      "IDGroup": 1001,
+      "SkillType": 1,
+      "level": 1,
+      "name": 405077,
+      "effectValue": [
+        200.0
+      ]
+    },
+    {
+      "ID": 300011,
+      "scriptName": "S30001",
+      "IDGroup": 1001,
+      "SkillType": 1,
+      "level": 1,
+      "name": 405077,
+      "effectValue": [
+        200.0
+      ]
     }
   ]
 }

Assets/Res/HeroAnimtion/Hero01_library.asset

@@ -56,6 +56,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 03e7b9c42e25e6c4f89acb40263d29f9, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-6088646584569579690
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Combo01_InPlace_SwordAndShield
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714675798016000
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714675798016000
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: f9551df6b2799a54aa79faeac8d146e2, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &-5301559858133920215
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -176,6 +204,7 @@ MonoBehaviour:
     - {fileID: 4132149882535381313}
     - {fileID: -3110653298159896961}
     - {fileID: -7492277400977875935}
+    - {fileID: -6088646584569579690}
     _Modifiers:
     - _From: 0
       _To: 5
@@ -192,6 +221,15 @@ MonoBehaviour:
     - _From: 6
       _To: 0
       _Fade: 0
+    - _From: 1
+      _To: 5
+      _Fade: 0
+    - _From: 1
+      _To: 6
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &4132149882535381313

Assets/Scenes/testCombat.scene

@@ -998,10 +998,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_hero03_zd
       objectReference: {fileID: 0}
-    - target: {fileID: 2838628120464477315, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
       propertyPath: m_LocalPosition.x
       value: 26.77153
@@ -1045,37 +1041,8 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 2838628120464477315, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1354674197}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
---- !u!1 &1354674196 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2838628120464477315, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
-  m_PrefabInstance: {fileID: 1354674195}
-  m_PrefabAsset: {fileID: 0}
---- !u!135 &1354674197
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1354674196}
-  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_Radius: 0.3
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &1421949364
 GameObject:
   m_ObjectHideFlags: 0
@@ -1159,7 +1126,7 @@ MonoBehaviour:
     att: 30
     attSpeed: 3
     attDis: 2
-    skillId: 1b270000
+    skillId: 1b270000ab860100
   - modelName: Hero01
     hp: 1000
     att: 30
@@ -1171,7 +1138,7 @@ MonoBehaviour:
     att: 30
     attSpeed: 1
     attDis: 5
-    skillId: 1b270000
+    skillId: 1b270000eb930400
   - modelName: Hero04
     hp: 1000
     att: 30

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -57,6 +57,12 @@ public int level;
 public int name;
 
 
+		/// <summary>
+		///效果值
+		/// </summary>
+public float[] effectValue;
+
+
 	}
 
 }

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

@@ -3,5 +3,6 @@
     public enum AttType
     {
         Normal,
+        Skill,
     }
 }

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

@@ -8,6 +8,14 @@ namespace GameLogic.Combat.CombatTool
 {
     public class CombatCalculateTool : Singleton<CombatCalculateTool>
     {
+        
+        public long GetVlaueRatioForLong(long value, float ration)
+        {
+            long v = (value * (long)(ration * 100)) / 10000;
+            return v;
+        }
+
+      
         public HarmReturnInfo Harm(CombatHeroEntity source, CombatHeroEntity target, long att, AttType attType,
             TriggerData triggerData, HarmType harmType = HarmType.Null)
         {

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

@@ -41,7 +41,7 @@ namespace GameLogic.Combat.Hero
             {
                 SpecialDotMono specialDotMono = specialDotMonos[i];
                 SpecialDotInfo specialDotInfo = new SpecialDotInfo();
-                specialDotInfo.dotName = specialDotMono.name;
+                specialDotInfo.dotName = specialDotMono.DotName;
                 specialDotInfo.targetTran = specialDotMono.transform;
                 specialDotInfo.heroEntity = combatHeroEntity;
                 allSpecialDotInfo.Add(specialDotInfo);

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

@@ -0,0 +1,49 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 战士的旋风斩
+    /// </summary>
+    public class S10001 : SkillBasic
+    {
+        protected float _harm;
+
+        protected override void ProInitSkill()
+        {
+            _harm = 200;
+        }
+
+        protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
+            TimeLineEventLogicBasic timeLineEventLogicBasic)
+        {
+            ILifetCycleHitPoint[] allHero = new ILifetCycleHitPoint[_enterAlertTarget.Count];
+            for (int i = 0; i < _enterAlertTarget.Count; i++)
+            {
+                allHero[i] = _enterAlertTarget[i].GetMainHotPoin<ILifetCycleHitPoint>();
+            }
+
+            return allHero;
+        }
+
+
+        protected override void ProUseSkill()
+        {
+            ActivationTimeLineData("sk1");
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                _harm);
+            HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
+                v, AttType.Skill, triggerData);
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3ccce3528f0c470b8781c77ab2c5c3a2
+timeCreated: 1731915229

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

@@ -0,0 +1,103 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 火烧
+    /// </summary>
+    public class S30001: SkillBasic
+    {
+        protected float _harm;
+
+        protected float _currTime;
+        private BetterList<ILifetCycleHitPoint> _currTrigger = new BetterList<ILifetCycleHitPoint>();
+        protected TimeLineEventLogicGroupBasic loopGroupBasic;
+        protected TimeLineEventLogicGroupBasic currMyLoopGroupBasic;
+        protected bool _isUpdate;
+        protected override void ProInitSkill()
+        {
+            _harm = 200;
+        }
+
+        // protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
+        //     TimeLineEventLogicBasic timeLineEventLogicBasic)
+        // {
+        //     ILifetCycleHitPoint[] allHero = new ILifetCycleHitPoint[_enterAlertTarget.Count];
+        //     for (int i = 0; i < _enterAlertTarget.Count; i++)
+        //     {
+        //         allHero[i] = _enterAlertTarget[i].GetMainHotPoin<ILifetCycleHitPoint>();
+        //     }
+        //
+        //     return allHero;
+        // }
+
+
+        protected override void ProUseSkill()
+        {
+            _finishTimeLineGroupName = "";
+            currMyLoopGroupBasic=  ActivationTimeLineData("sk1");
+            _isUpdate = true;
+        }
+
+        protected override void ProBreakSkill()
+        {
+            Finish();
+        }
+
+        protected void Finish()
+        {
+            currMyLoopGroupBasic?.CloseLoopFx();
+            _isUpdate = false;
+            SpecialDotInfo specialDotInfo = CombatHeroEntity.GetMainHotPoin<ILifetCycleHitPoint>(true)
+                .GetSpecialDotInfo("sk1_trigger");
+            specialDotInfo.targetTran.gameObject.SetActive(false);
+        }
+
+        protected override void ProCombatUpdate(float time)
+        {
+            if (!_isUpdate)
+            {
+                return;
+            }
+
+            _currTime += time;
+            if (_currTime > 1)
+            {
+                _currTime -= 1;
+                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                _harm);
+                if (loopGroupBasic != null)
+                {
+                    loopGroupBasic.CloseLoopFx();
+                }
+
+                // for (int i = 0; i < _currTrigger.Count; i++)
+                // {
+                //     _currTrigger[i].IfLifeCycle.This<CombatHeroEntity>().H
+                // }
+                _currTrigger.Clear();
+                // ILifetCycleHitPoint[] allHero = new ILifetCycleHitPoint[_enterAlertTarget.Count];
+                for (int i = 0; i < _enterAlertTarget.Count; i++)
+                {
+                    ILifetCycleHitPoint targetEntity=  _enterAlertTarget[i].GetMainHotPoin<ILifetCycleHitPoint>();
+                    _currTrigger.Add(targetEntity);
+                    HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity as CombatHeroHitPoint, 
+                        v, AttType.Skill, triggerData);
+                }
+                loopGroupBasic=  ActivationTimeLineData("sk1_hit",_currTrigger);
+            }
+        }
+        // protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+        //     ITimelineFxLogic timelineFxLogic,
+        //     TriggerData triggerData)
+        // {
+        //     long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+        //         _harm);
+        //     HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
+        //         v, AttType.Skill, triggerData);
+        // }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 41ae098991ba4107b8d89db60f94e0b9
+timeCreated: 1731918739

Assets/Scripts/GameLogic/Paritcle/CombatParticleSystemPool.cs

@@ -1,7 +1,5 @@
-
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using CombatLibrary.CombatLibrary.CombatCore.Utility;
-
 using Fort23.Core;
 using Fort23.UTool;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
@@ -31,15 +29,12 @@ namespace Fort23.Common
         private float _currUpdateTime;
         public CombatParticleSystemPool()
         {
-          
         }
 #if !COMBAT_SERVER
         public void InitCombatParticleSystem()
         {
         }
 
-      
-
 
         public ParticleSystemSize ParticleSystemSize
         {
@@ -154,13 +149,11 @@ namespace Fort23.Common
         {
             activeCount++;
             GameObjectDestroyPool.Instance.RomoveDestroyObject(own);
-      
+
             base.ProActiveObj();
         }
 
 
-      
-
         public override async CTask DelayHide()
         {
             if (_hideShowEndFx != null)
@@ -180,19 +173,16 @@ namespace Fort23.Common
             await base.DelayHide();
         }
 
-      
 
         protected override void ProDormancyObj()
         {
-           
             base.ProDormancyObj();
-          
+
             RootSortingGroup = null;
         }
 
         protected override void ProOnDestroy()
         {
-         
             base.ProOnDestroy();
         }
 
@@ -213,6 +203,11 @@ namespace Fort23.Common
                 return;
             }
 
+            if (targetSpecialDotInfo != null)
+            {
+                transform.position = targetSpecialDotInfo.targetTran.position;
+                transform.eulerAngles = targetSpecialDotInfo.targetTran.eulerAngles;
+            }
 
             deltaTime = _currUpdateTime;
             _currUpdateTime = 0;
@@ -228,13 +223,10 @@ namespace Fort23.Common
             }
 
             UpdateTime += deltaTime;
-            
 
-           
 
-     
             float speed = 1;
-          
+
 
             Play(speed, deltaTime);
         }

Assets/Scripts/GameLogic/Paritcle/GameTimeLineParticleFactory.cs

@@ -6,6 +6,7 @@ using Fort23.Common;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
@@ -149,7 +150,16 @@ public class GameTimeLineParticleFactory : ITimeLineParticleFactory
 #if !COMBAT_SERVER
                 pool.gameObject.SetActive(false);
                 pool.transform.position = startPos;
-
+                if (timeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.isFollowRootTarget &&
+                    timeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.locationType !=
+                    FXLocationType.SceneZero)
+                {
+                  
+                    CombatHeroEntity combatHeroEntity= targetSpecialDotInfo.heroEntity as CombatHeroEntity;
+                    pool.transform.SetParent(combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>().GetSpecialDotInfo("").targetTran);
+                    pool.transform.localEulerAngles = Vector3.zero;
+                   
+                }else
                 if (timeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.isFollowTarget &&
                     timeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.locationType !=
                     FXLocationType.SceneZero)

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

@@ -10,5 +10,6 @@ public class TimeLineAlertAsset : CustomizePlayableAsset
     [Header("查找队友")] public bool isFindMyHero;
 
     [Header("前方角度")] public int angle;
+    [Header("手动关闭")] public bool manualClose;
     // [Header("开始点GUID(英雄上的点，可以不填)")] public string startPosGuid;
 }

Assets/Scripts/GameTimeLine/CustomizeTime/TimeLineParticleSystem/TimeLineParticleSystemAsset.cs

@@ -14,11 +14,19 @@ public class TimeLineParticleSystemAsset : ControlPlayableAsset
     /// 是否跟随目标
     /// </summary>
     [Header("是否跟随目标")] public bool isFollowTarget;
-
     /// <summary>
     /// 是否不旋转 （默认是跟随目标旋转）
     /// </summary>
     [Header("是否不跟随目标旋转")] public bool isNotRotate;
+    /// <summary>
+    /// 是否跟随目标
+    /// </summary>
+    [Header("是否跟随root目标")] public bool isFollowRootTarget;
+    // /// <summary>
+    // /// 是否跟随目标
+    // /// </summary>
+    // [Header("是否跟随root目标")] public bool isFollowRootRotate;
+  
 
     /// <summary>
     /// 是否跟随攻击速度进行播放te

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

@@ -16,6 +16,10 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
 
         protected override void ProEnter()
         {
+            _enterRegister?.UnRegister();
+            _exitRegister?.UnRegister();
+            _enterRegister = null;
+            _exitRegister = null;
             TimeLineAlertSeriailztion timeLineAlertSeriailztion =
                 mTimeLineAssetSerialization as TimeLineAlertSeriailztion;
             if (!string.IsNullOrEmpty(timeLineAlertSeriailztion.guid))
@@ -64,6 +68,11 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
         {
             TimeLineAlertSeriailztion timeLineAlertSeriailztion =
                 mTimeLineAssetSerialization as TimeLineAlertSeriailztion;
+            if (timeLineAlertSeriailztion.manualClose)
+            {
+                return;
+            }
+
             if (!string.IsNullOrEmpty(timeLineAlertSeriailztion.guid))
             {
                 SpecialDotInfo specialDotInfo = castEntity.GetMainHotPoin<ILifetCycleHitPoint>(true)

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

@@ -54,6 +54,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
 
         protected override void ProBreakTimeLine()
         {
+           
             for (int i = 0; i < loadTask.Count; i++)
             {
                 loadTask[i].Dispose();
@@ -61,11 +62,16 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
 
             CombatTimerManager.Instance.RemoveTimer(_combatTimer);
             _combatTimer = null;
+            CloseLoopFx();
             loadTask.Clear();
         }
 
         public void CloseLoopFx()
         {
+            for (int i = 0; i < loopFx.Count; i++)
+            {
+                GObjectPool.Instance.Recycle(loopFx[i]);
+            }
             loopFx.Clear();
         }
 

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

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

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

@@ -23,7 +23,7 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
     /// 是否跟随目标
     /// </summary>
     public bool isFollowTarget;
-
+    public bool isFollowRootTarget;
     /// <summary>
     /// 是否不旋转 （默认是跟随目标旋转）
     /// </summary>
@@ -80,6 +80,7 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
             targetSpecialDotName = controlPlayableAsset.targetSpecialDotName;
             hitPointGroupName = controlPlayableAsset.hitPointGroupName;
             isFollowTarget = controlPlayableAsset.isFollowTarget;
+            isFollowRootTarget = controlPlayableAsset.isFollowRootTarget;
             isGround = controlPlayableAsset.isGround;
             isNotRotate = controlPlayableAsset.isNotRotate;
             isAttSpeed = controlPlayableAsset.isAttSpeed;

Fort23.GameLogic.csproj

@@ -54,6 +54,7 @@
     <Compile Include="Assets\Scripts\GameLogic\CombatScenesTool\CombatScenesConfig.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\Hero\CombatHeroAi.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\Skill\NormalSkill.cs" />
+    <Compile Include="Assets\Scripts\GameLogic\Combat\Skill\S30001.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\Hero\HeroEntityMono.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatTool\CombatScenesControllder.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatEvent\CombatEventManager.cs" />
@@ -75,6 +76,7 @@
     <Compile Include="Assets\Scripts\GameLogic\Combat\Hero\CombatHeroSkillControl.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatType\TestCombatType.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatTool\CombatController.cs" />
+    <Compile Include="Assets\Scripts\GameLogic\Combat\Skill\S10001.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Paritcle\ParitcleLogic\FxAIBeelineBulletLogic.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\Hero\State\CombatHeroMoveState.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Paritcle\CombatParticleSystemPool.cs" />

UniRx.csproj

@@ -172,8 +172,8 @@
     <Compile Include="Assets\Scripts\ThirdParty\UniRx\Scripts\Operators\Skip.cs" />
     <Compile Include="Assets\Scripts\ThirdParty\UniRx\Scripts\Schedulers\IScheduler.cs" />
     <Compile Include="Assets\Scripts\ThirdParty\UniRx\Scripts\Operators\GroupBy.cs" />
-    <Compile Include="Assets\Scripts\ThirdParty\UniRx\Scripts\Operators\Empty.cs" />
     <Compile Include="Assets\Scripts\ThirdParty\UniRx\Scripts\Operators\Do.cs" />
+    <Compile Include="Assets\Scripts\ThirdParty\UniRx\Scripts\Operators\Empty.cs" />
     <Compile Include="Assets\Scripts\ThirdParty\UniRx\Scripts\UnityEngineBridge\Triggers\ObservableMouseTrigger.cs" />
     <Compile Include="Assets\Scripts\ThirdParty\UniRx\Scripts\System\Tuple.cs" />
     <Compile Include="Assets\Scripts\ThirdParty\UniRx\Scripts\Timestamped.cs" />

UserSettings/EditorUserSettings.asset

@@ -21,31 +21,31 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 565507025d0c5f0c5a08097444745944174f1e2c292d20312b2d4832b7b36c6a
+      value: 5652565353035e5a5b5a0973477a064440154b2f2d2c71627a7c1835b3b96c6b
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5301560452000d025c565d2144275944454e4f792d2c76607c7b4a65b2b8626f
+      value: 5152025f55015d095a5f5c2311225d4417154c28297d24607d284c61b7e26468
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a09055257045f580b0c5b20482059444e164e7f752974697c2b4c60bab86c69
+      value: 010802545d055a0e0f5e597614250c44454e1a7a787973357a704f35b4e3673e
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5652565353035e5a5b5a0973477a064440154b2f2d2c71627a7c1835b3b96c6b
+      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5152025f55015d095a5f5c2311225d4417154c28297d24607d284c61b7e26468
+      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 010802545d055a0e0f5e597614250c44454e1a7a787973357a704f35b4e3673e
+      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
+      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
+      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
+      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68

UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Console
+  m_Title: Inspector
   m_RootView: {fileID: 10}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -40,11 +40,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 580
-    width: 743
-    height: 211
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+    y: 473
+    width: 538
+    height: 480
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -67,14 +67,14 @@ MonoBehaviour:
   - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 979
+    x: 1340
     y: 0
-    width: 743
-    height: 791
+    width: 538
+    height: 953
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 95
+  controlID: 99
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -91,15 +91,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 510
+    x: 553
     y: 0
-    width: 469
-    height: 791
+    width: 787
+    height: 953
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 23}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 23}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &5
@@ -117,9 +117,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1722
+    x: 1878
     y: 0
-    width: 316
+    width: 384
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -144,14 +144,14 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 791
-    width: 1722
-    height: 508
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 24}
+    y: 953
+    width: 1878
+    height: 346
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 24}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &7
@@ -179,7 +179,7 @@ MonoBehaviour:
   m_MinSize: {x: 500, y: 150}
   m_MaxSize: {x: 40480, y: 24288}
   vertical: 0
-  controlID: 212
+  controlID: 96
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -196,9 +196,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2038
+    x: 2262
     y: 0
-    width: 522
+    width: 298
     height: 1299
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
@@ -224,8 +224,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 510
-    height: 791
+    width: 553
+    height: 953
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 21}
@@ -323,12 +323,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1722
+    width: 1878
     height: 1299
   m_MinSize: {x: 300, y: 150}
   m_MaxSize: {x: 24288, y: 24288}
   vertical: 1
-  controlID: 93
+  controlID: 97
   draggingID: 0
 --- !u!114 &14
 MonoBehaviour:
@@ -350,12 +350,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1722
-    height: 791
+    width: 1878
+    height: 953
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 94
+  controlID: 98
   draggingID: 0
 --- !u!114 &15
 MonoBehaviour:
@@ -374,8 +374,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 743
-    height: 580
+    width: 538
+    height: 473
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 22}
@@ -405,10 +405,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 754
+    x: 881
     y: 73
-    width: 878
-    height: 506
+    width: 995
+    height: 420
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -430,6 +430,7 @@ MonoBehaviour:
     - {fileID: 4132149882535381313, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
     - {fileID: -3110653298159896961, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
     - {fileID: -7492277400977875935, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
+    - {fileID: -6088646584569579690, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
     _Modifiers:
     - _From: 0
       _To: 5
@@ -446,6 +447,15 @@ MonoBehaviour:
     - _From: 6
       _To: 0
       _Fade: 0
+    - _From: 1
+      _To: 5
+      _Fade: 0
+    - _From: 1
+      _To: 6
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
   _Selection: {fileID: 0}
@@ -486,10 +496,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 979
-    y: 653
-    width: 741
-    height: 190
+    x: 1340
+    y: 546
+    width: 536
+    height: 459
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -599,9 +609,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1722
+    x: 1878
     y: 73
-    width: 314
+    width: 382
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -624,7 +634,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI/Combat
+    - Assets/Art/ArtHero
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -632,16 +642,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI/Combat
+  - Assets/Art/ArtHero
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 02810100
-    m_LastClickedID: 98562
-    m_ExpandedIDs: 00000000d0ad00001ab0000022b00000f680010000ca9a3b
+    scrollPos: {x: 0, y: 22}
+    m_SelectedIDs: be170100
+    m_LastClickedID: 71614
+    m_ExpandedIDs: 00000000a2aa0000f4ac0000feac000006ad000010ad000016ad000018ad0000c8170100e2da0300887f050058b406005ab406001667070000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -669,7 +679,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d0ad0000
+    m_ExpandedIDs: 00000000a2aa0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -697,18 +707,18 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c62300000000000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb000050f90000e4230100
+    m_ExpandedInstanceIDs: c62300000000000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb000050f90000e4230100847d00006c7f05001a800500ce7f0500
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: New Map Config
-      m_OriginalName: New Map Config
+      m_Name: Hero03
+      m_OriginalName: Hero03
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 16480
+      m_UserData: 71618
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
@@ -745,9 +755,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2038
+    x: 2262
     y: 73
-    width: 521
+    width: 297
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -794,8 +804,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 509
-    height: 770
+    width: 552
+    height: 932
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -809,9 +819,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 2ef5ffff
-      m_LastClickedID: -2770
-      m_ExpandedIDs: bef5ffffee880000
+      m_SelectedIDs: d8f7ffff
+      m_LastClickedID: -2088
+      m_ExpandedIDs: 7067f4ff1ca2f4ffdedff4ffe2dff4fff2dff4ff34e0f4ff40e0f4ff5ce0f4ff60e0f4ff64e0f4ff6ce0f4fface0f4ffb0e0f4ffb6e0f4ffbae0f4ffbee0f4ffd2e0f4ffec47f5ff0048f5ff1c76fafff279faffc8faffffea810000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -855,10 +865,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 979
+    x: 1340
     y: 73
-    width: 741
-    height: 559
+    width: 536
+    height: 452
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1094,7 +1104,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -1230,9 +1240,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 180.63, y: 3.11, z: -4.2}
+    m_Target: {x: 23.364275, y: -0.4140404, z: 14.198425}
     speed: 2
-    m_Value: {x: 180.63, y: 3.11, z: -4.2}
+    m_Value: {x: 23.364275, y: -0.4140404, z: 14.198425}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1278,13 +1288,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.6840317, y: 0.007004137, z: -0.00656143, w: -0.7294013}
+    m_Target: {x: -0.25245252, y: -0.026987681, z: 0.0070780334, w: -0.96722776}
     speed: 2
-    m_Value: {x: -0.6840257, y: 0.007004075, z: -0.0065613724, w: -0.72939485}
+    m_Value: {x: -0.25244743, y: -0.026987137, z: 0.007077891, w: -0.96720827}
   m_Size:
-    m_Target: 7.071068
+    m_Target: 4.938794
     speed: 2
-    m_Value: 7.071068
+    m_Value: 4.938794
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1312,6 +1322,40 @@ MonoBehaviour:
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
 --- !u!114 &23
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 1026
+    width: 1877
+    height: 325
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1331,10 +1375,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 510
+    x: 553
     y: 73
-    width: 467
-    height: 770
+    width: 785
+    height: 932
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1345,8 +1389,10 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
+  m_SerializedViewNames:
+  - UnityEditor.DeviceSimulation.SimulatorWindow
+  m_SerializedViewValues:
+  - D:\unityProject\XY001\Library\PlayModeViewStates\e7a6c48408c86844d9da2e573d1e2a84
   m_PlayModeViewName: GameView
   m_ShowGizmos: 0
   m_TargetDisplay: 0
@@ -1387,59 +1433,25 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 467
-      height: 749
-    m_Scale: {x: 0.46120688, y: 0.46120688}
-    m_Translation: {x: 233.5, y: 374.5}
+      width: 785
+      height: 911
+    m_Scale: {x: 0.5609606, y: 0.5609606}
+    m_Translation: {x: 392.5, y: 455.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -506.2804
+      x: -699.6926
       y: -812
-      width: 1012.5608
+      width: 1399.3853
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.46120688
-  m_LastWindowPixelSize: {x: 467, y: 770}
+  m_defaultScale: 0.5609606
+  m_LastWindowPixelSize: {x: 785, y: 932}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &24
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 0
-    y: 864
-    width: 1721
-    height: 487
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1