Browse Source

添加音效

DESKTOP-FB72PO8\Administrator 4 months ago
parent
commit
e27df9a425
65 changed files with 5026 additions and 263 deletions
  1. 2 2
      Assets/Art/DiMian.shadergraph
  2. 1 1
      Assets/Art/GuaiWuTimeline/Guaiwu01.playable
  3. 571 1
      Assets/Art/GuaiWuTimeline/GuaiwuBoss01.playable
  4. 840 89
      Assets/Art/GuaiWuTimeline/GuaiwuBoss02.playable
  5. 229 1
      Assets/Art/HeroTimeLine/Hero01.playable
  6. 115 1
      Assets/Art/HeroTimeLine/Hero02.playable
  7. 228 0
      Assets/Art/HeroTimeLine/Hero03.playable
  8. 230 2
      Assets/Art/HeroTimeLine/Hero04.playable
  9. 15 18
      Assets/Plugins/ShaderGraphEssentials/DemoScenes/Demo_URP/Shaders/SGE_ToonLightingGraph.shadersubgraph
  10. 17 46
      Assets/Plugins/ShaderGraphEssentials/DemoScenes/Demo_URP/Shaders/SGE_ToonLit.shadergraph
  11. 54 3
      Assets/Res/Aduio/MainAudio.asset
  12. BIN
      Assets/Res/Aduio/Skill/boss_lang_att.wav
  13. 23 0
      Assets/Res/Aduio/Skill/boss_lang_att.wav.meta
  14. BIN
      Assets/Res/Aduio/Skill/boss_lang_die.wav
  15. 23 0
      Assets/Res/Aduio/Skill/boss_lang_die.wav.meta
  16. BIN
      Assets/Res/Aduio/Skill/boss_lang_jiao.wav
  17. 23 0
      Assets/Res/Aduio/Skill/boss_lang_jiao.wav.meta
  18. BIN
      Assets/Res/Aduio/Skill/boss_lang_sk1.wav
  19. 23 0
      Assets/Res/Aduio/Skill/boss_lang_sk1.wav.meta
  20. BIN
      Assets/Res/Aduio/Skill/boss_lang_sk3.wav
  21. 23 0
      Assets/Res/Aduio/Skill/boss_lang_sk3.wav.meta
  22. BIN
      Assets/Res/Aduio/Skill/boss_she_att.wav
  23. 23 0
      Assets/Res/Aduio/Skill/boss_she_att.wav.meta
  24. BIN
      Assets/Res/Aduio/Skill/boss_she_die.wav
  25. 23 0
      Assets/Res/Aduio/Skill/boss_she_die.wav.meta
  26. BIN
      Assets/Res/Aduio/Skill/boss_she_sk1.wav
  27. 23 0
      Assets/Res/Aduio/Skill/boss_she_sk1.wav.meta
  28. BIN
      Assets/Res/Aduio/Skill/boss_she_sk3.wav
  29. 23 0
      Assets/Res/Aduio/Skill/boss_she_sk3.wav.meta
  30. BIN
      Assets/Res/Aduio/Skill/hero01_att.wav
  31. 23 0
      Assets/Res/Aduio/Skill/hero01_att.wav.meta
  32. BIN
      Assets/Res/Aduio/Skill/hero01_sk1.wav
  33. 23 0
      Assets/Res/Aduio/Skill/hero01_sk1.wav.meta
  34. BIN
      Assets/Res/Aduio/Skill/hero02_sk1.wav
  35. 23 0
      Assets/Res/Aduio/Skill/hero02_sk1.wav.meta
  36. BIN
      Assets/Res/Aduio/Skill/hero03_att.wav
  37. 23 0
      Assets/Res/Aduio/Skill/hero03_att.wav.meta
  38. BIN
      Assets/Res/Aduio/Skill/hero03_sk1.wav
  39. 23 0
      Assets/Res/Aduio/Skill/hero03_sk1.wav.meta
  40. BIN
      Assets/Res/Aduio/Skill/hero04_att.wav
  41. 23 0
      Assets/Res/Aduio/Skill/hero04_att.wav.meta
  42. BIN
      Assets/Res/Aduio/Skill/hero04_sk1.wav
  43. 23 0
      Assets/Res/Aduio/Skill/hero04_sk1.wav.meta
  44. BIN
      Assets/Res/Aduio/Skill/xiaoshe_die.wav
  45. 23 0
      Assets/Res/Aduio/Skill/xiaoshe_die.wav.meta
  46. BIN
      Assets/Res/Aduio/combatBattle.wav
  47. 4 13
      Assets/Res/Aduio/combatBattle.wav.meta
  48. BIN
      Assets/Res/Aduio/combatBattle1.wav
  49. 23 0
      Assets/Res/Aduio/combatBattle1.wav.meta
  50. 0 0
      Assets/Res/TimeLineAssets/Guaiwu01_TD.txt
  51. 0 0
      Assets/Res/TimeLineAssets/GuaiwuBoss01_TD.txt
  52. 0 0
      Assets/Res/TimeLineAssets/GuaiwuBoss02_TD.txt
  53. 0 0
      Assets/Res/TimeLineAssets/Hero01_TD.txt
  54. 0 0
      Assets/Res/TimeLineAssets/Hero02_TD.txt
  55. 0 0
      Assets/Res/TimeLineAssets/Hero03_TD.txt
  56. 0 0
      Assets/Res/TimeLineAssets/Hero04_TD.txt
  57. 1 0
      Assets/Scripts/Core/Audio/AudioSourcePool.cs
  58. 2 2
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs
  59. 1 0
      Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs
  60. 21 5
      Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineAudioEventLogic.cs
  61. 5 2
      Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineAudio.cs
  62. 9 0
      Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineAudioEntity.cs
  63. 3 0
      Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineAudioEntity.cs.meta
  64. 0 0
      Assets/StreamingAssets/assetConfig.txt
  65. 2264 77
      UserSettings/Layouts/default-2022.dwlt

