下劈优化

2 years ago · 0c7c0af782
parent 8050593f81
commit 0c7c0af782
10 changed files with 5061 additions and 110 deletions
--- a/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset
+++ b/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset
@ -21,6 +21,6 @@ MonoBehaviour:
  mLastUsedPackagesHash: 1177269412
  mLastUsedPackagesCount: 1
  mLastBuildCode: 1
-  mLastEditorStartupTimeTicks: 638207960920283677
+  mLastEditorStartupTimeTicks: 638209644150129062
  mNewVersionAvailable: 1
  mLastAttachedFlowPlayerValue: 0
--- a/client/Assets/Game/Driver.unity
+++ b/client/Assets/Game/Driver.unity
@ -138,7 +138,7 @@ PrefabInstance:
    - target: {fileID: 2619096985406038671, guid: a50158910ed2df64b8cd926299a3eb36,
        type: 3}
      propertyPath: m_RootOrder
-      value: 11
+      value: 10
      objectReference: {fileID: 0}
    - target: {fileID: 2619096985406038671, guid: a50158910ed2df64b8cd926299a3eb36,
        type: 3}
@ -697,7 +697,7 @@ PrefabInstance:
    - target: {fileID: 660604078598729724, guid: ac7c124c26a41924fadfe12047c7e621,
        type: 3}
      propertyPath: m_RootOrder
-      value: 12
+      value: 11
      objectReference: {fileID: 0}
    - target: {fileID: 660604078598729724, guid: ac7c124c26a41924fadfe12047c7e621,
        type: 3}
@ -890,7 +890,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4932093234961054, guid: 44baafba702c39f4295e3978f37bbbb9, type: 3}
      propertyPath: m_RootOrder
-      value: 10
+      value: 9
      objectReference: {fileID: 0}
    - target: {fileID: 4932093234961054, guid: 44baafba702c39f4295e3978f37bbbb9, type: 3}
      propertyPath: m_LocalPosition.x
@ -934,89 +934,6 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 44baafba702c39f4295e3978f37bbbb9, type: 3}
--- !u!1 &1167340682
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1167340684}
-  - component: {fileID: 1167340683}
-  m_Layer: 0
-  m_Name: hero01_long_normal_attack00
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!212 &1167340683
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1167340682}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 8b75e4f77efb4b942bff540369576f7d, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: -44
-  m_Sprite: {fileID: 1444185042597567475, guid: a51997a86c285d8439f8aa56fe851672,
-    type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 2, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
--- !u!4 &1167340684
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1167340682}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.269, y: 1.061, z: -0.077}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!850595691 &1321723957
 LightingSettings:
  m_ObjectHideFlags: 0
@ -1539,10 +1456,15 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 89448209117170303, guid: 2ee37d7e6a339064ab6466f552ca0edb,
+        type: 3}
+      propertyPath: m_Size.y
+      value: 2
+      objectReference: {fileID: 0}
    - target: {fileID: 89448209117170303, guid: 2ee37d7e6a339064ab6466f552ca0edb,
        type: 3}
      propertyPath: m_WasSpriteAssigned
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1645380339454201132, guid: 2ee37d7e6a339064ab6466f552ca0edb,
        type: 3}
@ -1633,7 +1555,7 @@ PlayableDirector:
  m_GameObject: {fileID: 2101826817}
  m_Enabled: 1
  serializedVersion: 3
-  m_PlayableAsset: {fileID: 11400000, guid: c1797a25beab8924885805980777dd56, type: 2}
+  m_PlayableAsset: {fileID: 11400000, guid: 0128bf6357f2af44f8acf1142582b387, type: 2}
  m_InitialState: 1
  m_WrapMode: 2
  m_DirectorUpdateMode: 1
@ -1643,6 +1565,14 @@ PlayableDirector:
    value: {fileID: 2101826818}
  - key: {fileID: -4750574827767443630, guid: c1797a25beab8924885805980777dd56, type: 2}
    value: {fileID: 2101826819}
