投技优化

2 years ago · 62fe3b3b87
parent 6b5f855b1b
commit 62fe3b3b87
3 changed files with 253 additions and 7 deletions
--- a/client/Assets/Game/Driver.unity
+++ b/client/Assets/Game/Driver.unity
@ -147,7 +147,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 150928140}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.475, y: 0.033333335, z: 0}
+  m_LocalPosition: {x: -0.2888889, y: 0.39444444, z: -0.01}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 166658848}
@ -1651,9 +1651,9 @@ PlayableDirector:
  - key: {fileID: -4750574827767443630, guid: c1797a25beab8924885805980777dd56, type: 2}
    value: {fileID: 1645380337361164335}
  - key: {fileID: -4824941642191393376, guid: 1f7ab546215e197408d725a0cc0a402b, type: 2}
-    value: {fileID: 5972941309607553105}
+    value: {fileID: 4414991604218682516}
  - key: {fileID: -4750574827767443630, guid: 1f7ab546215e197408d725a0cc0a402b, type: 2}
-    value: {fileID: 1645380337361164335}
+    value: {fileID: 1251429152}
  - key: {fileID: -4824941642191393376, guid: 0128bf6357f2af44f8acf1142582b387, type: 2}
    value: {fileID: 5972941309607553105}
  - key: {fileID: -4750574827767443630, guid: 0128bf6357f2af44f8acf1142582b387, type: 2}
@ -1675,13 +1675,13 @@ PlayableDirector:
  - key: {fileID: -4824941642191393376, guid: cbd9b381c4833e84a99a277d1235e1f9, type: 2}
    value: {fileID: 5972941309607553105}
  - key: {fileID: -4824941642191393376, guid: 2166d9f4e3e9bac468f6b5e05930c960, type: 2}
-    value: {fileID: 5972941309607553105}
+    value: {fileID: 4414991604218682516}
  - key: {fileID: -4824941642191393376, guid: 47a64edc9a09a3d41b5b399b240429f5, type: 2}
    value: {fileID: 5972941309607553105}
  - key: {fileID: -4824941642191393376, guid: 37819ba1ff5089742b135f4b72d20cb8, type: 2}
    value: {fileID: 5972941309607553105}
  - key: {fileID: -4750574827767443630, guid: 2166d9f4e3e9bac468f6b5e05930c960, type: 2}
-    value: {fileID: 1645380337361164335}
+    value: {fileID: 1251429152}
  - key: {fileID: -4824941642191393376, guid: 1c56e66a1df59614383a8ea99af21081, type: 2}
    value: {fileID: 5972941309607553105}
  - key: {fileID: -4750574827767443630, guid: 1c56e66a1df59614383a8ea99af21081, type: 2}
@ -1804,6 +1804,12 @@ PlayableDirector:
    value: {fileID: 150928140}
  - key: {fileID: -1577201873511395039, guid: 0bd5f8223b563b5478bdf14ef83b5a48, type: 2}
    value: {fileID: 166658849}
+  - key: {fileID: -535530294913848340, guid: 0bd5f8223b563b5478bdf14ef83b5a48, type: 2}
+    value: {fileID: 150928140}
+  - key: {fileID: -505701961135431839, guid: 0bd5f8223b563b5478bdf14ef83b5a48, type: 2}
+    value: {fileID: 1251429152}
+  - key: {fileID: -8593017252192611433, guid: 0bd5f8223b563b5478bdf14ef83b5a48, type: 2}
+    value: {fileID: 1251429152}
  m_ExposedReferences:
    m_References: []
 --- !u!212 &89448210413526911
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_skill01.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_skill01.playable
@ -733,7 +733,7 @@ MonoBehaviour:
    flowSpeed: {x: 2, y: 1, z: 0}
    flowTime: 0
    isFlow: 0
-    isAoe: 1
+    isAoe: 0
    damageRate: 0
    stunRate: 1
    staggerLevel: 2
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_skill0101.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_skill0101.playable
@ -23,6 +23,98 @@ MonoBehaviour:
  m_Clips: []
  m_Markers:
    m_Objects: []
+--- !u!114 &-8593017252192611433
+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: ba099f6dba5ed9c4684b037cea4c1253, type: 3}
+  m_Name: Attack Track (1)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.4666666666666667
+    m_ClipIn: 0
+    m_Asset: {fileID: -2523058507086857893}
+    m_Duration: 0.06666666666666665
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -8593017252192611433}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: AttackClip
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-7808248957694803936
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -1083,6 +1175,40 @@ MonoBehaviour:
  template:
    stepType: 2
    value: {x: 0, y: 0, z: 0}
+--- !u!114 &-2523058507086857893
+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: 7e5193488e49d4746a0c9c840edd5e84, type: 3}
+  m_Name: AttackClip(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  template:
+    flowSpeed: {x: 2, y: 3, z: 0}
+    flowTime: 0
+    isFlow: 1
+    isAoe: 1
+    damageRate: 1
+    stunRate: 1
+    staggerLevel: 2
+    pauseTime: 2
+    hitId: 0
+    hitType: 1
+    hitOrderType: 0
+    hitDirType: 0
+    Type: 1
+    Offset: {x: 2, y: 0, z: 0}
+    Height: 2
+    SizeX: 0
+    SizeY: 0
+    Radius: 2.5
+    Angle: 0
+    throwTimeline: {fileID: 0}
+    throwOnly: 0
 --- !u!114 &-2469611184847043654
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -1735,7 +1861,7 @@ MonoBehaviour:
    staggerLevel: 2
    pauseTime: 0
    hitId: 0
-    hitType: 0
+    hitType: 1
    hitOrderType: 1
    hitDirType: 1
    Type: 0
@ -1770,6 +1896,8 @@ MonoBehaviour:
  - {fileID: -6860988920940094625}
  - {fileID: -535530294913848340}
  - {fileID: -505701961135431839}
+  - {fileID: -8593017252192611433}
+  - {fileID: 5555280687335423580}
  m_FixedDuration: 0.9
  m_EditorSettings:
    m_Framerate: 60
@ -2053,6 +2181,98 @@ MonoBehaviour:
    m_DisplayName: BreakClip
  m_Markers:
    m_Objects: []
+--- !u!114 &5555280687335423580
+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: 4b52a3cee7a8b1b4183c15ca90affb83, type: 3}
+  m_Name: Global Effect 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: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.4
+    m_ClipIn: 0
+    m_Asset: {fileID: 7000958700220519553}
+    m_Duration: 0.2666666666666666
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 5555280687335423580}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: GlobalEffectClip
+  m_Markers:
+    m_Objects: []
 --- !u!114 &5878054341450424456
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -2312,6 +2532,26 @@ MonoBehaviour:
    m_DisplayName: SlideClip
  m_Markers:
    m_Objects: []
+--- !u!114 &7000958700220519553
+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: 8ca42bad65e842b499afb8e6fd6cb14d, type: 3}
+  m_Name: GlobalEffectClip(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  template:
+    m_GlobalEffectInfoList:
+    - type: 2
+      from: 0.95
+      to: 1
+    - type: 1
+      from: 0.4
+      to: 0
 --- !u!114 &7083902231388361040
 MonoBehaviour:
  m_ObjectHideFlags: 1