+ 2 - 2
Assets/Art/DiMian.shadergraph

@@ -354,7 +354,7 @@
     "m_Hidden": false,
     "m_Priority": 10,
     "m_Value": {
-        "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
+        "m_SerializedTexture": "",
         "m_Guid": ""
     },
     "isMainTexture": false,
@@ -1363,7 +1363,7 @@
     "m_StageCapability": 3,
     "m_BareResource": false,
     "m_Texture": {
-        "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
+        "m_SerializedTexture": "",
         "m_Guid": ""
     },
     "m_DefaultType": 0

+ 1 - 1
Assets/Art/GuaiWuTimeline/Guaiwu01.playable

@@ -765,7 +765,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
   m_Name: AudioPlayableAsset
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 8300000, guid: dfba76e7fa18b8148a4a03c9a599903c, type: 3}
+  m_Clip: {fileID: 8300000, guid: 3fbddb7b049560b42bc655431f95e32b, type: 3}
   m_Loop: 0
   m_bufferingTime: 0.1
   m_ClipProperties:

+ 571 - 1
Assets/Art/GuaiWuTimeline/GuaiwuBoss01.playable

@@ -61,6 +61,23 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &-8440615099111035151
+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: 56da65f0104fbfa459e0f5e32100bb41, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-8222488760391367782
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -86,6 +103,7 @@ MonoBehaviour:
   - {fileID: -6451078940464984751}
   - {fileID: 7998284453243782333}
   - {fileID: 5954998234226498930}
+  - {fileID: -6139100301569777906}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -229,6 +247,119 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &-7109486054054710327
+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: 7714894456577681812}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7019249190295553558}
+    m_Duration: 0.536734693877551
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -7109486054054710327}
+    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: boss_she_att
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
+--- !u!114 &-7019249190295553558
+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: fd74117f7d87e234eaa2ff9f0dbaa17e, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-6651696207990093718
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -336,13 +467,14 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 3504051212001476799}
   - {fileID: 4296197759840759107}
