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

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by master version

Assets/Art/HeroTimeLine/gf_1101_timeline.playable

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 0
+  m_Muted: 1
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -161,6 +161,7 @@ MonoBehaviour:
   - {fileID: 5651971833199858375}
   - {fileID: -2369211992482019178}
   - {fileID: 8347337737205412339}
+  - {fileID: 3209848228872824657}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -298,6 +299,23 @@ 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 &-2570558866612211580
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: 6a0389d19e064f74498d3ca891d55b4c, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-2369211992482019178
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -347,6 +365,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -603,6 +622,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -626,6 +646,102 @@ MonoBehaviour:
   intervalTime: 0
   isRoat: 0
   roatIndex: 0
+--- !u!114 &3209848228872824657
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -3287993412395920561}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.11666666666666667
+    m_ClipIn: 0
+    m_Asset: {fileID: -2570558866612211580}
+    m_Duration: 0.6443083900226757
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 3209848228872824657}
+    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: feijian_shifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &3397919037254164628
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/HeroTimeLine/gf_1102_timeline.playable

@@ -1,5 +1,22 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-7417513021874777278
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: 9538a3a5ec0d21c46b71a68ca7e63bbb, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-6619101037631432703
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -46,6 +63,7 @@ MonoBehaviour:
   m_Children:
   - {fileID: 8106544261917024806}
   - {fileID: -894447145330074657}
+  - {fileID: 1544822755975076284}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -285,6 +303,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -320,6 +349,102 @@ MonoBehaviour:
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
+--- !u!114 &1544822755975076284
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -5073625934344026965}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7417513021874777278}
+    m_Duration: 1.6
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 1544822755975076284}
+    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: 1102_shifang
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &5362924406835071193
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -346,6 +471,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0

Assets/Art/HeroTimeLine/gf_1103_timeline.playable

@@ -26,6 +26,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -49,6 +50,23 @@ MonoBehaviour:
   intervalTime: 0
   isRoat: 0
   roatIndex: 0
+--- !u!114 &-5753060860095227286
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-5073625934344026965
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -70,11 +88,108 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: -4164219149111313881}
   - {fileID: -894447145330074657}
   - {fileID: 5407991339139584327}
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-4164219149111313881
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -5073625934344026965}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -5753060860095227286}
+    m_Duration: 1.104716553287982
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -4164219149111313881}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-894447145330074657
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -308,6 +423,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
     x: -1

Assets/Art/HeroTimeLine/gf_1104_timeline.playable

@@ -44,10 +44,28 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: -813147587915237003}
   - {fileID: -894447145330074657}
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-4936190593089289182
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-894447145330074657
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -141,6 +159,102 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
+--- !u!114 &-813147587915237003
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -5073625934344026965}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.23333333333333334
+    m_ClipIn: 0
+    m_Asset: {fileID: -4936190593089289182}
+    m_Duration: 0.8656462585034014
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -813147587915237003}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -452,6 +566,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
     x: 1

Assets/Art/HeroTimeLine/gf_1105_timeline.playable

@@ -21,10 +21,124 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: -3065592572271490671}
   - {fileID: -894447145330074657}
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-3615427410446171921
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
+--- !u!114 &-3065592572271490671
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -5073625934344026965}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.2833333333333333
+    m_ClipIn: 0
+    m_Asset: {fileID: -3615427410446171921}
+    m_Duration: 0.8656462585034014
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -3065592572271490671}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-1930241155155303898
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -214,6 +328,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
     x: 0.5

Assets/Art/HeroTimeLine/gf_1201_timeline.playable

@@ -113,6 +113,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: -2619250345888704379}
+  - {fileID: -2354814266536312361}
   - {fileID: 5651971833199858375}
   m_Clips: []
   m_Markers:
@@ -253,6 +254,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -264,6 +276,121 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
+--- !u!114 &-2354814266536312361
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -3287993412395920561}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -1792408158640993938}
+    m_Duration: 0.8656462585034014
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -2354814266536312361}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
+--- !u!114 &-1792408158640993938
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Art/HeroTimeLine/gf_1202_timeline.playable

@@ -118,6 +118,17 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -129,6 +140,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-8063079958822483690
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -378,6 +391,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -389,6 +413,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-3287993412395920561
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -411,6 +437,7 @@ MonoBehaviour:
   m_Children:
   - {fileID: -2619250345888704379}
   - {fileID: 5651971833199858375}
+  - {fileID: 4424098949541430314}
   - {fileID: -8063079958822483690}
   - {fileID: -8550778822979698076}
   m_Clips: []
@@ -572,6 +599,119 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &3751096828899844284
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
+--- !u!114 &4424098949541430314
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -3287993412395920561}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 3751096828899844284}
+    m_Duration: 0.8656462585034014
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 4424098949541430314}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &5651971833199858375
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/HeroTimeLine/gf_1204_timeline.playable

@@ -26,6 +26,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -37,6 +48,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-5073625934344026965
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -58,6 +71,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: 2837806246691692564}
   - {fileID: -894447145330074657}
   m_Clips: []
   m_Markers:
@@ -224,6 +238,119 @@ MonoBehaviour:
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
+--- !u!114 &1404141236018797120
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
+--- !u!114 &2837806246691692564
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -5073625934344026965}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 1404141236018797120}
+    m_Duration: 0.8656462585034014
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 2837806246691692564}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/HeroTimeLine/gf_1205_timeline.playable

@@ -21,6 +21,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 8106544261917024806}
+  - {fileID: 5635170574362708447}
   - {fileID: -894447145330074657}
   m_Clips: []
   m_Markers:
@@ -189,6 +190,23 @@ MonoBehaviour:
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
+--- !u!114 &418545016122512247
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &924531687400833546
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -238,6 +256,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: zdpos9
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -249,6 +278,104 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
+--- !u!114 &5635170574362708447
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -5073625934344026965}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 418545016122512247}
+    m_Duration: 0.8656462585034014
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 5635170574362708447}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/HeroTimeLine/gf_1301_timeline.playable