+  - key: {fileID: -4824941642191393376, guid: 1f7ab546215e197408d725a0cc0a402b, type: 2}
+    value: {fileID: 2101826818}
+  - key: {fileID: -4750574827767443630, guid: 1f7ab546215e197408d725a0cc0a402b, type: 2}
+    value: {fileID: 2101826819}
+  - key: {fileID: -4824941642191393376, guid: 0128bf6357f2af44f8acf1142582b387, type: 2}
+    value: {fileID: 2101826818}
+  - key: {fileID: -4750574827767443630, guid: 0128bf6357f2af44f8acf1142582b387, type: 2}
+    value: {fileID: 2101826819}
  m_ExposedReferences:
    m_References: []
 --- !u!1 &2135223912
--- a/client/Assets/Resources/Character/hero01/hero01_long_skill01.png
+++ b/client/Assets/Resources/Character/hero01/hero01_long_skill01.png
--- a/client/Assets/Resources/Character/hero01_long_skill01.aseprite
+++ b/client/Assets/Resources/Character/hero01_long_skill01.aseprite
--- a/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_long_air_skill0201.prefab
+++ b/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_long_air_skill0201.prefab
--- a/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_long_air_skill0201.prefab.meta
+++ b/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_long_air_skill0201.prefab.meta
--- a/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_long_air_skill0202.prefab
+++ b/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_long_air_skill0202.prefab
@ -12,7 +12,7 @@ GameObject:
  - component: {fileID: 199268493036765418}
  - component: {fileID: 198682754650566076}
  m_Layer: 0
-  m_Name: effect_skill_hero01_long_air_skill02
+  m_Name: effect_skill_hero01_long_air_skill0202
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -29,7 +29,7 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 4520214186358492653}
+  - {fileID: 5383543309485750600}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4817,7 +4817,7 @@ ParticleSystem:
        m_PostInfinity: 2
        m_RotationOrder: 4
    vectorLabel1_3: W
--- !u!1001 &2930749172338282423
+--- !u!1001 &6674662438505167634
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
@ -4829,6 +4829,11 @@ PrefabInstance:
      propertyPath: m_RootOrder
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1591769590674358874, guid: 33da377d65010f8468eb462b6c382856,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.3
+      objectReference: {fileID: 0}
    - target: {fileID: 1591769590674358874, guid: 33da377d65010f8468eb462b6c382856,
        type: 3}
      propertyPath: m_LocalScale.y
@ -4892,12 +4897,12 @@ PrefabInstance:
    - target: {fileID: 4518345749720285479, guid: 33da377d65010f8468eb462b6c382856,
        type: 3}
      propertyPath: RotationModule.curve.scalar
-      value: 87.266464
+      value: 52.35988
      objectReference: {fileID: 0}
    - target: {fileID: 4518345749720285479, guid: 33da377d65010f8468eb462b6c382856,
        type: 3}
      propertyPath: InitialModule.startLifetime.scalar
-      value: 0.3
+      value: 0.15
      objectReference: {fileID: 0}
    - target: {fileID: 7116202965895556702, guid: 33da377d65010f8468eb462b6c382856,
        type: 3}
@ -4906,9 +4911,9 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 33da377d65010f8468eb462b6c382856, type: 3}
--- !u!4 &4520214186358492653 stripped
+--- !u!4 &5383543309485750600 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 1591769590674358874, guid: 33da377d65010f8468eb462b6c382856,
    type: 3}
-  m_PrefabInstance: {fileID: 2930749172338282423}
+  m_PrefabInstance: {fileID: 6674662438505167634}
  m_PrefabAsset: {fileID: 0}
--- a/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_long_air_skill0202.prefab.meta
+++ b/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_long_air_skill0202.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6b295624be5f9fe478160d11a1c61fbe
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable
@ -131,7 +131,7 @@ MonoBehaviour:
    m_Start: 0.16666666666666666
    m_ClipIn: 0
    m_Asset: {fileID: -1404710705785846226}
-    m_Duration: 0.33333333333333337
+    m_Duration: 0.3666666666666667
    m_TimeScale: 1
    m_ParentTrack: {fileID: -5493165062151283881}
    m_EaseInDuration: 0
@ -224,7 +224,7 @@ MonoBehaviour:
    m_ClipIn: 0
    m_Asset: {fileID: -3813374883878662106}
    m_Duration: 0.5333333333333333