+  - {fileID: 2786158496142874662}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -439,6 +571,102 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
+--- !u!114 &-6139100301569777906
+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: -8222488760391367782}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -8440615099111035151}
+    m_Duration: 3.033333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -6139100301569777906}
+    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: boss_she_sk3
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-5912482810698725721
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -878,6 +1106,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 &-2671342856921804481
+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: f59f11c2f0d20b549907ee49c41da183, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-2565394967089053431
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1112,6 +1357,7 @@ MonoBehaviour:
   - {fileID: -5912482810698725721}
   - {fileID: 2965460663511770507}
   - {fileID: -1547615911253161970}
+  - {fileID: 8753742329161277487}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -1699,6 +1945,23 @@ MonoBehaviour:
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
+--- !u!114 &129564640241362014
+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: 125dbbbc3c624dd44a43fdc1e9161a66, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &203342079230453082
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1806,6 +2069,23 @@ MonoBehaviour:
   targetEntityType: 1
   tineLineTrigerType: 0
   tineLineTrigerData: 
+--- !u!114 &1082892787984421694
+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: 56da65f0104fbfa459e0f5e32100bb41, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &1130384948799537865
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2041,6 +2321,102 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &2786158496142874662
+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: -6594532635478953273}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -2671342856921804481}
+    m_Duration: 1.677596371882086
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 2786158496142874662}
+    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: boss_she_die
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &2965460663511770507
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2960,6 +3336,7 @@ MonoBehaviour:
   - {fileID: 4878132115033091613}
   - {fileID: 5832023345664597774}
   - {fileID: 203342079230453082}
+  - {fileID: 6638126755092418701}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -3331,6 +3708,102 @@ MonoBehaviour:
     m_DisplayName: TimeLineTriggerAsset
   m_Markers:
     m_Objects: []
+--- !u!114 &6638126755092418701
+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: 5803592254649619942}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 1082892787984421694}
+    m_Duration: 3.2736054421768706
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 6638126755092418701}
+    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: boss_she_sk3
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &6707522695159518091
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3389,6 +3862,7 @@ MonoBehaviour:
   - {fileID: -7318956865521741931}
   - {fileID: -6651696207990093718}
   - {fileID: 5920272426738881943}
+  - {fileID: -7109486054054710327}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -3526,3 +4000,99 @@ 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 &8753742329161277487
+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: -2287732871305328428}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 129564640241362014}
+    m_Duration: 0.7788208616780046
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 8753742329161277487}
+    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: boss_she_sk1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0

File diff suppressed because it is too large
+ 840 - 89
Assets/Art/GuaiWuTimeline/GuaiwuBoss02.playable


+ 229 - 1
Assets/Art/HeroTimeLine/Hero01.playable

@@ -1016,6 +1016,7 @@ MonoBehaviour:
   - {fileID: -7166918911015196851}
   - {fileID: -3828777382670004432}
   - {fileID: -6938129486409711545}
+  - {fileID: 7136334172665929659}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -1437,6 +1438,102 @@ 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 &-4477500620234384207
+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: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 5860716470997814968}
+    m_Duration: 1.095827664399093
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -4477500620234384207}
+    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: hero01_sk1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-3828777382670004432
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1693,7 +1790,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}
@@ -2817,6 +2914,7 @@ MonoBehaviour:
   - {fileID: 7363228939947702508}
   - {fileID: -7379477113019173770}
   - {fileID: 1169797055110047173}
+  - {fileID: -4477500620234384207}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -3376,6 +3474,23 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &5140649235735941787
+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: 4bafa52b96427ec4188d7709379ce979, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &5597593833627070399
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3400,6 +3515,23 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &5860716470997814968
+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: f524202ecd147fa439fe2a00f23ca57f, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &5994045965338449050
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3473,6 +3605,102 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &7136334172665929659
+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: -7018264418762285241}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 5140649235735941787}
+    m_Duration: 0.33034013605442175
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 7136334172665929659}
+    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: hero01_att
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &7243294715892543328
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 115 - 1
Assets/Art/HeroTimeLine/Hero02.playable

@@ -1712,6 +1712,23 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &1563231202082229541
+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: 4814c0ad2f9cc3245ac8cb30418fa118, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &1763569083830606840
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1971,7 +1988,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -1980,6 +1997,7 @@ MonoBehaviour:
   - {fileID: -5700901883387235338}
   - {fileID: -3964179811523661920}
   - {fileID: 5886568496986523569}
