角色能力，存档

2026-05-19 11:50:21 +08:00
parent d25f237e76
commit 2dcb7a961a
136 changed files with 36035 additions and 27551 deletions
--- a/Assets/_Game/Data/Camera/Main
+++ b/Assets/_Game/Data/Camera/Main
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 36baaa8bdcb9d8b49b9199833965d2c3, type: 3}
+  m_Name: Main Camera Custom Blends
+  m_EditorClassIdentifier: 
+  CustomBlends:
+  - From: '**ANY CAMERA**'
+    To: '**ANY CAMERA**'
+    Blend:
+      Style: 1
+      Time: 1
+      CustomCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 0
+        m_PostInfinity: 0
+        m_RotationOrder: 0
--- a/Assets/_Game/Data/Enemies/DS_TestEnemyBody.asset.meta
+++ b/Assets/_Game/Data/Enemies/DS_TestEnemyBody.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c8d85f4a62eaed04abaa7f5bea0ebccc
+guid: 9906ca91115b34d498a040782ef36e92
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack1.asset
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack1.asset
@@ -10,9 +10,9 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 96b10c11e6173394a8fa8d9c614b0035, type: 3}
-  m_Name: DS_TestEnemyBody
+  m_Name: CMB_Player_Attack1
  m_EditorClassIdentifier: 
