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

improved hit reactions

Browse Source
This commit is contained in:
marcin
2025-06-12 14:00:05 +02:00
parent 4111d87737
commit 29ee1ea2ec
9 changed files with 611 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

209
Assets/AI/FSM/FSM_Spider 2.0.asset
View File

@@ -88,11 +88,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 695
y: 340
x: 260
y: 305
width: 150
height: 30
positionRect: {x: 695, y: 340}
positionRect: {x: 260, y: 305}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 1, a: 1}
@@ -104,7 +104,7 @@ MonoBehaviour:
- decisions:
- trueValue: 1
decision: {fileID: 5430119601860107240}
isValid: 1
isValid: 0
validated: 0
- trueValue: 1
decision: {fileID: 117913083446138218}
@@ -119,14 +119,14 @@ MonoBehaviour:
parentState: {fileID: -6568372008305276654}
trueRect:
serializedVersion: 2
x: 770
y: 355
x: 335
y: 320
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 770
y: 355
x: 335
y: 320
width: 0
height: 0
selectedTrue: 0
@@ -165,11 +165,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 895
y: 230
x: 460
y: 195
width: 150
height: 30
positionRect: {x: 895, y: 230}
positionRect: {x: 460, y: 195}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -196,14 +196,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 970
y: 245
x: 535
y: 210
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 970
y: 245
x: 535
y: 210
width: 0
height: 0
selectedTrue: 0
@@ -224,14 +224,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 970
y: 245
x: 535
y: 210
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 970
y: 245
x: 535
y: 210
width: 0
height: 0
selectedTrue: 0
@@ -260,14 +260,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 970
y: 245
x: 535
y: 210
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 970
y: 245
x: 535
y: 210
width: 0
height: 0
selectedTrue: 0
@@ -365,11 +365,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 895
y: 155
x: 460
y: 120
width: 150
height: 30
positionRect: {x: 895, y: 155}
positionRect: {x: 460, y: 120}
rectWidth: 150
editingName: 1
nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1}
@@ -388,14 +388,14 @@ MonoBehaviour:
parentState: {fileID: -3177478727897100882}
trueRect:
serializedVersion: 2
x: 970
y: 170
x: 535
y: 135
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 970
y: 170
x: 535
y: 135
width: 0
height: 0
selectedTrue: 0
@@ -406,8 +406,7 @@ MonoBehaviour:
isOpen: 0
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
actions:
- {fileID: 0}
actions: []
useActions: 1
useDecisions: 1
parentGraph: {fileID: 11400000}
@@ -435,11 +434,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 1210
y: 230
x: 775
y: 195
width: 150
height: 30
positionRect: {x: 1210, y: 230}
positionRect: {x: 775, y: 195}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1}
@@ -451,7 +450,7 @@ MonoBehaviour:
- decisions:
- trueValue: 0
decision: {fileID: 7927421991537792917}
isValid: 1
isValid: 0
validated: 0
trueState: {fileID: -312774025800194259}
falseState: {fileID: 0}
@@ -462,14 +461,14 @@ MonoBehaviour:
parentState: {fileID: -2904979146780567904}
trueRect:
serializedVersion: 2
x: 1285
y: 245
x: 850
y: 210
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 1285
y: 245
x: 850
y: 210
width: 0
height: 0
selectedTrue: 0
@@ -568,11 +567,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 895
y: 100
x: 460
y: 70
width: 150
height: 30
positionRect: {x: 895, y: 100}
positionRect: {x: 460, y: 70}
rectWidth: 150
editingName: 0
nodeColor: {r: 0, g: 1, b: 0, a: 1}
@@ -661,11 +660,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 760
y: 415
x: 325
y: 380
width: 150
height: 30
positionRect: {x: 760, y: 415}
positionRect: {x: 325, y: 380}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1}
@@ -692,14 +691,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
selectedTrue: 0
@@ -724,14 +723,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
selectedTrue: 0
@@ -764,14 +763,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
selectedTrue: 0
@@ -800,14 +799,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
selectedTrue: 0
@@ -832,14 +831,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 835
y: 430
x: 400
y: 395
width: 0
height: 0
selectedTrue: 0
@@ -886,7 +885,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
m_Name: FSM_Spider 2.0
m_EditorClassIdentifier:
selectedNode: {fileID: 2691300596403639167}
selectedNode: {fileID: -712571192746352845}
wantConnection: 0
connectionNode: {fileID: 0}
showProperties: 1
@@ -901,7 +900,7 @@ MonoBehaviour:
- {fileID: 2986668563461644515}
- {fileID: 762670965814380212}
- {fileID: 2691300596403639167}
panOffset: {x: 560, y: 120}
panOffset: {x: 460, y: 70}
overNode: 0
actions:
- {fileID: 0}
@@ -924,7 +923,6 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
icon: {fileID: 0}
--- !u!114 &117913083446138218
MonoBehaviour:
@@ -978,11 +976,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 900
y: 515
x: 465
y: 480
width: 150
height: 30
positionRect: {x: 900, y: 515}
positionRect: {x: 465, y: 480}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1001,14 +999,14 @@ MonoBehaviour:
parentState: {fileID: 762670965814380212}
trueRect:
serializedVersion: 2
x: 975
y: 530
x: 540
y: 495
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 975
y: 530
x: 540
y: 495
width: 0
height: 0
selectedTrue: 0
@@ -1063,14 +1061,14 @@ MonoBehaviour:
canEditName: 1
canEditColor: 1
isOpen: 0
isSelected: 1
isSelected: 0
nodeRect:
serializedVersion: 2
x: 1215
y: 520
x: 780
y: 485
width: 150
height: 30
positionRect: {x: 1215, y: 520}
positionRect: {x: 780, y: 485}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1089,14 +1087,14 @@ MonoBehaviour:
parentState: {fileID: 2691300596403639167}
trueRect:
serializedVersion: 2
x: 1290
y: 535
x: 855
y: 500
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 1290
y: 535
x: 855
y: 500
width: 0
height: 0
selectedTrue: 0
@@ -1153,11 +1151,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 1210
y: 365
x: 775
y: 330
width: 150
height: 84
positionRect: {x: 1210, y: 365}
positionRect: {x: 775, y: 330}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1184,14 +1182,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 1360
y: 395
x: 925
y: 360
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 1360
y: 405
x: 925
y: 370
width: 10
height: 10
selectedTrue: 0
@@ -1216,14 +1214,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 1200
y: 417
x: 765
y: 382
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 1360
y: 427
x: 925
y: 392
width: 10
height: 10
selectedTrue: 0
@@ -1369,11 +1367,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 695
y: 225
x: 260
y: 190
width: 150
height: 62
positionRect: {x: 695, y: 225}
positionRect: {x: 260, y: 190}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 0.31300926, b: 1, a: 1}
@@ -1382,11 +1380,7 @@ MonoBehaviour:
inDrag: 0
resetCurrentDestination: 1
transitions:
- decisions:
- trueValue: 1
decision: {fileID: 0}
isValid: 0
validated: 0
- decisions: []
trueState: {fileID: -3177478727897100882}
falseState: {fileID: 0}
muteTrue: 0
@@ -1396,14 +1390,14 @@ MonoBehaviour:
parentState: {fileID: 7012559722788630447}
trueRect:
serializedVersion: 2
x: 845
y: 255
x: 410
y: 220
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 845
y: 265
x: 410
y: 230
width: 10
height: 10
selectedTrue: 0
@@ -1416,7 +1410,6 @@ MonoBehaviour:
sameTargetCount: 0
actions:
- {fileID: -8928100321911641966}
- {fileID: 0}
- {fileID: 2969732915680329617}
useActions: 1
useDecisions: 1