+  - {fileID: 4705426701055752564}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -2117,6 +2135,102 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &4705426701055752564
+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: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 1563231202082229541}
+    m_Duration: 2.478730158730159
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 4705426701055752564}
+    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: hero02_sk1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &5837492821139701382
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 228 - 0
Assets/Art/HeroTimeLine/Hero03.playable

@@ -316,6 +316,23 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &-7914441108539097744
+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: c3c3cfba68b554444b811af7d01f5825, type: 3}
+  m_Loop: 1
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-7780608259791060097
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -473,6 +490,7 @@ MonoBehaviour:
   - {fileID: -3153904920175548778}
   - {fileID: -1194444990711841923}
   - {fileID: -4574379201153612004}
+  - {fileID: -5091099326109551174}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -794,6 +812,102 @@ MonoBehaviour:
     m_DisplayName: TimeLineAlertAsset
   m_Markers:
     m_Objects: []
+--- !u!114 &-5091099326109551174
+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: -7018264418762285241}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 8542330580123955617}
+    m_Duration: 0.6927437641723356
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -5091099326109551174}
+    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: hero03_att
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-5013532422042071500
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2109,9 +2223,106 @@ MonoBehaviour:
   - {fileID: -5700901883387235338}
   - {fileID: 1674232180069977348}
   - {fileID: -5213821412162879996}
+  - {fileID: 2714949190631365812}
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &2714949190631365812
+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: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7914441108539097744}
+    m_Duration: 2.2
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 2714949190631365812}
+    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: hero03_sk1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &3018899321963489689
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2692,6 +2903,23 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &8542330580123955617
+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: c5ff8fbcad9da7b49b2cb4d4cc0a7517, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &8657210778626392875
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 230 - 2
Assets/Art/HeroTimeLine/Hero04.playable

@@ -537,6 +537,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 &-7421108816722724247
+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: 1af121d1db2c64f4183f4be4e063b3af, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-7083228526680016239
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -584,6 +601,7 @@ MonoBehaviour:
   - {fileID: -3153904920175548778}
   - {fileID: -3528430137358583487}
   - {fileID: -1935439408781482279}
+  - {fileID: -2061491711952390619}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -1201,6 +1219,102 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-2597330106135042630
+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: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -695086953471398139}
+    m_Duration: 1.6036281179138323
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -2597330106135042630}
+    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: hero04_sk1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-2594963699011562397
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1317,6 +1431,102 @@ MonoBehaviour:
     m_DisplayName: TimeLineCurveAsset
   m_Markers:
     m_Objects: []
+--- !u!114 &-2061491711952390619
+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: -7018264418762285241}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7421108816722724247}
+    m_Duration: 0.3548299319727891
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -2061491711952390619}
+    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: hero04_att
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-1935439408781482279
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1592,6 +1802,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 &-695086953471398139
+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: c87d8401fe345254ab9265b40028e339, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-112659851754392165
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2183,7 +2410,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -2191,6 +2418,7 @@ MonoBehaviour:
   - {fileID: -5700901883387235338}
   - {fileID: 8874639077753602735}
   - {fileID: 6711887329045093846}
+  - {fileID: -2597330106135042630}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -2399,7 +2627,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.06666666666666665
+    m_Start: 0.6
     m_ClipIn: 0
     m_Asset: {fileID: 6961145420451376069}
     m_Duration: 0.6

File diff suppressed because it is too large
+ 15 - 18
Assets/Plugins/ShaderGraphEssentials/DemoScenes/Demo_URP/Shaders/SGE_ToonLightingGraph.shadersubgraph


File diff suppressed because it is too large
+ 17 - 46
Assets/Plugins/ShaderGraphEssentials/DemoScenes/Demo_URP/Shaders/SGE_ToonLit.shadergraph


+ 54 - 3
Assets/Res/Aduio/MainAudio.asset

@@ -16,13 +16,64 @@ MonoBehaviour:
   configs:
   - describe: "\u6253boss\u7684\u65F6\u5019\u7528\u7684"
     audionClipName: bossBattle.wav