-  sourceId: enemy_body
+  sourceId: 
  skillId: 
  BaseDamage: 10
  DamageMultiplier: 1
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack1.asset.meta
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack1.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a0e13ba45445ebe408ef0353f5adcbfb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack2.asset
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack2.asset
@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 96b10c11e6173394a8fa8d9c614b0035, type: 3}
+  m_Name: CMB_Player_Attack2
+  m_EditorClassIdentifier: 
+  sourceId: 
+  skillId: 
+  BaseDamage: 10
+  DamageMultiplier: 1
+  Type: 0
+  Category: 0
+  Flags: 2
+  Tags: 1
+  KnockbackForce: 5
+  HitStunDuration: 0.1
+  BreakLevel: 1
+  FxType: 1
+  ComboWindowDuration: 0.4
+  CancelWindowEnd: 0.5
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack2.asset.meta
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d4b575099a307fb46b19cf67f8b1e76c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack3.asset
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack3.asset
@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 96b10c11e6173394a8fa8d9c614b0035, type: 3}
+  m_Name: CMB_Player_Attack3
+  m_EditorClassIdentifier: 
+  sourceId: 
+  skillId: 
+  BaseDamage: 10
+  DamageMultiplier: 1
+  Type: 0
+  Category: 0
+  Flags: 2
+  Tags: 1
+  KnockbackForce: 5
+  HitStunDuration: 0.1
+  BreakLevel: 1
+  FxType: 1
+  ComboWindowDuration: 0.4
+  CancelWindowEnd: 0.5
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack3.asset.meta
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_Attack3.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3f5dc1ab0247ba343885d3b83c80da8a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset
+++ b/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset
@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: d2443d04d1c179d4d8a4f36e7ca7156e, type: 3}
+  m_Name: WPN_DiHun
+  m_EditorClassIdentifier: 
+  weaponId: WPN_DiHun
+  displayName: 
+  icon: {fileID: 0}
+  weaponType: 1
+  groundComboSteps:
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 7400000, guid: bde6a54ec8fc04f45a424f9bcd7845df, type: 2}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 11400000, guid: a0e13ba45445ebe408ef0353f5adcbfb, type: 2}
+    hitBoxEnter: 0
+    hitBoxExit: 0
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0
+    comboTimeout: 0
+    hitBoxId: 
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 7400000, guid: c0ef319f521c2a2448022cebcf9c9266, type: 2}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 11400000, guid: d4b575099a307fb46b19cf67f8b1e76c, type: 2}
+    hitBoxEnter: 0.032
+    hitBoxExit: 0.669
+    comboInputOpen: 0.057
+    comboInputClose: 0.292
+    cancelWindowOpen: 0.061
+    recoveryTime: 0
+    comboTimeout: 0
+    hitBoxId: 
+  airComboSteps:
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.1
+    hitBoxExit: 0.8
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.1
+    hitBoxExit: 0.8
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  upStep:
+    clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.2
+    hitBoxExit: 0.7
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  downStep:
+    clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.1
+    hitBoxExit: 0.9
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  hitBoxPrefab: {fileID: 4821376343125962025, guid: 2fce42e66b8d4a042a471a661a05ee1b, type: 3}
+  vfxConfig:
+    onEquipPresetId: 
+    weaponTrailPrefab: {fileID: 0}
+    trailColor: {r: 1, g: 1, b: 1, a: 1}
+  soulPowerGain: 10
+  references:
+    version: 2
+    RefIds: []
--- a/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset.meta
+++ b/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bde7d85bdf2d3e54da22d07b1f8d2901
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Combat/Weapons/WPN_MingHun.asset
+++ b/Assets/_Game/Data/Combat/Weapons/WPN_MingHun.asset
@@ -0,0 +1,103 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: d2443d04d1c179d4d8a4f36e7ca7156e, type: 3}
+  m_Name: WPN_MingHun
+  m_EditorClassIdentifier: 
+  weaponId: WPN_MingHun
+  displayName: 
+  icon: {fileID: 0}
+  weaponType: 2
+  groundComboSteps:
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.3
+    hitBoxExit: 0.6
+    comboInputOpen: 0.3
+    comboInputClose: 0
+    cancelWindowOpen: 0.5
+    recoveryTime: 0.05
+    comboTimeout: 0.25
+    hitBoxId: 
+  airComboSteps:
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.1
+    hitBoxExit: 0.8
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  upStep:
+    clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.2
+    hitBoxExit: 0.7
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  downStep:
+    clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.1
+    hitBoxExit: 0.9
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  hitBoxPrefab: {fileID: 0}
+  vfxConfig:
+    onEquipPresetId: 
+    weaponTrailPrefab: {fileID: 0}
+    trailColor: {r: 1, g: 1, b: 1, a: 1}
+  soulPowerGain: 10
+  references:
+    version: 2
+    RefIds: []
--- a/Assets/_Game/Data/Combat/Weapons/WPN_MingHun.asset.meta
+++ b/Assets/_Game/Data/Combat/Weapons/WPN_MingHun.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fbe1ff6f23c995541a5833b51c52dc01
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Combat/Weapons/WPN_TianHun.asset
+++ b/Assets/_Game/Data/Combat/Weapons/WPN_TianHun.asset
@@ -0,0 +1,103 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: d2443d04d1c179d4d8a4f36e7ca7156e, type: 3}
+  m_Name: WPN_TianHun
+  m_EditorClassIdentifier: 
+  weaponId: WPN_TianHun
+  displayName: 
+  icon: {fileID: 0}
+  weaponType: 0
+  groundComboSteps:
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.3
+    hitBoxExit: 0.6
+    comboInputOpen: 0.3
+    comboInputClose: 0
+    cancelWindowOpen: 0.5
+    recoveryTime: 0.05
+    comboTimeout: 0.25
+    hitBoxId: 
+  airComboSteps:
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.1
+    hitBoxExit: 0.8
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  upStep:
+    clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.2
+    hitBoxExit: 0.7
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  downStep:
+    clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.1
+    hitBoxExit: 0.9
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  hitBoxPrefab: {fileID: 0}
+  vfxConfig:
+    onEquipPresetId: 
+    weaponTrailPrefab: {fileID: 0}
+    trailColor: {r: 1, g: 1, b: 1, a: 1}
+  soulPowerGain: 10
+  references:
+    version: 2
+    RefIds: []
--- a/Assets/_Game/Data/Combat/Weapons/WPN_TianHun.asset.meta
+++ b/Assets/_Game/Data/Combat/Weapons/WPN_TianHun.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 533d4711e21d8584597a5d4569fe2eb0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Player/PLY_EquipmentConfig.asset
+++ b/Assets/_Game/Data/Player/PLY_EquipmentConfig.asset
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: d2ff92bffe90e0f499b70bdb9d045552, type: 3}
+  m_Name: PLY_EquipmentConfig
+  m_EditorClassIdentifier: 
+  initialNotchCount: 3
+  maxCollectionSize: -1
--- a/Assets/_Game/Data/Player/PLY_EquipmentConfig.asset.meta
+++ b/Assets/_Game/Data/Player/PLY_EquipmentConfig.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f167dd4c0f40ff7499127f917066994a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Player/PLY_FormConfig.asset
+++ b/Assets/_Game/Data/Player/PLY_FormConfig.asset
@@ -13,6 +13,6 @@ MonoBehaviour:
  m_Name: PLY_FormConfig
  m_EditorClassIdentifier: 
  forms:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
