修改配置动作

Assets/Art/HeroTimeLine/gf_1101_timeline.playable

@@ -51,8 +51,8 @@ MonoBehaviour:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: 48096893300798330}
-    m_Duration: 0.8
+    m_Asset: {fileID: -3122444872618145490}
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: -4482353584805677838}
     m_EaseInDuration: 0
@@ -116,7 +116,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: attack2
+    m_DisplayName: attack3_1
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -164,6 +164,30 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-3122444872618145490
+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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: 6014afcc65ff52a4e846fd0c1483c9b6, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
 --- !u!114 &-2619250345888704379
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -188,8 +212,8 @@ MonoBehaviour:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: 3710049619119919713}
-    m_Duration: 0.8
+    m_Asset: {fileID: 3397919037254164628}
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: -2619250345888704379}
     m_EaseInDuration: 0
@@ -253,7 +277,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: attack2
+    m_DisplayName: attack3_1
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -334,6 +358,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-827030417008028583
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -356,7 +382,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.43333333333333335
+    m_Start: 0.9
     m_ClipIn: 0
     m_Asset: {fileID: -1891357024015680945}
     m_Duration: 1
@@ -448,30 +474,6 @@ MonoBehaviour:
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
---- !u!114 &48096893300798330
-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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset(Clone)
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
 --- !u!114 &315511387929670580
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -497,7 +499,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 5982826750523852091}
-    m_Duration: 0.8
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: 315511387929670580}
     m_EaseInDuration: 0
@@ -602,7 +604,9 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
---- !u!114 &3710049619119919713
+  isRoat: 0
+  roatIndex: 0
+--- !u!114 &3397919037254164628
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -614,7 +618,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
   m_Name: TimeLinePlayEntityAnimtionAsset
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
+  m_Clip: {fileID: 1827226128182048838, guid: 6014afcc65ff52a4e846fd0c1483c9b6, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -651,7 +655,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 5904406818350819231}
-    m_Duration: 0.8
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: 5651971833199858375}
     m_EaseInDuration: 0
@@ -788,7 +792,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.43333333333333335
+    m_Start: 0.9
     m_ClipIn: 0
     m_Asset: {fileID: 3170206750459385421}
     m_Duration: 1

Assets/Res/TimeLineAssets/2008_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"2008_timeline","key":["TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_boss01_sk1_jian\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"2008_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"2008_timeline","key":["TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_2008\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos3\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"2008_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Scenes/testCombat.scene

@@ -4819,6 +4819,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_gf_1402
       objectReference: {fileID: 0}
+    - target: {fileID: 7797750196052067437, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -5492,16 +5496,6 @@ Transform:
   - {fileID: 996603547}
   m_Father: {fileID: 8535240}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &885684843 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-  m_PrefabInstance: {fileID: 4754024461109735418}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &885684844 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-  m_PrefabInstance: {fileID: 4754024461109735418}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &891104892
 GameObject:
   m_ObjectHideFlags: 0
@@ -6841,10 +6835,26 @@ PrefabInstance:
       propertyPath: m_Name
       value: Nanzhu (3)
       objectReference: {fileID: 0}
+    - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3780976137779322548, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5141869877783431263, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_SceneBindings.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5141869877783431263, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_SceneBindings.Array.data[2].key
+      value: 
+      objectReference: {fileID: -4482353584805677838, guid: d230057e7ee2e5a4888a743312f643a6, type: 2}
+    - target: {fileID: 5141869877783431263, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_SceneBindings.Array.data[3].key
+      value: 
+      objectReference: {fileID: 315511387929670580, guid: d230057e7ee2e5a4888a743312f643a6, type: 2}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0.032
@@ -7834,81 +7844,6 @@ Sprite:
     - {x: 0.17999999, y: -0.105}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
---- !u!1 &1358302963
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1358302965}
-  - component: {fileID: 1358302964}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: LevelBattle01
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!114 &1358302964
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1358302963}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9970cf7521114b5ebfee32908aec5603, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  dec: "\u7B2C\u4E00\u5173\u7684\u6D4B\u8BD5\u573A\u666F"
-  roadside:
-    dis: 0.1
-    minCount: 10
-    maxCount: 15
-    SceneObjectConfigs:
-    - odds: 60
-      minY: -10
-      maxY: -3
-      prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
-  roadside_1:
-    dis: 0.1
-    minCount: 15
-    maxCount: 20
-    SceneObjectConfigs:
-    - odds: 60
-      minY: 0
-      maxY: 2
-      prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
-  button:
-    dis: 0.1
-    minCount: 4
-    maxCount: 8
-    SceneObjectConfigs:
-    - odds: 60
-      minY: -13
-      maxY: -10
-      prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
-  skyObejct: {fileID: 885684843}
---- !u!4 &1358302965
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1358302963}
-  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:
-  - {fileID: 885684844}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1359684027
 GameObject:
   m_ObjectHideFlags: 0
@@ -9593,7 +9528,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.x
@@ -12951,63 +12886,6 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
---- !u!1001 &4754024461109735418
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 1358302965}
-    m_Modifications:
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_Name
-      value: cj01 (1)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
 --- !u!1001 &4885491695541437786
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13375,4 +13253,3 @@ SceneRoots:
   - {fileID: 1544803331}
   - {fileID: 1085826000}
   - {fileID: 667277092}
-  - {fileID: 1358302965}