-    m_TimeScale: 1.5
+    m_TimeScale: 1.7999999999999998
    m_ParentTrack: {fileID: -4824941642191393376}
    m_EaseInDuration: 0
    m_EaseOutDuration: 0
@ -363,10 +363,10 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 0.16666666666666666
+    m_Start: 0.18333333333333335
    m_ClipIn: 0
    m_Asset: {fileID: 4898924959087489963}
-    m_Duration: 0.1
+    m_Duration: 0.11666666666666664
    m_TimeScale: 1
    m_ParentTrack: {fileID: -4750574827767443630}
    m_EaseInDuration: 0
@ -432,10 +432,10 @@ MonoBehaviour:
    m_PreExtrapolationTime: 0
    m_DisplayName: AttackClip
  - m_Version: 1
-    m_Start: 0.3333333333333333
+    m_Start: 0.35
    m_ClipIn: 0
    m_Asset: {fileID: 2914315655706815150}
-    m_Duration: 0.16666666666666669
+    m_Duration: 0.15000000000000002
    m_TimeScale: 1
    m_ParentTrack: {fileID: -4750574827767443630}
    m_EaseInDuration: 0
@ -546,10 +546,79 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 0.2
+    m_Start: 0.16666666666666666
    m_ClipIn: 0
    m_Asset: {fileID: 3753689292486213037}
-    m_Duration: 0.28333333333333327
+    m_Duration: 0.08333333333333331
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -1704311901145742241}
+    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: EffectClip
+  - m_Version: 1
+    m_Start: 0.3333333333333333
+    m_ClipIn: 0
+    m_Asset: {fileID: 1084852922144234985}
+    m_Duration: 0.08333333333333331
    m_TimeScale: 1
    m_ParentTrack: {fileID: -1704311901145742241}
    m_EaseInDuration: 0
@ -686,6 +755,27 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  template:
    moveSpeedScale: 0
+--- !u!114 &1084852922144234985
+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: 2d9d2fee8ec886449817b960514cbf0d, type: 3}
+  m_Name: EffectClip(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  template:
+    EffectInfos:
+    - Effect: {fileID: 1494690074406284, guid: 6b295624be5f9fe478160d11a1c61fbe, type: 3}
+      isAttach: 1
+      isSpeedIgnore: 1
+      isGround: 0
+      offset: {x: 0, y: 0, z: 0}
+      rotAdd: 0
+      rotAddRandom: 0
 --- !u!114 &2737164138792252920
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -700,7 +790,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  template:
    stepType: 2
-    value: {x: -1, y: 2, z: 0}
+    value: {x: -1, y: 1, z: 0}
 --- !u!114 &2914315655706815150
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -717,7 +807,7 @@ MonoBehaviour:
    isRaycast: 0
    center: {x: 0, y: 1, z: 0}
    halfExtents: {x: 2, y: 2, z: 1}
-    flowSpeed: {x: 5, y: -5, z: 0}
+    flowSpeed: {x: 10, y: -10, z: 0}
    flowTime: 0
    isFlow: 1
    damageRate: 0.5
@ -762,9 +852,9 @@ MonoBehaviour:
    isRaycast: 0
    center: {x: 0, y: 1, z: 0}
    halfExtents: {x: 2, y: 2, z: 1}
-    flowSpeed: {x: 2, y: -2, z: 0}
+    flowSpeed: {x: 3, y: -3, z: 0}
    flowTime: 0
-    isFlow: 1
+    isFlow: 0
    damageRate: 0.5
    stunRate: 0
    staggerLevel: 2
--- a/client/Assets/Resources/Timeline/skill_hero01_long_skill02.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_long_skill02.playable
@ -835,8 +835,8 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  template:
    isRaycast: 0
-    center: {x: 1, y: 1, z: 0}
-    halfExtents: {x: 1.5, y: 2, z: 1}
+    center: {x: 0, y: 1, z: 0}
+    halfExtents: {x: 2, y: 2, z: 1}
    flowSpeed: {x: 1.5, y: 6, z: 0}
    flowTime: 0.1
    isFlow: 1