+  - {fileID: 11400000, guid: b2ba655d7ab18bc48b2855c56d25cc1b, type: 2}
+  - {fileID: 11400000, guid: 82d209d1343ca524dbf22fe56c489246, type: 2}
+  - {fileID: 11400000, guid: 76b37db14bfccc2488ad29268d02d54a, type: 2}
--- a/Assets/_Game/Data/Player/PLY_PlayerAnimationConfig.asset
+++ b/Assets/_Game/Data/Player/PLY_PlayerAnimationConfig.asset
@@ -12,23 +12,20 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5ec15df6b0d345c4f92ba459e89dc02f, type: 3}
  m_Name: PLY_PlayerAnimationConfig
  m_EditorClassIdentifier: 
-  Idle: {fileID: 0}
-  Run: {fileID: 0}
-  Jump: {fileID: 0}
-  Fall: {fileID: 0}
-  Dash: {fileID: 0}
-  WallSlide: {fileID: 0}
-  Hurt: {fileID: 0}
-  Dead: {fileID: 0}
+  Idle: {fileID: 7400000, guid: 0fba2927fa4627449b8e277805c0b3b5, type: 2}
+  Run: {fileID: 7400000, guid: 8f7b8659b100c93499761109be066543, type: 2}
+  Jump: {fileID: 7400000, guid: 8ef02c7477ee3ea4585a4d0bcc20ab42, type: 2}
+  AirJump: {fileID: 7400000, guid: 904dfb09ecf693d45aea778ecfbd8eb7, type: 2}
+  Fall: {fileID: 7400000, guid: 525660d3a8f083c49b48fce0f82f604e, type: 2}
+  Dash: {fileID: 7400000, guid: 407a732f86675164a9d61ac1b61fb8bf, type: 2}
+  DashInvincible: {fileID: 7400000, guid: 612dcd6dfa8c62743bbd1e9fc30071ae, type: 2}
+  WallSlide: {fileID: 7400000, guid: fb9661f2571db684b8a09c25f884a31f, type: 2}
+  WallJumpAway: {fileID: 7400000, guid: 8ef02c7477ee3ea4585a4d0bcc20ab42, type: 2}
+  WallJumpToward: {fileID: 7400000, guid: 8ef02c7477ee3ea4585a4d0bcc20ab42, type: 2}
+  Hurt: {fileID: 7400000, guid: 3f4bb0b6b3ca2224f9697775b61c8ab6, type: 2}
+  Dead: {fileID: 7400000, guid: 720c61e4274ae5745b3777cbc7f2fcea, type: 2}
  HurtDuration: 0.4
  UseSpring: {fileID: 0}
-  GroundAttacks: []
-  GroundAttackTimings:
-  - HitBoxEnter: 0.3
-    HitBoxExit: 0.6
-  AirAttack: {fileID: 0}
-  UpAttack: {fileID: 0}
-  DownAttack: {fileID: 0}
  ParryStart: {fileID: 0}
  ParrySuccess: {fileID: 0}
  SwimIdle: {fileID: 0}
--- a/Assets/_Game/Data/Player/PLY_PlayerMovementConfig.asset
+++ b/Assets/_Game/Data/Player/PLY_PlayerMovementConfig.asset
@@ -12,21 +12,27 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 81da55e0fcf99d34693cbc5a348225c3, type: 3}
  m_Name: PLY_PlayerMovementConfig
  m_EditorClassIdentifier: 