-    volume: 0.7
+    volume: 1
   - describe: "\u9ED8\u8BA4\u6218\u6597\u4F7F\u7528\u7684"
     audionClipName: combatBattle.wav
-    volume: 0.4
+    volume: 1
   - describe: "\u51B0\u7684\u5907\u673A"
     audionClipName: bing_hit.wav
     volume: 0.4
   - describe: "\u6B7B\u4EA1\u7684\u9ED8\u8BA4\u97F3\u6548"
     audionClipName: die1.wav
-    volume: 0.4
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: hero01_sk1.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: hero02_sk1.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: hero03_att.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: hero03_sk1.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: hero04_att.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: hero04_sk1.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: hero01_att.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: boss_lang_att.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: boss_lang_die.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: boss_lang_jiao.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: boss_lang_sk1.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: boss_lang_sk3.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: boss_she_att.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: boss_she_die.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: boss_she_sk1.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: boss_she_sk3.wav
+    volume: 1
+  - describe: "\u6218\u58EB\u97F3\u6548"
+    audionClipName: xiaoshe_die.wav
+    volume: 1

BIN
Assets/Res/Aduio/Skill/boss_lang_att.wav


+ 23 - 0
Assets/Res/Aduio/Skill/boss_lang_att.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: W3kdvX+qVS5cCW3DhfDmWvrgdHChGoKvLedwPRdq0mWgrFRPeslaWKU=
+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: 

BIN
Assets/Res/Aduio/Skill/boss_lang_die.wav


+ 23 - 0
Assets/Res/Aduio/Skill/boss_lang_die.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XHMe5imtBymefSzUwSXtWytt9Qe76o4oFKDoC0nLoNGWMxIlARt3PiY=
+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: 

BIN
Assets/Res/Aduio/Skill/boss_lang_jiao.wav


+ 23 - 0
Assets/Res/Aduio/Skill/boss_lang_jiao.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: DXkfsH/4UnOkaubaJFLcxTuy73a0S7gt9rJ+BBkz925B5OWZZlPo2MM=
+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: 

BIN
Assets/Res/Aduio/Skill/boss_lang_sk1.wav


+ 23 - 0
Assets/Res/Aduio/Skill/boss_lang_sk1.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: BnkY5Cn/AnnxYgZBNl1bFscPJuLmNvBAPG2UcanrzAdr3hx7M+AqMjo=
+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: 

BIN
Assets/Res/Aduio/Skill/boss_lang_sk3.wav


+ 23 - 0
Assets/Res/Aduio/Skill/boss_lang_sk3.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CXIdtXv8VXtMgzxQXBeSrY5Y/ri1aazIHvIEYURCx7SLtwtXSIm0aag=
+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: 

BIN
Assets/Res/Aduio/Skill/boss_she_att.wav


+ 23 - 0
Assets/Res/Aduio/Skill/boss_she_att.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WS4YsSusVC1mdq9/zxI+gbJyQcCOI3EH7X69wxKJjBsdGK2c31ObqU8=
+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: 

BIN
Assets/Res/Aduio/Skill/boss_she_die.wav


+ 23 - 0
Assets/Res/Aduio/Skill/boss_she_die.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WX8W4yusAHl4Xf9bjik91h9f7PuwDJg5aXPHMXvKZ2mLiL7JRPMNvY8=
+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: 

BIN
Assets/Res/Aduio/Skill/boss_she_sk1.wav


+ 23 - 0
Assets/Res/Aduio/Skill/boss_she_sk1.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: Dnga4Xj/ASgob1hhotznmuzdBd38KXWj0Ftcx1/+vxlwynVyuMlRtdI=
+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: 

BIN
Assets/Res/Aduio/Skill/boss_she_sk3.wav


+ 23 - 0
Assets/Res/Aduio/Skill/boss_she_sk3.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CnxL5CyoBXvq+ockKRuKOrEi5pUe0Vxi9H6OuoHXGdIvLM2VLo9rJfI=
+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: 

BIN
Assets/Res/Aduio/Skill/hero01_att.wav


