marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attack flow - breaking and blocking input, roll improvements

Browse Source
This commit is contained in:
marcin
2025-09-10 12:33:13 +02:00
parent 9d6c237088
commit 058920055b
9 changed files with 1219 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab
View File

@@ -105633,13 +105633,13 @@ MonoBehaviour:
triggerDieBehaviour: 0
m_ignoreTriggers: 1
useAnimationBasedRotation: 0
strafeRollInputThreshold: 0.3
strafeRollForwardAnim: Roll_Forward
strafeRollBackwardAnim: Roll_Backward
strafeRollLeftAnim: Roll_Left
strafeRollRightAnim: Roll_Right
strafeRollLeftCorrectionAngle: 70.6
strafeRollRightCorrectionAngle: 70
strafeRollBackwardCorrectionAngle: 0
--- !u!114 &9202663235077955828
MonoBehaviour:
m_ObjectHideFlags: 0

46
Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller
View File

@@ -772,8 +772,7 @@ MonoBehaviour:
ignoreDefense: 0
activeRagdoll: 0
senselessTime: 0
resetAttackTrigger: 1
resetTriggerBeforeTime: 0.5
blockInputBeforeTime: 0.5
unlockRotationTime: 0.5
lerpPositionTowardsTarget: 1
maxLerpDistance: 3.5
@@ -781,8 +780,8 @@ MonoBehaviour:
stoppingDistance: 1.2
useComboTimingWindow: 1
comboWindowStartTime: 0.7
comboWindowDuration: 0.4
comboWindowTimeScale: 0.2
comboWindowDuration: 0.3
comboWindowTimeScale: 0.4
useAttackTimeScale: 0
maxTargetDistance: 3
lowHealthTh: 10
@@ -791,7 +790,7 @@ MonoBehaviour:
attackTimeScaleEnd: 0.37
rotatePlayerTowardsTarget: 1
degreeThreshold: 100
debug: 0
debug: 1
--- !u!1101 &-8051095333111886674
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -2749,8 +2748,7 @@ MonoBehaviour:
ignoreDefense: 0
activeRagdoll: 0
senselessTime: 0
resetAttackTrigger: 0
resetTriggerBeforeTime: 0.3
blockInputBeforeTime: 0.5
unlockRotationTime: 0.7
lerpPositionTowardsTarget: 1
maxLerpDistance: 3.5
@@ -2758,8 +2756,8 @@ MonoBehaviour:
stoppingDistance: 1.2
useComboTimingWindow: 1
comboWindowStartTime: 0.6
comboWindowDuration: 0.4
comboWindowTimeScale: 0.2
comboWindowDuration: 0.3
comboWindowTimeScale: 0.4
useAttackTimeScale: 1
maxTargetDistance: 3
lowHealthTh: 30
@@ -4567,6 +4565,7 @@ MonoBehaviour:
tags:
- IsRolling
- IgnoreIK
- LockRotation
--- !u!206 &-2581317115762456654
BlendTree:
m_ObjectHideFlags: 1
@@ -5216,8 +5215,7 @@ MonoBehaviour:
ignoreDefense: 0
activeRagdoll: 0
senselessTime: 0
resetAttackTrigger: 0
resetTriggerBeforeTime: 0.3
blockInputBeforeTime: 0.5
unlockRotationTime: 0.7
lerpPositionTowardsTarget: 1
maxLerpDistance: 3.5
@@ -5225,8 +5223,8 @@ MonoBehaviour:
stoppingDistance: 1.2
useComboTimingWindow: 1
comboWindowStartTime: 0.6
comboWindowDuration: 0.4
comboWindowTimeScale: 0.2
comboWindowDuration: 0.3
comboWindowTimeScale: 0.4
useAttackTimeScale: 1
maxTargetDistance: 3
lowHealthTh: 10
@@ -5738,8 +5736,7 @@ MonoBehaviour:
ignoreDefense: 0
activeRagdoll: 0
senselessTime: 0
resetAttackTrigger: 0
resetTriggerBeforeTime: 0.5
blockInputBeforeTime: 0.5
unlockRotationTime: 0.7
lerpPositionTowardsTarget: 0
maxLerpDistance: 3.5
@@ -26561,15 +26558,14 @@ MonoBehaviour:
ignoreDefense: 1
activeRagdoll: 0
senselessTime: 0
resetAttackTrigger: 0
resetTriggerBeforeTime: 0.6
blockInputBeforeTime: 1
unlockRotationTime: 0.7
lerpPositionTowardsTarget: 1
maxLerpDistance: 3.5
positionLerpSpeed: 2
stoppingDistance: 1.2
useComboTimingWindow: 0
comboWindowStartTime: 0.9
comboWindowStartTime: 1
comboWindowDuration: 0.5
comboWindowTimeScale: 0.3
useAttackTimeScale: 0
@@ -26580,7 +26576,7 @@ MonoBehaviour:
attackTimeScaleEnd: 0.58
rotatePlayerTowardsTarget: 1
degreeThreshold: 100
debug: 0
debug: 1
--- !u!1101 &542493047717198179
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -47984,8 +47980,7 @@ MonoBehaviour:
ignoreDefense: 0
activeRagdoll: 0
senselessTime: 0
resetAttackTrigger: 0
resetTriggerBeforeTime: 0.5
blockInputBeforeTime: 0.5
unlockRotationTime: 0.7
lerpPositionTowardsTarget: 0
maxLerpDistance: 3.5
@@ -48139,8 +48134,7 @@ MonoBehaviour:
ignoreDefense: 0
activeRagdoll: 0
senselessTime: 0
resetAttackTrigger: 1
resetTriggerBeforeTime: 0.5
blockInputBeforeTime: 0.5
unlockRotationTime: 0.7
lerpPositionTowardsTarget: 0
maxLerpDistance: 3.5
@@ -48542,8 +48536,7 @@ MonoBehaviour:
ignoreDefense: 1
activeRagdoll: 0
senselessTime: 0
resetAttackTrigger: 0
resetTriggerBeforeTime: 0.6
blockInputBeforeTime: 0.5
unlockRotationTime: 0.7
lerpPositionTowardsTarget: 1
maxLerpDistance: 3.5
@@ -49431,8 +49424,7 @@ MonoBehaviour:
ignoreDefense: 1
activeRagdoll: 0
senselessTime: 0
resetAttackTrigger: 0
resetTriggerBeforeTime: 0.6
blockInputBeforeTime: 0.5
unlockRotationTime: 0.7
lerpPositionTowardsTarget: 1
maxLerpDistance: 3.5

16
Assets/Prefabs/Items/Powers/bBlueFireball.prefab
View File

@@ -9838,7 +9838,6 @@ GameObject:
- component: {fileID: 7898212980114005163}
- component: {fileID: 8020189233111417037}
- component: {fileID: 8020706684658151899}
- component: {fileID: 7789765392435096873}
m_Layer: 0
m_Name: Particles
m_TagString: Untagged
@@ -14484,21 +14483,6 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1
m_MeshWeighting3: 1
m_MaskInteraction: 0
--- !u!114 &7789765392435096873
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7893307381764779335}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dded6759b4b430e4283cf015251490b7, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 0}
Force: 1
DistanceRelative: 0
--- !u!1 &7893317824759632779
GameObject:
m_ObjectHideFlags: 0