-  RunSpeed: 7
-  Acceleration: 50
-  Deceleration: 80
-  JumpForce: 18
+  RunSpeed: 10
+  AirDragFactor: 1
+  JumpForce: 24
  CoyoteTime: 0.12
  FallGravityMult: 2.5
-  MaxFallSpeed: 20
+  MaxFallSpeed: 28
+  JumpCutMultiplier: 0.321
+  ApexThreshold: 3
+  ApexGravityMultiplier: 0.3
+  MaxAirJumps: 1
+  DoubleJumpForce: 19
  DashSpeed: 20
-  DashDuration: 0.18
+  DashDuration: 0.25
  DashCooldown: 0.4
  MaxAerialDashes: 1
+  DashInvincibilityDuration: 0.2
+  DashInvincibilityCooldown: 0.9
  WallSlideSpeed: 2
  WallJumpForceX: 12
  WallJumpForceY: 16
-  WallRayLength: 0.55
+  WallRayLength: 0.37
  WallRayOffsetY: 0.2
  WallGrabMaxHeightGain: 0.5
  WallGrabReleaseDelay: 0.08
@@ -34,4 +40,4 @@ MonoBehaviour:
  WallJumpAwayForceX: 10
  WallJumpAwayForceY: 18
  WallJumpInputLockDuration: 0.15