+ 23 - 0
Assets/Res/Aduio/Skill/hero01_att.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CyhO43uoUSn0NONKnSuYSdsCyV75co6G2QJR+bBS891HPVjXG3OBNFM=
+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: 

BIN
Assets/Res/Aduio/Skill/hero01_sk1.wav


+ 23 - 0
Assets/Res/Aduio/Skill/hero01_sk1.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WX8dsSitUS4hPJUk4/M/2CSIYfbgXsLUdIId7ThQryTelKHMTibOxrY=
+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: 

BIN
Assets/Res/Aduio/Skill/hero02_sk1.wav


+ 23 - 0
Assets/Res/Aduio/Skill/hero02_sk1.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: C3IesXmtAi8C9e0ACeowwtUMjuQTDEavWVlZIZmk2kkkAqqB7Ismtt4=
+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: 

BIN
Assets/Res/Aduio/Skill/hero03_att.wav


+ 23 - 0
Assets/Res/Aduio/Skill/hero03_att.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XH9J4yL7AShT2sUEI28xtETK6OZHmDlnQNjJM0oBw6u/wbCUAKJusf8=
+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: 

BIN
Assets/Res/Aduio/Skill/hero03_sk1.wav


+ 23 - 0
Assets/Res/Aduio/Skill/hero03_sk1.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XHlMtnn7ASrL/vltoP3dhSO5bYNtRXcBjJ2aXni2c6ZhssHYkDgBIUo=
+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: 

BIN
Assets/Res/Aduio/Skill/hero04_att.wav


+ 23 - 0
Assets/Res/Aduio/Skill/hero04_att.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: DitJtCisB3q3zHy5XvqIX9mqHlBEIw0MgLcL8uA2EnG8/GIsApla8d8=
+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: 

BIN
Assets/Res/Aduio/Skill/hero04_sk1.wav


+ 23 - 0
Assets/Res/Aduio/Skill/hero04_sk1.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XHIY4SKpU3oN3qxBgYoapIYk2eBEO2AMKppZ0Fv3d2gezFTgTFB18lo=
+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: 

BIN
Assets/Res/Aduio/Skill/xiaoshe_die.wav


+ 23 - 0
Assets/Res/Aduio/Skill/xiaoshe_die.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: DCxN4X7/VCnHxK/2kaotKGDtTx5lYqUXsxYSA4PCo0+3CLEauEiHSdQ=
+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: 

BIN
Assets/Res/Aduio/combatBattle.wav


+ 4 - 13
Assets/Res/Aduio/combatBattle.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: DSgevHyvU367kol7AgTdvaK8/DEJ448GSQG+JGxFXA3pe1mw4m1gKX8=
+guid: CHod4XulUCnVWqoTjG4XQIoIrVvx3i1Aj7QnoSF6tPIljf/tQmizukw=
 AudioImporter:
   externalObjects: {}
   serializedVersion: 7
@@ -12,21 +12,12 @@ AudioImporter:
     quality: 1
     conversionMode: 0
     preloadAudioData: 0
-  platformSettingOverrides:
-    36:
-      serializedVersion: 2
-      loadType: 0
-      sampleRateSetting: 2
-      sampleRateOverride: 44100
-      compressionFormat: 7
-      quality: 0.5
-      conversionMode: 0
-      preloadAudioData: 0
-  forceToMono: 1
+  platformSettingOverrides: {}
+  forceToMono: 0
   normalize: 1
   loadInBackground: 0
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: combatbattle
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Res/Aduio/combatBattle1.wav


+ 23 - 0
Assets/Res/Aduio/combatBattle1.wav.meta

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

File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Guaiwu01_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/GuaiwuBoss01_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/GuaiwuBoss02_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Hero01_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Hero02_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Hero03_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/Hero04_TD.txt


+ 1 - 0
Assets/Scripts/Core/Audio/AudioSourcePool.cs