@@ -26,6 +26,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: 0
+  randomGroup: 0
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -37,6 +48,121 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
+--- !u!114 &-6447130278814272783
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: e86bb7f973e907244974f23b97d313f2, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
+--- !u!114 &-4882129499370056327
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -3287993412395920561}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -6447130278814272783}
+    m_Duration: 0.8656462585034014
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -4882129499370056327}
+    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: wannengshifa
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-3287993412395920561
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -58,6 +184,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: -2619250345888704379}
+  - {fileID: -4882129499370056327}
   - {fileID: 5651971833199858375}
   - {fileID: -2369211992482019178}
   m_Clips: []

Assets/Art/VFX/FXPrefabs/fx_gf_1101.prefab

@@ -14699,7 +14699,9 @@ MonoBehaviour:
   delayTime: 0.3
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_1101_hit
-  hitAudioName: 
+  startAudioName: feijian.wav
+  hitAudioName: feijian_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1102.prefab

@@ -24427,7 +24427,9 @@ MonoBehaviour:
   delayTime: 0.75
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1102_hit
-  hitAudioName: 
+  startAudioName: 1102_shifa2.wav
+  hitAudioName: 1102_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1103.prefab

@@ -5133,7 +5133,9 @@ MonoBehaviour:
   delayTime: 0.2
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_1103_hit
-  hitAudioName: 
+  startAudioName: 1103_shifang2.wav
+  hitAudioName: 1102_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1104.prefab

@@ -4936,7 +4936,9 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_1104_hit
-  hitAudioName: 
+  startAudioName: 1104_fashe.wav
+  hitAudioName: feijian_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

Assets/Art/VFX/FXPrefabs/fx_gf_bingdao.prefab

@@ -14885,16 +14885,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0.5
   multipleTargetDelayTime: 0.2
   hitFxName: fx_gf_bingdao_hit
-  hitAudioName: 
+  startAudioName: feijian.wav
+  hitAudioName: feijian_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
+  isNotMove: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
+  isInit: 0
   speed: 17
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 2
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -14907,7 +14914,7 @@ MonoBehaviour:
     - {x: 0.3307275, y: -0.0420354, z: 3.1231074}
     - {x: 0, y: 0, z: 5}
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &7810929004900362160
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_bingqiu.prefab

@@ -19875,16 +19875,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_bingqiu_hit
-  hitAudioName: 
+  startAudioName: 1202_fashe.wav
+  hitAudioName: feijian_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
+  isNotMove: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
+  isInit: 0
   speed: 20
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -19893,7 +19900,7 @@ MonoBehaviour:
     isActive: 0
     controlPoints: []
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &1757780971700255179
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_bingzhui.prefab

@@ -4930,16 +4930,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_bingzhui_hit
-  hitAudioName: 
+  startAudioName: 1201_fashe.wav
+  hitAudioName: feijian_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
+  isNotMove: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
+  isInit: 0
   speed: 20
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -4948,7 +4955,7 @@ MonoBehaviour:
     isActive: 0
     controlPoints: []
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &5712450709070025940
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_duzhen.prefab

@@ -5017,16 +5017,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0.2
   multipleTargetDelayTime: 0.04
   hitFxName: fx_gf_duzhen_hit
-  hitAudioName: 
+  startAudioName: feijian.wav
+  hitAudioName: feijian_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
+  isNotMove: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
   size: 1
+  isInit: 0
   speed: 20
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -5035,7 +5042,7 @@ MonoBehaviour:
     isActive: 0
     controlPoints: []
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!54 &5923483964563381317
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_jinzhen.prefab

@@ -14730,7 +14730,9 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_jinzhen_hit
-  hitAudioName: 
+  startAudioName: 
+  hitAudioName: feijian_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

Assets/Art/VFX/FXPrefabs/fx_gf_shuiqiu.prefab

@@ -9849,7 +9849,9 @@ MonoBehaviour:
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_shuiqiu_hit
-  hitAudioName: 
+  startAudioName: 1202_fashe.wav
+  hitAudioName: feijian_hit.wav
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

Assets/Res/Aduio/Bgm.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BywXs3mqUClZK3KiHOJQ+MLbwu/go03JVGs9hiv6PUlni/EPxFPqgkdV93Gk
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Bgm/battle1.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: By4btXyqUSkCMsrpO6ny9AaXoJwwzhg4cAfbNvKZmM5dA2l9CpFQ+zJRa+Yu
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 2
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 0.31
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Bgm/battle2.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XngYtS6vUH/UPyCVbdKYq+aNQRViWuc4sZ+adiyvK5grcNwI2QRLJW/E4KTV
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 2
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Bgm/xunlongduobao.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WX9O5i/8Bnl8aTfKlkopFSIy42rnO5nMCn5caMmNCjINk3H6WmLSnaYXR5ZX
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 2
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Bgm/yunmengze.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XXwW43n/VCgtelM/SbY7MngzrMWZYIpa8cUBTNEYW5q675S6Hlh/sIB0t3w7
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/MainAudio.asset

@@ -14,78 +14,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   useCount: 1
   configs:
-  - describe: "\u6253boss\u7684\u65F6\u5019\u7528\u7684"
-    audionClipName: bossBattle.wav
+  - describe: 
+    audionClipName: battle1.mp3
     volume: 1