-  DefaultGravityScale: 3
+  DefaultGravityScale: 6
--- a/Assets/_Game/Data/Player/PLY_PlayerStats.asset
+++ b/Assets/_Game/Data/Player/PLY_PlayerStats.asset
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 31a9f22bef1315643bf5a49f2a6edd2b, type: 3}
+  m_Name: PLY_PlayerStats
+  m_EditorClassIdentifier: 
+  MaxHP: 5
+  MaxSoulPower: 100
+  MaxSpiritPower: 100
+  SpiritRegenRate: 5
+  MaxSpringCharges: 3
+  SpringHealAmount: 2
+  SpringKillThreshold: 4
+  InvincibilityDuration: 0.6
+  InitialLingZhu: 0
+  InitialAbilities: 524279
--- a/Assets/_Game/Data/Player/PLY_PlayerStats.asset.meta
+++ b/Assets/_Game/Data/Player/PLY_PlayerStats.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eaaee0817c0cc9e449142241ad75827e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Player/Weapons.meta
+++ b/Assets/_Game/Data/Player/Weapons.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cf52457264252d34db476527ee76c8d2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Player/Weapons/Weapon_DiHun.asset
+++ b/Assets/_Game/Data/Player/Weapons/Weapon_DiHun.asset
@@ -0,0 +1,103 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: d2443d04d1c179d4d8a4f36e7ca7156e, type: 3}
+  m_Name: Weapon_DiHun
+  m_EditorClassIdentifier: 
+  weaponId: 
+  displayName: 
+  icon: {fileID: 0}
+  weaponType: 0
+  groundComboSteps:
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.3
+    hitBoxExit: 0.6
+    comboInputOpen: 0.3
+    comboInputClose: 0
+    cancelWindowOpen: 0.5
+    recoveryTime: 0.05
+    comboTimeout: 0.25
+    hitBoxId: 
+  airComboSteps:
+  - clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.1
+    hitBoxExit: 0.8
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  upStep:
+    clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.2
+    hitBoxExit: 0.7
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  downStep:
+    clip:
+      _FadeDuration: 0.25
+      _Speed: 1
+      _Events:
+        _NormalizedTimes: []
+        _Callbacks: []
+        _Names: []
+      _Clip: {fileID: 0}
+      _NormalizedStartTime: NaN
+    damageSource: {fileID: 0}
+    hitBoxEnter: 0.1
+    hitBoxExit: 0.9
+    comboInputOpen: 0
+    comboInputClose: 0
+    cancelWindowOpen: 0
+    recoveryTime: 0.05
+    comboTimeout: 0
+    hitBoxId: 
+  hitBoxPrefab: {fileID: 0}
+  vfxConfig:
+    onEquipPresetId: 
+    weaponTrailPrefab: {fileID: 0}
+    trailColor: {r: 1, g: 1, b: 1, a: 1}
+  soulPowerGain: 10
+  references:
+    version: 2
+    RefIds: []
--- a/Assets/_Game/Data/Player/Weapons/Weapon_DiHun.asset.meta
+++ b/Assets/_Game/Data/Player/Weapons/Weapon_DiHun.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f80486c9cd3d1db459ce6df915b11546
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Player/Weapons/Weapon_MingHun.asset
+++ b/Assets/_Game/Data/Player/Weapons/Weapon_MingHun.asset
@@ -0,0 +1,87 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: d2443d04d1c179d4d8a4f36e7ca7156e, type: 3}
+  m_Name: Weapon_MingHun
+  m_EditorClassIdentifier: 
+  weaponId: 
+  displayName: 
+  icon: {fileID: 0}
+  weaponType: 0
+  attack1Clip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  attack2Clip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  attack3Clip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  airAttackClip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  upAttackClip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  downAttackClip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  attack1Source: {fileID: 0}
+  attack2Source: {fileID: 0}
+  attack3Source: {fileID: 0}
+  airAttackSource: {fileID: 0}
+  upAttackSource: {fileID: 0}
+  downAttackSource: {fileID: 0}
+  hitBoxPrefab: {fileID: 0}
+  vfxConfig:
+    onEquipPresetId: 
+    weaponTrailPrefab: {fileID: 0}
+    trailColor: {r: 1, g: 1, b: 1, a: 1}
+  soulPowerGain: 10
+  references:
+    version: 2
+    RefIds: []
--- a/Assets/_Game/Data/Player/Weapons/Weapon_MingHun.asset.meta
+++ b/Assets/_Game/Data/Player/Weapons/Weapon_MingHun.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d87ae01ed8a2b4f4cb27d159a52d1a14
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Player/Weapons/Weapon_TianHun.asset
+++ b/Assets/_Game/Data/Player/Weapons/Weapon_TianHun.asset
@@ -0,0 +1,87 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: d2443d04d1c179d4d8a4f36e7ca7156e, type: 3}
+  m_Name: Weapon_TianHun
+  m_EditorClassIdentifier: 
+  weaponId: 
+  displayName: 
+  icon: {fileID: 0}
+  weaponType: 0
+  attack1Clip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  attack2Clip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  attack3Clip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  airAttackClip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  upAttackClip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  downAttackClip:
+    _FadeDuration: 0.25
+    _Speed: 1
+    _Events:
+      _NormalizedTimes: []
+      _Callbacks: []
+      _Names: []
+    _Clip: {fileID: 0}
+    _NormalizedStartTime: NaN
+  attack1Source: {fileID: 0}
+  attack2Source: {fileID: 0}
+  attack3Source: {fileID: 0}
+  airAttackSource: {fileID: 0}
+  upAttackSource: {fileID: 0}
+  downAttackSource: {fileID: 0}
+  hitBoxPrefab: {fileID: 0}
+  vfxConfig:
+    onEquipPresetId: 
+    weaponTrailPrefab: {fileID: 0}
+    trailColor: {r: 1, g: 1, b: 1, a: 1}
+  soulPowerGain: 10
+  references:
+    version: 2
+    RefIds: []
--- a/Assets/_Game/Data/Player/Weapons/Weapon_TianHun.asset.meta
+++ b/Assets/_Game/Data/Player/Weapons/Weapon_TianHun.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 76de8c0ba36dcce4db8990c5b62e9ed8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Progression/Charms/CHM_Catalog.asset
+++ b/Assets/_Game/Data/Progression/Charms/CHM_Catalog.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 277db74c72224f149b8805dc31b2f944, type: 3}
+  m_Name: CHM_Catalog
+  m_EditorClassIdentifier: 
+  _charms: []
--- a/Assets/_Game/Data/Progression/Charms/CHM_Catalog.asset.meta
+++ b/Assets/_Game/Data/Progression/Charms/CHM_Catalog.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 62b057558c311d649ba7d5d91633b544
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: