From 285ac46e31c9a20da5651b8002d4d58ec3d0d677 Mon Sep 17 00:00:00 2001 From: Joywayer Date: Fri, 22 May 2026 07:07:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20DiHun=20=E6=AD=A6=E5=99=A8?= =?UTF-8?q?=E5=92=8C=E8=A7=92=E8=89=B2=E8=A1=A8=E5=8D=95=E7=9A=84=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=87=BB=E6=89=93=E7=9B=92?= =?UTF-8?q?=20ID=20=E5=92=8C=E9=A2=9C=E8=89=B2=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Game/Data/Combat/Weapons/WPN_DiHun.asset | 34 +++++++++---------- .../Data/Player/Forms/PLY_Form_DiHun.asset | 2 +- .../Data/Player/Forms/PLY_Form_MingHun.asset | 2 +- .../Data/Player/Forms/PLY_Form_TianHun.asset | 2 +- .../_Game/Data/Player/PLY_PlayerStats.asset | 2 +- .../Weapons/WPN_WPN_DiHun_HitBox.prefab | 24 ++++++------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset b/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset index d308d59..5bd19d7 100644 --- a/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset +++ b/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset @@ -28,13 +28,13 @@ MonoBehaviour: _NormalizedStartTime: NaN damageSource: {fileID: 11400000, guid: a0e13ba45445ebe408ef0353f5adcbfb, type: 2} hitBoxEnter: 0 - hitBoxExit: 0 + hitBoxExit: 0.092 comboInputOpen: 0 - comboInputClose: 0 + comboInputClose: 1 cancelWindowOpen: 0 recoveryTime: 0 comboTimeout: 0 - hitBoxId: + hitBoxId: ATK_Ground_1 - clip: _FadeDuration: 0.25 _Speed: 1 @@ -48,11 +48,11 @@ MonoBehaviour: hitBoxEnter: 0.032 hitBoxExit: 0.669 comboInputOpen: 0.057 - comboInputClose: 0.292 + comboInputClose: 1 cancelWindowOpen: 0.061 recoveryTime: 0 comboTimeout: 0 - hitBoxId: + hitBoxId: ATK_Ground_2 airComboSteps: - clip: _FadeDuration: 0.25 @@ -61,17 +61,17 @@ MonoBehaviour: _NormalizedTimes: [] _Callbacks: [] _Names: [] - _Clip: {fileID: 0} + _Clip: {fileID: 7400000, guid: bde6a54ec8fc04f45a424f9bcd7845df, type: 2} _NormalizedStartTime: NaN damageSource: {fileID: 0} hitBoxEnter: 0.1 hitBoxExit: 0.8 comboInputOpen: 0 - comboInputClose: 0 + comboInputClose: 1 cancelWindowOpen: 0 recoveryTime: 0.05 comboTimeout: 0 - hitBoxId: + hitBoxId: ATK_Air_1 - clip: _FadeDuration: 0.25 _Speed: 1 @@ -79,17 +79,17 @@ MonoBehaviour: _NormalizedTimes: [] _Callbacks: [] _Names: [] - _Clip: {fileID: 0} + _Clip: {fileID: 7400000, guid: c0ef319f521c2a2448022cebcf9c9266, type: 2} _NormalizedStartTime: NaN damageSource: {fileID: 0} hitBoxEnter: 0.1 hitBoxExit: 0.8 - comboInputOpen: 0 - comboInputClose: 0 - cancelWindowOpen: 0 + comboInputOpen: 0.026 + comboInputClose: 0.426 + cancelWindowOpen: 0.019 recoveryTime: 0.05 comboTimeout: 0 - hitBoxId: + hitBoxId: ATK_Air_2 upStep: clip: _FadeDuration: 0.25 @@ -98,7 +98,7 @@ MonoBehaviour: _NormalizedTimes: [] _Callbacks: [] _Names: [] - _Clip: {fileID: 0} + _Clip: {fileID: 7400000, guid: baae11fb27958444d911f8d637448184, type: 2} _NormalizedStartTime: NaN damageSource: {fileID: 0} hitBoxEnter: 0.2 @@ -108,7 +108,7 @@ MonoBehaviour: cancelWindowOpen: 0 recoveryTime: 0.05 comboTimeout: 0 - hitBoxId: + hitBoxId: ATK_Up downStep: clip: _FadeDuration: 0.25 @@ -117,7 +117,7 @@ MonoBehaviour: _NormalizedTimes: [] _Callbacks: [] _Names: [] - _Clip: {fileID: 0} + _Clip: {fileID: 7400000, guid: d199f06821d6b92478f9fd7c3f0cd11d, type: 2} _NormalizedStartTime: NaN damageSource: {fileID: 0} hitBoxEnter: 0.1 @@ -127,7 +127,7 @@ MonoBehaviour: cancelWindowOpen: 0 recoveryTime: 0.05 comboTimeout: 0 - hitBoxId: + hitBoxId: ATK_Down hitBoxPrefab: {fileID: 4821376343125962025, guid: 2fce42e66b8d4a042a471a661a05ee1b, type: 3} vfxConfig: onEquipPresetId: diff --git a/Assets/_Game/Data/Player/Forms/PLY_Form_DiHun.asset b/Assets/_Game/Data/Player/Forms/PLY_Form_DiHun.asset index de3df9c..fb99f31 100644 --- a/Assets/_Game/Data/Player/Forms/PLY_Form_DiHun.asset +++ b/Assets/_Game/Data/Player/Forms/PLY_Form_DiHun.asset @@ -16,4 +16,4 @@ MonoBehaviour: displayName: "\u5730\u9B42" formType: 1 defaultWeapon: {fileID: 11400000, guid: bde7d85bdf2d3e54da22d07b1f8d2901, type: 2} - formAccentColor: {r: 1, g: 1, b: 1, a: 1} + formAccentColor: {r: 0.9433962, g: 0.8825333, b: 0.15574935, a: 1} diff --git a/Assets/_Game/Data/Player/Forms/PLY_Form_MingHun.asset b/Assets/_Game/Data/Player/Forms/PLY_Form_MingHun.asset index 8c4877e..d0b442a 100644 --- a/Assets/_Game/Data/Player/Forms/PLY_Form_MingHun.asset +++ b/Assets/_Game/Data/Player/Forms/PLY_Form_MingHun.asset @@ -16,4 +16,4 @@ MonoBehaviour: displayName: "\u547D\u9B42" formType: 2 defaultWeapon: {fileID: 11400000, guid: fbe1ff6f23c995541a5833b51c52dc01, type: 2} - formAccentColor: {r: 1, g: 1, b: 1, a: 1} + formAccentColor: {r: 0.9150943, g: 0.15970986, b: 0.15970986, a: 1} diff --git a/Assets/_Game/Data/Player/Forms/PLY_Form_TianHun.asset b/Assets/_Game/Data/Player/Forms/PLY_Form_TianHun.asset index bd07c54..1fae21c 100644 --- a/Assets/_Game/Data/Player/Forms/PLY_Form_TianHun.asset +++ b/Assets/_Game/Data/Player/Forms/PLY_Form_TianHun.asset @@ -16,4 +16,4 @@ MonoBehaviour: displayName: "\u5929\u9B42" formType: 0 defaultWeapon: {fileID: 11400000, guid: 533d4711e21d8584597a5d4569fe2eb0, type: 2} - formAccentColor: {r: 1, g: 1, b: 1, a: 1} + formAccentColor: {r: 0.23740657, g: 0.8709677, b: 0.9150943, a: 1} diff --git a/Assets/_Game/Data/Player/PLY_PlayerStats.asset b/Assets/_Game/Data/Player/PLY_PlayerStats.asset index d448f37..69f2a28 100644 --- a/Assets/_Game/Data/Player/PLY_PlayerStats.asset +++ b/Assets/_Game/Data/Player/PLY_PlayerStats.asset @@ -21,4 +21,4 @@ MonoBehaviour: SpringKillThreshold: 4 InvincibilityDuration: 0.6 InitialLingZhu: 0 - InitialAbilities: 0 + InitialAbilities: 4194295 diff --git a/Assets/_Game/Prefabs/Weapons/WPN_WPN_DiHun_HitBox.prefab b/Assets/_Game/Prefabs/Weapons/WPN_WPN_DiHun_HitBox.prefab index c25cef0..fef1845 100644 --- a/Assets/_Game/Prefabs/Weapons/WPN_WPN_DiHun_HitBox.prefab +++ b/Assets/_Game/Prefabs/Weapons/WPN_WPN_DiHun_HitBox.prefab @@ -92,10 +92,10 @@ MonoBehaviour: m_EditorClassIdentifier: _defaultSource: {fileID: 0} _hitCooldown: 0.1 - _id: + _id: ATK_Ground_1 _rivalHitBoxMask: serializedVersion: 2 - m_Bits: 32832 + m_Bits: 134217792 --- !u!1 &1932889250901504761 GameObject: m_ObjectHideFlags: 0 @@ -188,10 +188,10 @@ MonoBehaviour: m_EditorClassIdentifier: _defaultSource: {fileID: 0} _hitCooldown: 0.1 - _id: + _id: ATK_Down _rivalHitBoxMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 134217792 --- !u!1 &2584603199706918030 GameObject: m_ObjectHideFlags: 0 @@ -284,10 +284,10 @@ MonoBehaviour: m_EditorClassIdentifier: _defaultSource: {fileID: 0} _hitCooldown: 0.1 - _id: + _id: ATK_Ground_2 _rivalHitBoxMask: serializedVersion: 2 - m_Bits: 32832 + m_Bits: 134217792 --- !u!1 &4050057806632877121 GameObject: m_ObjectHideFlags: 0 @@ -380,10 +380,10 @@ MonoBehaviour: m_EditorClassIdentifier: _defaultSource: {fileID: 0} _hitCooldown: 0.1 - _id: + _id: ATK_Air_2 _rivalHitBoxMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 134217792 --- !u!1 &4335406389674002762 GameObject: m_ObjectHideFlags: 0 @@ -476,10 +476,10 @@ MonoBehaviour: m_EditorClassIdentifier: _defaultSource: {fileID: 0} _hitCooldown: 0.1 - _id: + _id: ATK_Up _rivalHitBoxMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 134217792 --- !u!1 &4821376343125962025 GameObject: m_ObjectHideFlags: 0 @@ -626,7 +626,7 @@ MonoBehaviour: m_EditorClassIdentifier: _defaultSource: {fileID: 0} _hitCooldown: 0.1 - _id: + _id: ATK_Air_1 _rivalHitBoxMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 134217792