-  - describe: combatBattle.wav
-    audionClipName: combatBattle.wav
-    volume: 1
-  - describe: bing_hit.wav
-    audionClipName: bing_hit.wav
-    volume: 0.4
-  - describe: die1.wav
-    audionClipName: die1.wav
-    volume: 0.747
-  - describe: hero01_sk1.wav
-    audionClipName: hero01_sk1.wav
-    volume: 0.747
-  - describe: hero02_sk1.wav
-    audionClipName: hero02_sk1.wav
-    volume: 0.631
-  - describe: hero03_att.wav
-    audionClipName: hero03_att.wav
-    volume: 1
-  - describe: hero03_sk1.wav
-    audionClipName: hero03_sk1.wav
-    volume: 0.712
-  - describe: hero04_att.wav
-    audionClipName: hero04_att.wav
-    volume: 0.722
-  - describe: hero04_sk1.wav
-    audionClipName: hero04_sk1.wav
-    volume: 1
-  - describe: hero01_att.wav
-    audionClipName: hero01_att.wav
-    volume: 0.712
-  - describe: boss_lang_att.wav
-    audionClipName: boss_lang_att.wav
-    volume: 1
-  - describe: boss_lang_die.wav
-    audionClipName: boss_lang_die.wav
-    volume: 1
-  - describe: boss_lang_jiao.wav
-    audionClipName: boss_lang_jiao.wav
-    volume: 1
-  - describe: boss_lang_sk1.wav
-    audionClipName: boss_lang_sk1.wav
-    volume: 1
-  - describe: boss_lang_sk3.wav
-    audionClipName: boss_lang_sk3.wav
-    volume: 1
-  - describe: boss_she_att.wav
-    audionClipName: boss_she_att.wav
-    volume: 1
-  - describe: boss_she_die.wav
-    audionClipName: boss_she_die.wav
-    volume: 1
-  - describe: boss_she_sk1.wav
-    audionClipName: boss_she_sk1.wav
-    volume: 1
-  - describe: boss_she_sk3.wav
-    audionClipName: boss_she_sk3.wav
-    volume: 1
-  - describe: xiaoshe_die.wav
-    audionClipName: xiaoshe_die.wav
-    volume: 1
-  - describe: jingbi
-    audionClipName: jingbi.wav
-    volume: 1
-  - describe: openui
-    audionClipName: openui.wav
-    volume: 1
-  - describe: shibai
-    audionClipName: shibai.wav
-    volume: 1
-  - describe: zhuangbei
-    audionClipName: zhuangbei.wav
+  - describe: 
+    audionClipName: battle2.mp3
     volume: 1
+  - describe: 
+    audionClipName: xunlongduobao.wav
+    volume: 0.437

Assets/Res/Aduio/Skill/1101.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WXtK53+pUi7+QNoB2u4sGzHERZmRx/p0t8V1g87NT3xqYo3EGHnyeoK4RKul
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1101/feijian.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XHNJvC+pVC/uRSqoaHr9HyDsixXOEN31xnlJZYfxkcicQVOIjmT5stlJsbWj
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1101/feijian_hit.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: DHwatXmqWnjduoKDZ94S1fAGZUkmC+edxELQAbvDPAeIzTpT51K3zot0XC9W
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1101/feijian_shifa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CSsftiKkB3rGm805ugRxPCUjZUF1ghaQsy73UQtmGkLfEshH5VMoCW49syHH
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1102.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XHoZsS6oAS8wMmiAt7rOTnMIcTLub481Pkl4F7bQqTWk3IAfo7vf2qUyhb9/
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1102/1102_hit.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XC4atnirUXuOuv7ezw8ncGhbpJW8QeYXK5eeycl7KIKmioNe5Mb+vxGa+BRl
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1102/1102_shifa2.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XilJsHilVi6pH783njqA8eUpcgV5heVmspdVgPqpTJTq8NV8R1pAteqF6ejS
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1102/1102_shifang.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: Bn8cvXuuAn6MnKI8RRnmB7b/NtsY7YVOl9WRImLht6WJkU1VFvF9oILWQR7o
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1103.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DHsb5nitAC8alKsBLOCamA9MsBh7h+cLInCy9RrLoU/pkLj7sr5byByNOaXi
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1103/1103_shifang2.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: C3hMsiypUS2nHI10nfClox8hz5P/TXHsaJmJyGq6MnapvSTgli7CYKHoHVsx
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1104.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DXIft3moUy/PGDsU6EpTCNrY9kXdeZ4HtwFBFYf6tOkcove70F6YNHQuhveP
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1104/1104_fashe.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: BihLtX7+Uy/NFrdchA3tbvuPTB8zQhG6xC++Kog07oZ+Zg4YFey27kcefeql
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1201.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Xnsd4Xn4BnpPoYTNxzSNKmbqlIN0LFrRRq2B3MoUu0S1fJBJYSv7D+OUNwQv
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1201/1201_fashe.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XX8Y43ylU3Oz8EGpnWV35q/7LDqjQYoG5kIAEndAhqa/UUGmQTo1jW5ICgI/
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1202.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DH8ZtHmrUynFT36iyDK5lS5o/juV+aDCWX/JLe5v1A+3Pn8o8eu1uD2slJBF
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/1202/1202_fashe.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: Bn4btSL+UC2S8ZVtg/8FO3y0gkJNOKIezpI9Mm8XOzIHZPEwqBh1I1K9lz1p
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill/wannengshifa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WnIZ53iqBXLqRtBFesPzMNsY5yFxfDusyQEMm+tOktm4sOWDy4I2oM3He0ZE
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/ItemConfig.json