19
Assets/AI/GhostDemon.prefab
View File

@@ -1438,6 +1438,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
hitProperties:
hitDamageTags:
- Enemy
@@ -2606,6 +2607,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -2621,6 +2623,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -2636,6 +2639,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 5362143544003886228}
@@ -2973,6 +2977,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 25
staminaBlockCost: 5
@@ -2988,6 +2993,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 20
staminaBlockCost: 5
@@ -3003,6 +3009,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 4655517810601481317}
@@ -3467,6 +3474,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -3482,6 +3490,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 25
staminaBlockCost: 5
@@ -3497,6 +3506,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 7703211540812842878}
@@ -4597,6 +4607,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -4612,6 +4623,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -4627,6 +4639,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 3822061495319371584}
@@ -7035,6 +7048,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -7050,6 +7064,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -7065,6 +7080,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 6201576030831472258}
@@ -7335,6 +7351,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -7350,6 +7367,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -7365,6 +7383,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 3632722909168515802}

25
Assets/AI/SK_Skeleton_Warrior_Shield_NoArmor.prefab
View File

@@ -465,6 +465,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -480,6 +481,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -495,6 +497,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 242953564765660655}
@@ -1024,6 +1027,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -1039,6 +1043,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -1054,6 +1059,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 0}
@@ -1723,6 +1729,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -1738,6 +1745,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -1753,6 +1761,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 0}
@@ -36934,6 +36943,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -36949,6 +36959,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -36964,6 +36975,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 7037452232757207961}
@@ -85012,6 +85024,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
hitProperties:
hitDamageTags:
- Enemy
@@ -87013,6 +87026,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -87028,6 +87042,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -87043,6 +87058,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 7037452233788992501}
@@ -87416,6 +87432,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -87431,6 +87448,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -87446,6 +87464,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 7037452234747447998}
@@ -88380,6 +88399,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -88395,6 +88415,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -88410,6 +88431,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 7037452234442223434}
@@ -88596,6 +88618,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -88611,6 +88634,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -88626,6 +88650,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 7037452233157601640}

2
Assets/AI/Spider_Base_Model_AI Variant RootMotion.prefab
View File

@@ -681,7 +681,7 @@ PrefabInstance:
- target: {fileID: 8403356871782257122, guid: 3545b719df392a940ac2b114c933a71f,
type: 3}
propertyPath: selectedToolbar
value: 13
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8403356871782257122, guid: 3545b719df392a940ac2b114c933a71f,
type: 3}