@@ -6,6 +6,7 @@ namespace Core.Audio
 {
     public class AudioSourcePool: IDisposable
     {
+        public object TimeLineAudioEventLogic;
         private AudioSource _audioSource;
 
         private TimerEntity _timerEntity;

+ 2 - 2
Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -113,9 +113,9 @@ namespace GameLogic.Combat.CombatTool
             CombatHeroController.LateUpdate(t);
         }
 
-        public void PlayAudio(string audioName, bool isLoop)
+        public async CTask<AudioSourcePool> PlayAudio(string audioName, bool isLoop)
         {
-            AudioManager.Instance.PlayAudio(audioName, isLoop);
+          return await AudioManager.Instance.PlayAudio(audioName, isLoop);
         }
 
         public void Dispose()

+ 1 - 0
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -153,6 +153,7 @@ namespace GameLogic.Combat.CombatType
                     }
 
                     Debug.Log("英雄死完了,等待全部英雄复活,这个版本等待2秒全体复活");
+                    PlayBgm();
                     AccountFileInfo.Instance.playerData.isAllHeroDie = true;
                     TimerComponent.Instance.AddTimer(2000, delegate
                     {

+ 21 - 5
Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineAudioEventLogic.cs

@@ -1,5 +1,5 @@
-using Fort23.UTool;
-
+using Core.Audio;
+using Fort23.UTool;
 using Utility.CustomizeTimeLogic.FxLogic.TimeLineEvent;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 #if !COMBAT_SERVER
@@ -12,11 +12,13 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
 {
     public class TimeLineAudioEventLogic : TimeLineEventLogicBasic
     {
+        private AudioSourcePool audioSourcePool;
+
         protected override void ProSetCombatInfo()
         {
         }
 
-        protected override void ProEnter()
+        protected override async void ProEnter()
         {
 #if !COMBAT_SERVER
 
@@ -24,13 +26,19 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 mTimeLineAssetSerialization as TimeLineAudioSeralization;
             if (!string.IsNullOrEmpty(timeLineAudioSeralization.audioName))
             {
-         
                 ITimeLineAudio iTimeLineSkillStart =
                     TimeLineSingletonEventManager.Instance.GetTimeLine<ITimeLineAudio>();
                 if (iTimeLineSkillStart != null)
                 {
-                    iTimeLineSkillStart.PlayAudio(timeLineAudioSeralization.audioName,
+                    AudioSourcePool audioSourcePool = await iTimeLineSkillStart.PlayAudio(
+                        timeLineAudioSeralization.audioName,
                         timeLineAudioSeralization.isLoop);
+                    if (timeLineAudioSeralization.isLoop)
+                    {
+                        this.audioSourcePool = audioSourcePool;
+                    }
+
+                    audioSourcePool.TimeLineAudioEventLogic = this;
                 }
             }
 #endif
@@ -46,10 +54,18 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
 
         protected override void ProBreakTimeLine()
         {
+            if (this.audioSourcePool != null && this.audioSourcePool.TimeLineAudioEventLogic == this)
+            {
+                this.audioSourcePool.Finish();
+            }
         }
 
         protected override void ProDispose()
         {
+            if (this.audioSourcePool != null && this.audioSourcePool.TimeLineAudioEventLogic == this)
+            {
+                this.audioSourcePool.Finish();
+            }
         }
     }
 }

+ 5 - 2
Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineAudio.cs

@@ -1,10 +1,13 @@
-namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface
+using Core.Audio;
+using Fort23.Core;
+
+namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface
 {
 
     public interface ITimeLineAudio:ITimeLineEventBasic
     {
 
-        void PlayAudio(string audioName,bool isLoop);
+        CTask<AudioSourcePool> PlayAudio(string audioName,bool isLoop);
     }
 
 }

+ 9 - 0
Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineAudioEntity.cs

@@ -0,0 +1,9 @@
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic;
+
+namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface
+{
+    public interface ITimeLineAudioEntity
+    {
+        public TimeLineAudioEventLogic TimeLineAudioEventLogic { get; set; }
+    }
+}

+ 3 - 0
Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineAudioEntity.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6a38b12376ef4a089c47e27b31700afc
+timeCreated: 1734416251

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


File diff suppressed because it is too large
+ 2264 - 77
UserSettings/Layouts/default-2022.dwlt


Some files were not shown because too many files changed in this diff