@@ -1056,7 +1056,8 @@
       "associateID": 4,
       "associateVlaue": [
         11001,
-        10001
+        10001,
+        3
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1085,7 +1086,8 @@
       "associateID": 4,
       "associateVlaue": [
         11002,
-        10002
+        10002,
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1114,7 +1116,8 @@
       "associateID": 4,
       "associateVlaue": [
         11003,
-        10003
+        10003,
+        3
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1143,7 +1146,8 @@
       "associateID": 4,
       "associateVlaue": [
         11004,
-        10004
+        10004,
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1172,7 +1176,8 @@
       "associateID": 4,
       "associateVlaue": [
         11005,
-        10005
+        10005,
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1201,7 +1206,8 @@
       "associateID": 4,
       "associateVlaue": [
         11006,
-        10006
+        10006,
+        3
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1230,7 +1236,8 @@
       "associateID": 4,
       "associateVlaue": [
         11007,
-        10007
+        10007,
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1259,7 +1266,8 @@
       "associateID": 4,
       "associateVlaue": [
         11008,
-        10008
+        10008,
+        3
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1288,7 +1296,8 @@
       "associateID": 4,
       "associateVlaue": [
         11009,
-        10009
+        10009,
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1317,7 +1326,8 @@
       "associateID": 4,
       "associateVlaue": [
         11010,
-        10010
+        10010,
+        3
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1346,7 +1356,8 @@
       "associateID": 4,
       "associateVlaue": [
         11011,
-        10011
+        10011,
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1650,7 +1661,8 @@
       "associateID": 3,
       "associateVlaue": [
         13001,
-        1101
+        1101,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1679,7 +1691,8 @@
       "associateID": 3,
       "associateVlaue": [
         13002,
-        1102
+        1102,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1708,7 +1721,8 @@
       "associateID": 3,
       "associateVlaue": [
         13003,
-        1103
+        1103,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1737,7 +1751,8 @@
       "associateID": 3,
       "associateVlaue": [
         13004,
-        1104
+        1104,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1766,7 +1781,8 @@
       "associateID": 3,
       "associateVlaue": [
         13005,
-        1105
+        1105,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1795,7 +1811,8 @@
       "associateID": 3,
       "associateVlaue": [
         13006,
-        1201
+        1201,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1824,7 +1841,8 @@
       "associateID": 3,
       "associateVlaue": [
         13007,
-        1202
+        1202,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1853,7 +1871,8 @@
       "associateID": 3,
       "associateVlaue": [
         13008,
-        1203
+        1203,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1882,7 +1901,8 @@
       "associateID": 3,
       "associateVlaue": [
         13009,
-        1204
+        1204,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1911,7 +1931,8 @@
       "associateID": 3,
       "associateVlaue": [
         13010,
-        1205
+        1205,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1940,7 +1961,8 @@
       "associateID": 3,
       "associateVlaue": [
         13011,
-        1301
+        1301,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1969,7 +1991,8 @@
       "associateID": 3,
       "associateVlaue": [
         13012,
-        1302
+        1302,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1998,7 +2021,8 @@
       "associateID": 3,
       "associateVlaue": [
         13013,
-        1303
+        1303,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2027,7 +2051,8 @@
       "associateID": 3,
       "associateVlaue": [
         13014,
-        1304
+        1304,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2056,7 +2081,8 @@
       "associateID": 3,
       "associateVlaue": [
         13015,
-        1305
+        1305,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2085,7 +2111,8 @@
       "associateID": 3,
       "associateVlaue": [
         13016,
-        1401
+        1401,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2114,7 +2141,8 @@
       "associateID": 3,
       "associateVlaue": [
         13017,
-        1402
+        1402,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2143,7 +2171,8 @@
       "associateID": 3,
       "associateVlaue": [
         13018,
-        1403
+        1403,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2172,7 +2201,8 @@
       "associateID": 3,
       "associateVlaue": [
         13019,
-        1404
+        1404,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2201,7 +2231,8 @@
       "associateID": 3,
       "associateVlaue": [
         13020,
-        1405
+        1405,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2230,7 +2261,8 @@
       "associateID": 3,
       "associateVlaue": [
         13021,
-        1501
+        1501,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2259,7 +2291,8 @@
       "associateID": 3,
       "associateVlaue": [
         13022,
-        1502
+        1502,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2288,7 +2321,8 @@
       "associateID": 3,
       "associateVlaue": [
         13023,
-        1503
+        1503,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2317,7 +2351,8 @@
       "associateID": 3,
       "associateVlaue": [
         13024,
-        1504
+        1504,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2346,7 +2381,8 @@
       "associateID": 3,
       "associateVlaue": [
         13025,
-        1505
+        1505,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2375,7 +2411,8 @@
       "associateID": 3,
       "associateVlaue": [
         13501,
-        2001
+        2001,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2404,7 +2441,8 @@
       "associateID": 3,
       "associateVlaue": [
         13502,
-        2002
+        2002,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2433,7 +2471,8 @@
       "associateID": 3,
       "associateVlaue": [
         13503,
-        2003
+        2003,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2462,7 +2501,8 @@
       "associateID": 3,
       "associateVlaue": [
         13504,
-        2004
+        2004,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2491,7 +2531,8 @@
       "associateID": 3,
       "associateVlaue": [
         13505,
-        2005
+        2005,
+        2
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2520,7 +2561,8 @@
       "associateID": 3,
       "associateVlaue": [
         13506,
-        2006
+        2006,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2549,7 +2591,8 @@
       "associateID": 3,
       "associateVlaue": [
         13507,
-        2007
+        2007,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2578,7 +2621,8 @@
       "associateID": 3,
       "associateVlaue": [
         13508,
-        2008
+        2008,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2607,7 +2651,8 @@
       "associateID": 3,
       "associateVlaue": [
         13509,
-        2009
+        2009,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2636,7 +2681,8 @@
       "associateID": 3,
       "associateVlaue": [
         13510,
-        2010
+        2010,
+        5
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2665,7 +2711,8 @@
       "associateID": 3,
       "associateVlaue": [
         13511,
-        2011
+        2011,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2694,7 +2741,8 @@
       "associateID": 3,
       "associateVlaue": [
         13512,
-        2012
+        2012,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2723,7 +2771,8 @@
       "associateID": 3,
       "associateVlaue": [
         13513,
-        2013
+        2013,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2752,7 +2801,8 @@
       "associateID": 3,
       "associateVlaue": [
         13514,
-        2014
+        2014,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2781,7 +2831,8 @@
       "associateID": 3,
       "associateVlaue": [
         13515,
-        2015
+        2015,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2810,7 +2861,8 @@
       "associateID": 3,
       "associateVlaue": [
         13516,
-        2016
+        2016,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2839,7 +2891,8 @@
       "associateID": 3,
       "associateVlaue": [
         13517,
-        2017
+        2017,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2868,7 +2921,8 @@
       "associateID": 3,
       "associateVlaue": [
         13518,
-        2018
+        2018,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2897,7 +2951,8 @@
       "associateID": 3,
       "associateVlaue": [
         13519,
-        2019
+        2019,
+        15
       ],
       "sort": 0,
       "itemDesc2": 0

Assets/Res/TimeLineAssets/1104_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1104_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1104\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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,\"isUseRandom\":true,\"xoff\":{\"x\":1,\"y\":-1},\"yoff\":{\"x\":0.5,\"y\":-0.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1104_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1104_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0.2333333,\"endTime\":1.09898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1104\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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,\"isUseRandom\":true,\"xoff\":{\"x\":1,\"y\":-1},\"yoff\":{\"x\":0.5,\"y\":-0.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1104_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1105_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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,\"isUseRandom\":true,\"xoff\":{\"x\":0.5,\"y\":-0.5},\"yoff\":{\"x\":0.5,\"y\":-0.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1105_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0.2833333,\"endTime\":1.14898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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,\"isUseRandom\":true,\"xoff\":{\"x\":0.5,\"y\":-0.5},\"yoff\":{\"x\":0.5,\"y\":-0.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1105_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1201_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1201_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingzhui\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1201_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1201_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingzhui\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1201_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1204_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1204_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_shuiqiu\",\"randomSeed\":518,\"locationType\":5,\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1204_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1204_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_shuiqiu\",\"randomSeed\":518,\"locationType\":5,\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1204_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1205_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1205_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingdao\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1205_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1205_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingdao\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1205_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1301_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1301_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_duzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"0\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1301_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1301_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8656462,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_duzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"0\",\"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,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1301_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Scenes/testCombat.scene

@@ -2519,7 +2519,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -12757,6 +12757,140 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1185765190}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1955884455
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_Name
+      value: Nanzhu (6)
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.105
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 6.027
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.281
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+--- !u!1001 &2021035166
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 198328406000524784, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle03 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 198328406000524784, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3585384551010318200, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.14066
+      objectReference: {fileID: 0}
+    - target: {fileID: 3585384551010318200, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.14066
+      objectReference: {fileID: 0}
+    - target: {fileID: 3585384551010318200, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.14066
+      objectReference: {fileID: 0}
+    - target: {fileID: 7214187026765325610, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
 --- !u!1 &2068818557
 GameObject:
   m_ObjectHideFlags: 0
@@ -14648,3 +14782,5 @@ SceneRoots:
   - {fileID: 9136575265582076979}
   - {fileID: 1482512349}
   - {fileID: 143773478}
+  - {fileID: 2021035166}
+  - {fileID: 1955884455}

Assets/Scripts/Core/Audio/AudioManager.cs

@@ -14,18 +14,37 @@ namespace Core.Audio
         private Map<string, AudioBundleInfo> _allAduionBundleInfos = new Map<string, AudioBundleInfo>();
 
         private Queue<AudioSourcePool> _audioSourcePools = new Queue<AudioSourcePool>();
-        private Map<string, AudioSourcePool> _currPlayAudio = new Map<string, AudioSourcePool>();
+        private Map<string, List<AudioSourcePool>> _currPlayAudio = new Map<string, List<AudioSourcePool>>();
 
         private List<string> _bgmQueue = new List<string>();
         private AudioSourcePool _currBgm;
 
         private List<string> _audion = new List<string>();
 
+        public float AudionVolume
+        {
+            get => _audionVolume;
+        }
+
+        public float BgmVolume
+        {
+            get => _bgmVolume;
+        }
+
+        private float _audionVolume = 1;
+        private float _bgmVolume = 1;
+
         public AudioManager()
         {
             // UIAudio.AudioPlayManager = this;
             _root = new GameObject();
             _root.name = "audio";
+            AudioListener audioListener = GameObject.FindObjectOfType<AudioListener>();
+            if (audioListener == null)
+            {
+                _root.AddComponent<AudioListener>();
+            }
+
             Object.DontDestroyOnLoad(_root);
         }
 
@@ -35,6 +54,14 @@ namespace Core.Audio
         /// <param name="value"></param>
         public void SetAudioValue(float value)
         {
+            _audionVolume = value;
+            for (_currPlayAudio.Begin(); _currPlayAudio.Next();)
+            {
+                for (int i = 0; i < _currPlayAudio.Value.Count; i++)
+                {
+                    _currPlayAudio.Value[i].Setvolume();
+                }
+            }
         }
 
         /// <summary>
@@ -43,6 +70,16 @@ namespace Core.Audio
         /// <param name="value"></param>
         public void SetBgmValue(float value)
         {
+            _bgmVolume = value;
+            for (_currPlayAudio.Begin(); _currPlayAudio.Next();)
+            {
+                for (int i = 0; i < _currPlayAudio.Value.Count; i++)
+                {
+                    _currPlayAudio.Value[i].Setvolume();
+                }
+            }
+
+            _currBgm?.Setvolume();
         }
 
         public async CTask Init()
@@ -76,9 +113,13 @@ namespace Core.Audio
                 AudionSettingConfig.AudionConfig audionConfig = audionSettingConfig.configs[i];
                 if (_allAduionBundleInfos.TryGetValue(audionConfig.audionClipName, out AudioBundleInfo abi))
                 {
-                    if (_currPlayAudio.TryGetValue(audionConfig.audionClipName, out AudioSourcePool audioSourcePool))
+                    if (_currPlayAudio.TryGetValue(audionConfig.audionClipName,
+                            out List<AudioSourcePool> audioSourcePool))
                     {
-                        audioSourcePool.Finish();
+                        for (int j = 0; j < audioSourcePool.Count; j++)
+                        {
+                            audioSourcePool[i].Finish();
+                        }
                     }
 
                     abi.Dispose();
@@ -118,7 +159,10 @@ namespace Core.Audio
                 _audioSourcePools.Enqueue(audioSourcePool);
             }
 
-            _currPlayAudio.Remove(audioSourcePool.CurrPlayName);
+            if (_currPlayAudio.TryGetValue(audioSourcePool.CurrPlayName, out List<AudioSourcePool> audioSourcePools))
+            {
+                audioSourcePools.Remove(audioSourcePool);
+            }
         }
 
         private AudioSourcePool GetAudioSourcePool()
@@ -166,7 +210,7 @@ namespace Core.Audio
                 _currBgm = GetAudioSourcePool();
             }
 
-            _currBgm.Play(bgmName, audioClip, true, audioBundleInfo._volume);
+            _currBgm.Play(bgmName, true, audioClip, true, audioBundleInfo._volume);
         }
 
         public void PauseBGM()
@@ -226,14 +270,29 @@ namespace Core.Audio
 
             using (await CoroutineLockComponent.Instance.Wait(audionName))
             {
-                if (_currPlayAudio.TryGetValue(audionName, out AudioSourcePool asp))
+                if (_currPlayAudio.TryGetValue(audionName, out List<AudioSourcePool> asp))
                 {
-                    if (asp.Progress() < 0.2)
+                    for (int i = 0; i < asp.Count; i++)
                     {
-                        return null;
+                        AudioSourcePool a = asp[i];
+                        a.Setvolume(a.AudioVolume - 0.33f);
+                        if (a.AudioVolume <= 0)
+                        {
+                            a.Finish();
+                            i--;
+                        }
                     }
-
-                    asp.Finish();
+                    // if (asp.Progress() < 0.2)
+                    // {
+                    //     return null;
+                    // }
+                    //
+                    // asp.Finish();
+                }
+                else
+                {
+                    asp = new List<AudioSourcePool>();
+                    _currPlayAudio.Add(audionName, asp);
                 }
 
                 AudioBundleInfo audioBundleInfo = await GetAduionBundleInfo(audionName);
@@ -245,8 +304,8 @@ namespace Core.Audio
                 }
 
                 AudioSourcePool audioSourcePool = GetAudioSourcePool();
-                audioSourcePool.Play(audionName, audioClip, isLoop, audioBundleInfo._volume,speed);
-                _currPlayAudio[audionName] = audioSourcePool;
+                audioSourcePool.Play(audionName, false, audioClip, isLoop, audioBundleInfo._volume, speed);
+                asp.Add(audioSourcePool);
                 return audioSourcePool;
             }
         }

Assets/Scripts/Core/Audio/AudioSourcePool.cs

@@ -25,6 +25,15 @@ namespace Core.Audio
 
         public string _currPlayName;
 
+        public float AudioVolume
+        {
+            get { return _audioVolume; }
+        }
+
+        private float _audioVolume;
+
+        public bool IsBgm;
+
         public void Init(Transform root)
         {
             GameObject gameObject = new GameObject();
@@ -32,7 +41,8 @@ namespace Core.Audio
             gameObject.transform.SetParent(root);
         }
 
-        public void Play(string audioName, AssetHandle audioClip, bool isLoop, float volume, float speed = 1)
+        public void Play(string audioName, bool isBgm, AssetHandle audioClip, bool isLoop, float volume,
+            float speed = 1)
         {
             if (audioClip == null)
             {
@@ -43,14 +53,15 @@ namespace Core.Audio
             // {
             //     _assetHandle.Release();
             // }
-
+            this.IsBgm = isBgm;
             IsPlay = true;
             _currPlayName = audioName;
             // _assetHandle = audioClip;
             _audioSource.clip = audioClip.AssetObject<AudioClip>();
             _audioSource.loop = isLoop;
             _audioSource.pitch = speed;
-            _audioSource.volume = volume;
+            _audioVolume = volume;
+            Setvolume();
             if (speed > 1)
             {
                 _audioSource.outputAudioMixerGroup = AudioManager.Instance.AudioMixerGroup;
@@ -71,6 +82,23 @@ namespace Core.Audio
             }
         }
 
+        public void Setvolume(float volume)
+        {
+            _audioVolume = volume;
+            if (_audioVolume < 0)
+            {
+                return;
+            }
+
+            Setvolume();
+        }
+
+        public void Setvolume()
+        {
+            _audioSource.volume = _audioVolume *
+                                  (IsBgm ? AudioManager.Instance.BgmVolume : AudioManager.Instance.AudionVolume);
+        }
+
 
         public float Progress()
         {

Assets/Scripts/GameLogic/Combat/CombatState/CombatFightState.cs

@@ -1,3 +1,4 @@
+using Core.Audio;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.CombatTool.CombatReport;
 using GameLogic.Combat.Hero;
@@ -17,14 +18,13 @@ namespace GameLogic.Combat.CombatState
             CombatController.CombatCameraControllder.SetPos(playerHeroEntity.combatHeroGameObject.transform);
             CombatController.CombatCameraControllder.isStop = true;
             CombatController.IsFightState = true;
-            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(60,3);
-            
+            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(60, 3);
+            AudioManager.Instance.PlayBGM("battle1.mp3");
         }
 
         protected override void ProExit()
         {
             CombatController.CombatCameraControllder.isStop = false;
-           
         }
 
         protected override void ProUpdate(float t)
@@ -36,14 +36,27 @@ namespace GameLogic.Combat.CombatState
             }
 
             CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
-            IHero ihero = FindMinDixtance(allHero,maxCount);
+                CombatController.currActiveCombat.CombatHeroController.GetHero(true, out int maxCount);
+            IHero ihero = FindMinDixtance(allHero, maxCount, 500);
             if (ihero == null)
             {
                 CombatController.ChangeState("update");
                 return;
             }
 
+            IHero ihero2 = FindMinDixtance(allHero, maxCount, 225);
+            if (ihero2 == null)
+            {
+                float add = 0.1f;
+                Vector3 pos = playerHeroEntity.dotPos;
+                Vector3 dir = CombatController.currActiveCombat.CombatHeroController.moveDir;
+                float fx = 1;
+
+                pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;
+
+                playerHeroEntity.combatHeroGameObject.SetPosition(pos);
+                playerHeroEntity.GameObject.transform.rotation = Quaternion.LookRotation(dir * fx);
+            }
 
 
             CombatController.CombatHeroController.Update(t);
@@ -51,7 +64,7 @@ namespace GameLogic.Combat.CombatState
             CombatController.GameTimeLineParticleFactory.CombatUpdate(t);
         }
 
-        protected IHero FindMinDixtance(CombatHeroEntity[] allHero,int maxCount)
+        protected IHero FindMinDixtance(CombatHeroEntity[] allHero, int maxCount, int maxDis)
         {
             IHero minDistanceHero = null;
             if (allHero == null)
@@ -71,7 +84,7 @@ namespace GameLogic.Combat.CombatState
 
                 float distance = Vector3.SqrMagnitude(hero.combatHeroGameObject.position -
                                                       playerHeroEntity.combatHeroGameObject.position);
-                if (distance < minDistance&& distance < 500)
+                if (distance < minDistance && distance < maxDis)
                 {
                     // if (!_combatHeroEntity.IsEnemy || distance < _combatHeroEntity.CurrCombatHeroInfo.maxDisTo + 100)
                     {

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -1,4 +1,5 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using Core.Audio;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.CombatType;
@@ -35,7 +36,7 @@ namespace GameLogic.Combat.CombatState
                 playerHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Flight,isQiangZhi:true);
                 playerHeroEntity.CurrCombatHeroInfo.Shield = playerHeroEntity.MaxCombatHeroInfo.Shield;
                 CombatCalculateTool.Instance.Recover(playerHeroEntity,
-                    playerHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), 999999, AttType.Normal, HarmType.Default,
+                    playerHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), 999999, AttType.Normal, HarmType.Null,
                     new TriggerData());
             }
 
@@ -43,6 +44,7 @@ namespace GameLogic.Combat.CombatState
             isNullMonster = true;
             CombatController.MagicWeaponCombatSence.CloseSecene();
             CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(70,1);
+            AudioManager.Instance.PlayBGM("xunlongduobao.wav");
         }
 
         protected override void ProUpdate(float t)
@@ -68,22 +70,18 @@ namespace GameLogic.Combat.CombatState
 
             CombatHeroEntity[] allHero =
                 CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
-            IHero ihero = FindMinDixtance(allHero,maxCount);
-            if (ihero != null)
+            if (maxCount > 0)
             {
                 CombatController.ChangeState("fight");
                 return;
             }
+            
 
             float add = 0.1f;
             Vector3 pos = playerHeroEntity.dotPos;
             Vector3 dir =  CombatController.currActiveCombat.CombatHeroController.moveDir;
             float fx = 1;
-
-            // pos = CombatController.currActiveCombat.CombatSenceController.Move(10 * t);
-            // float lt = CombatController.currActiveCombat.CombatSenceController.currTime - 0.01f;
-            // Vector3 p = CombatController.currActiveCombat.CombatSenceController.GetTarget(lt);
-            // dir = (pos - p).normalized;
+            
             pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;
 
             playerHeroEntity.combatHeroGameObject.SetPosition(pos);

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

@@ -5,27 +5,27 @@ namespace GameLogic.Combat.CombatTool
     [Flags]
     public enum HarmType
     {
-        Null=0,
-        Default=1,
+        Null=1,
+        Default=2,
         /// <summary>
         /// 系统杀死 不掉落和统计
         /// </summary>
-        SystemKo=2,
+        SystemKo=4,
         /// <summary>
         /// 暴击了
         /// </summary>
-        BaoJi=4,
+        BaoJi=8,
         /// <summary>
         /// 护盾 性伤害
         /// </summary>
-        Shields=8,
+        Shields=16,
         /// <summary>
         /// buff性伤害
         /// </summary>
-        Buff=16,
+        Buff=32,
         /// <summary>
         /// 恢复
         /// </summary>
-        Recover=32,
+        Recover=64,
     }
 }

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

@@ -1,5 +1,6 @@
 using System;
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using Core.Audio;
 using Core.Triiger;
 using Fort23.Common;
 using Fort23.Core;
@@ -27,6 +28,7 @@ namespace Common.Combat.FxAILogic
         [Header("延迟时间发射")] public float delayTime;
         [Header("多目标时延迟")] public float multipleTargetDelayTime;
         [Header("碰撞时的特效")] public string hitFxName;
+        [Header("开始飞行的音效")] public string startAudioName;
         [Header("碰撞音效")] public string hitAudioName;
         [Header("对碰时播放的特效")] public string pengZhuangHitFxName;
         public BarrierTriggerData BarrierTriggerData;
@@ -98,6 +100,7 @@ namespace Common.Combat.FxAILogic
         private float _currAllDelayTime;
         public bool isInit = false;
 
+        private bool isPlayStartAudio = false;
         public void Init(Vector3 startPos,
             TimeLineEventParticleLogicBasic timeLineEventParticleLogicBasic, ILifetCycleHitPoint attTarget,
             SpecialDotInfo specialDotInfo = null)
@@ -108,6 +111,7 @@ namespace Common.Combat.FxAILogic
                 return;
             }
 
+            isPlayStartAudio = false;
             if (moveTarget == null)
             {
                 moveTarget = ObjectPoolInterface.own;
@@ -239,6 +243,15 @@ namespace Common.Combat.FxAILogic
                 return;
             }
 
+            if (!isPlayStartAudio)
+            {
+                isPlayStartAudio = true;
+                if (!string.IsNullOrEmpty(startAudioName))
+                {
+                    AudioManager.Instance.Play(startAudioName,false);
+                }
+            }
+
             ProCombatUpdate(time);
             if (_timeLineEventParticleLogicBasic == null)
             {

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

@@ -57,6 +57,11 @@ namespace Fort23.Mono
             CombatHeroEntity heroEntity = harmReturnInfo.target.combatHeroEntity as CombatHeroEntity;
             long att = harmReturnInfo.att;
             HarmType harmType = harmReturnInfo.harmType;
+            if (harmType.HasFlag(HarmType.Null))
+            {
+                return;
+            }
+
             ShowTextWidget widget =
                 await UIManager.Instance.CreateGComponentForObject<ShowTextWidget>(ShowTextWidget, null, transform,
                     isInstance: true);

UserSettings/Layouts/default-2022.dwlt

@@ -15,16 +15,43 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 32.000004
-    width: 1920.0002
-    height: 1012.0001
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: "\u6E38\u620F"
-  m_RootView: {fileID: 2}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 3}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
+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: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 879
+    y: 0
+    width: 742
+    height: 1299
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 16}
+  m_Panes:
+  - {fileID: 16}
+  - {fileID: 11}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -37,22 +64,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
   - {fileID: 4}
   - {fileID: 5}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0002
-    height: 1012.0001
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -69,12 +96,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0002
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &4
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,22 +114,23 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 6}
+  - {fileID: 10}
+  - {fileID: 2}
   - {fileID: 7}
   - {fileID: 8}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0002
-    height: 962.0001
-  m_MinSize: {x: 400, y: 50}
-  m_MaxSize: {x: 32384, y: 8096}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 500, y: 50}
+  m_MaxSize: {x: 40480, y: 8096}
   vertical: 0
-  controlID: 761
+  controlID: 273
   draggingID: 0
---- !u!114 &5
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -118,12 +146,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.0001
-    width: 1920.0002
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &6
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -138,18 +166,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 866.50006
+    x: 1621
     y: 0
-    width: 348.50006
-    height: 962.0001
+    width: 220
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 10}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 10}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -164,18 +192,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1215.0001
+    x: 1841
     y: 0
-    width: 293
-    height: 962.0001
+    width: 316
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -190,18 +218,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1508.0001
+    x: 2157
     y: 0
-    width: 412.00012
-    height: 962.0001
+    width: 403
+    height: 1299
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -218,17 +246,59 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 866.50006
-    height: 962.0001
+    width: 879
+    height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 15}
   m_Selected: 0
-  m_LastSelected: 1
---- !u!114 &10
+  m_LastSelected: 0
+--- !u!114 &11
+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: 0
+  m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 361
+    y: 73
+    width: 740
+    height: 1278
+  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
+  m_Preferences:
+    editType: 0
+    timeReferenceMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_SequenceHierarchy: {fileID: 0}
+  m_SequencePath:
+    m_SelectionRoot: 0
+    m_SubElements: []
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -243,15 +313,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u5C42\u7EA7"
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 866.5001
-    y: 62.000008
-    width: 346.50006
-    height: 941.0001
+    x: 1621
+    y: 73
+    width: 218
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -267,7 +337,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 0803f6ff0c03f6ff1e03f6ff781af7ffbcbdffff6cbeffff70beffff7ebeffff40f2ffff
+      m_ExpandedIDs: 4ac7ffff50c7ffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -283,7 +353,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 6}
+        m_ClientGUIView: {fileID: 7}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -291,7 +361,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &11
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -306,15 +376,15 @@ MonoBehaviour:
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u68C0\u67E5\u5668"
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1508.0001
-    y: 62.000008
-    width: 411.00012
-    height: 941.0001
+    x: 2157
+    y: 73
+    width: 402
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -338,7 +408,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &12
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -353,15 +423,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: "\u9879\u76EE"
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1215.0001
-    y: 62.000008
-    width: 291
-    height: 941.0001
+    x: 1841
+    y: 73
+    width: 314
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -373,7 +443,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gamerun
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -383,24 +453,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Editor
     m_Globs: []
-    m_OriginalText: gamerun
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets
+  - Assets/Editor
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: H:\XY002\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 5.890573}
-    m_SelectedIDs: d2100100
-    m_LastClickedID: 69842
-    m_ExpandedIDs: 00000000866a0000d2100100d4100100d6100100d8100100da100100dc100100de100100e0100100e2100100e4100100e6100100e8100100ea100100ec100100ee100100f0100100f2100100f4100100f6100100f8100100fa100100fc100100fe10010000110100021101000411010006110100081101000a1101000c11010000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: b4fb0000
+    m_LastClickedID: 64436
+    m_ExpandedIDs: 0000000022fb000024fb000026fb000028fb00002afb00002cfb00002efb000030fb000032fb000034fb000036fb000038fb00003afb00003cfb00003efb000040fb000042fb000044fb000046fb000048fb00004afb00004cfb00004efb000050fb000052fb000054fb000056fb000058fb00005afb00005cfb00005efb000060fb000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -428,7 +498,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000866a0000d2100100d4100100d6100100d8100100da100100dc100100de100100e0100100e2100100e4100100e6100100e8100100ea100100ec100100ee100100f0100100f2100100f4100100f6100100f8100100fa100100fc100100fe10010000110100021101000411010006110100081101000a1101000c110100
+    m_ExpandedIDs: 0000000022fb000024fb000026fb000028fb00002afb00002cfb00002efb000030fb000032fb000034fb000036fb000038fb00003afb00003cfb00003efb000040fb000042fb000044fb000046fb000048fb00004afb00004cfb00004efb000050fb000052fb000054fb000056fb000058fb00005afb00005cfb00005efb000060fb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -472,7 +542,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 7}
+      m_ClientGUIView: {fileID: 8}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -483,8 +553,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 143
---- !u!114 &13
+  m_DirectoriesAreaWidth: 198
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -499,15 +569,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u6E38\u620F"
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 62.000008
-    width: 865.50006
-    height: 941.0001
+    y: 73
+    width: 878
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -539,17 +609,17 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.50002
-    m_HBaseRangeMax: 187.50002
-    m_VBaseRangeMin: -406.00006
-    m_VBaseRangeMax: 406.00006
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 0
+    m_VSlider: 1
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
@@ -560,29 +630,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 865.50006
-      height: 920.0001
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 432.75003, y: 460.00006}
+      width: 878
+      height: 1257
+    m_Scale: {x: 0.7972352, y: 0.7972352}
+    m_Translation: {x: 439, y: 627.705}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -432.75003
-      y: -460.00006
-      width: 865.50006
-      height: 920.0001
+      x: -550.6531
+      y: -787.35236
+      width: 1101.3062
+      height: 1576.6991
     m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1731, y: 1882.0001}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 878, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &14
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -597,15 +667,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u573A\u666F"
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 62.000008
-    width: 865.50006
-    height: 941.0001
+    x: 879
+    y: 73
+    width: 740
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -958,9 +1028,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 48}
+      snapOffset: {x: -200, y: -55}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 3
       id: Hot Reload
       index: 12
       layout: 4
@@ -977,9 +1047,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 5.7834406, y: 18.793673, z: -4.1852207}
+    m_Target: {x: -127.35085, y: -32.111565, z: -348.24484}
     speed: 2
-    m_Value: {x: 5.7834406, y: 18.793673, z: -4.1852207}
+    m_Value: {x: -127.35085, y: -32.111565, z: -348.24484}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -988,7 +1058,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -1025,13 +1095,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.21748966, y: 0.7510034, z: -0.30159074, w: -0.54577214}
+    m_Target: {x: -0.0046656313, y: -0.9712362, z: 0.23800933, w: -0.021514397}
     speed: 2
-    m_Value: {x: -0.2174753, y: 0.7509538, z: -0.30157083, w: -0.5457361}
+    m_Value: {x: -0.0046646222, y: -0.9710261, z: 0.23795785, w: -0.021509742}
   m_Size:
-    m_Target: 21.155035
+    m_Target: 439.56247
     speed: 2
-    m_Value: 21.155035
+    m_Value: 460.27484
   m_Ortho:
     m_Target: 0
     speed: 2