lot's of fixes, fixed animation retargetting, fixed FSM

This commit is contained in:
2025-07-24 17:19:42 +02:00
parent 802eb5ac1d
commit d4d01dfb69
27 changed files with 4381 additions and 2990 deletions

View File

@@ -106,11 +106,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 80
y: 385
x: 650
y: 270
width: 150
height: 30
positionRect: {x: 80, y: 385}
positionRect: {x: 650, y: 270}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 1, a: 1}
@@ -126,7 +126,7 @@ MonoBehaviour:
validated: 0
- trueValue: 1
decision: {fileID: 117913083446138218}
isValid: 1
isValid: 0
validated: 0
trueState: {fileID: 0}
falseState: {fileID: 0}
@@ -137,14 +137,14 @@ MonoBehaviour:
parentState: {fileID: -6568372008305276654}
trueRect:
serializedVersion: 2
x: 155
y: 400
x: 725
y: 285
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 155
y: 400
x: 725
y: 285
width: 0
height: 0
selectedTrue: 0
@@ -213,11 +213,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 310
y: 385
x: 880
y: 270
width: 150
height: 30
positionRect: {x: 310, y: 385}
positionRect: {x: 880, y: 270}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -244,14 +244,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 385
y: 400
x: 955
y: 285
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 385
y: 400
x: 955
y: 285
width: 0
height: 0
selectedTrue: 0
@@ -272,14 +272,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 385
y: 400
x: 955
y: 285
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 385
y: 400
x: 955
y: 285
width: 0
height: 0
selectedTrue: 0
@@ -308,14 +308,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 385
y: 400
x: 955
y: 285
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 385
y: 400
x: 955
y: 285
width: 0
height: 0
selectedTrue: 0
@@ -407,24 +407,6 @@ MonoBehaviour:
height: 10
selectedTrue: 0
selectedFalse: 0
--- !u!114 &-3295100193612380839
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: 59bf25b4c94a984459c2fea3abb09614, type: 3}
m_Name: Add Health 1hp
m_EditorClassIdentifier:
parentFSM: {fileID: 11400000}
executionType: 1
editingName: 0
recoverWhenIsDead: 0
timeToAdd: 1
healthToRecovery: 1
--- !u!114 &-3177478727897100882
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -448,11 +430,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 310
y: 300
x: 880
y: 185
width: 150
height: 30
positionRect: {x: 310, y: 300}
positionRect: {x: 880, y: 185}
rectWidth: 150
editingName: 1
nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1}
@@ -471,14 +453,14 @@ MonoBehaviour:
parentState: {fileID: -3177478727897100882}
trueRect:
serializedVersion: 2
x: 385
y: 315
x: 955
y: 200
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 385
y: 315
x: 955
y: 200
width: 0
height: 0
selectedTrue: 0
@@ -489,8 +471,7 @@ MonoBehaviour:
isOpen: 0
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
actions:
- {fileID: -3295100193612380839}
actions: []
useActions: 1
useDecisions: 1
parentGraph: {fileID: 11400000}
@@ -515,14 +496,14 @@ MonoBehaviour:
canEditName: 1
canEditColor: 1
isOpen: 1
isSelected: 0
isSelected: 1
nodeRect:
serializedVersion: 2
x: 625
y: 385
x: 1195
y: 270
width: 150
height: 62
positionRect: {x: 625, y: 385}
positionRect: {x: 1195, y: 270}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1}
@@ -532,13 +513,9 @@ MonoBehaviour:
resetCurrentDestination: 0
transitions:
- decisions:
- trueValue: 1
decision: {fileID: -8891615738546387327}
isValid: 1
validated: 0
- trueValue: 0
decision: {fileID: 7927421991537792917}
isValid: 1
isValid: 0
validated: 0
trueState: {fileID: -312774025800194259}
falseState: {fileID: 0}
@@ -549,14 +526,14 @@ MonoBehaviour:
parentState: {fileID: -2904979146780567904}
trueRect:
serializedVersion: 2
x: 615
y: 415
x: 1185
y: 300
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 775
y: 425
x: 1345
y: 310
width: 10
height: 10
selectedTrue: 0
@@ -570,7 +547,6 @@ MonoBehaviour:
actions:
- {fileID: -412818415490466719}
- {fileID: -582706828105160373}
- {fileID: -3295100193612380839}
- {fileID: -5382732617586704546}
useActions: 1
useDecisions: 1
@@ -655,11 +631,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 310
y: 245
x: 880
y: 130
width: 150
height: 30
positionRect: {x: 310, y: 245}
positionRect: {x: 880, y: 130}
rectWidth: 150
editingName: 0
nodeColor: {r: 0, g: 1, b: 0, a: 1}
@@ -706,6 +682,8 @@ MonoBehaviour:
editingName: 0
debugMode: 0
patrolSpeed: 1
patrolInStrafe: 0
updateRotationInStrafe: 1
--- !u!114 &-312774025800194259
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -729,11 +707,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 175
y: 570
x: 745
y: 455
width: 150
height: 30
positionRect: {x: 175, y: 570}
positionRect: {x: 745, y: 455}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1}
@@ -749,7 +727,7 @@ MonoBehaviour:
validated: 0
- trueValue: 1
decision: {fileID: -2866484833343459521}
isValid: 0
isValid: 1
validated: 0
trueState: {fileID: 2986668563461644515}
falseState: {fileID: 0}
@@ -760,14 +738,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
selectedTrue: 0
@@ -792,14 +770,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
selectedTrue: 0
@@ -817,7 +795,7 @@ MonoBehaviour:
validated: 0
- trueValue: 0
decision: {fileID: -2866484833343459521}
isValid: 1
isValid: 0
validated: 0
- trueValue: 0
decision: {fileID: 7927421991537792917}
@@ -832,14 +810,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
selectedTrue: 0
@@ -868,14 +846,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
selectedTrue: 0
@@ -900,14 +878,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 250
y: 585
x: 820
y: 470
width: 0
height: 0
selectedTrue: 0
@@ -954,7 +932,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
m_Name: FSM_Skeleton 1.1
m_EditorClassIdentifier:
selectedNode: {fileID: 2986668563461644515}
selectedNode: {fileID: -2904979146780567904}
wantConnection: 0
connectionNode: {fileID: 0}
showProperties: 1
@@ -968,7 +946,7 @@ MonoBehaviour:
- {fileID: 2986668563461644515}
- {fileID: 762670965814380212}
- {fileID: 2691300596403639167}
panOffset: {x: 275, y: 245}
panOffset: {x: 195, y: 275}
overNode: 0
actions:
- {fileID: 0}
@@ -981,7 +959,6 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
decisions:
- {fileID: 0}
- {fileID: 0}
@@ -992,7 +969,6 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
icon: {fileID: 0}
--- !u!114 &117913083446138218
MonoBehaviour:
@@ -1046,11 +1022,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 315
y: 670
x: 885
y: 555
width: 150
height: 30
positionRect: {x: 315, y: 670}
positionRect: {x: 885, y: 555}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1069,14 +1045,14 @@ MonoBehaviour:
parentState: {fileID: 762670965814380212}
trueRect:
serializedVersion: 2
x: 390
y: 685
x: 960
y: 570
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 390
y: 685
x: 960
y: 570
width: 0
height: 0
selectedTrue: 0
@@ -1110,6 +1086,7 @@ MonoBehaviour:
editingName: 0
_animationState: Jump
_layer: 0
crossfade: 0.2
--- !u!114 &2691300596403639167
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1133,11 +1110,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 630
y: 675
x: 1200
y: 560
width: 150
height: 30
positionRect: {x: 630, y: 675}
positionRect: {x: 1200, y: 560}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1156,14 +1133,14 @@ MonoBehaviour:
parentState: {fileID: 2691300596403639167}
trueRect:
serializedVersion: 2
x: 705
y: 690
x: 1275
y: 575
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 705
y: 690
x: 1275
y: 575
width: 0
height: 0
selectedTrue: 0
@@ -1193,21 +1170,21 @@ MonoBehaviour:
m_Name: Combat
m_EditorClassIdentifier:
description: FSM State
selectedDecisionIndex: 1
selectedDecisionIndex: 0
canRemove: 1
canTranstTo: 1
canSetAsDefault: 1
canEditName: 1
canEditColor: 1
isOpen: 1
isSelected: 1
isSelected: 0
nodeRect:
serializedVersion: 2
x: 625
y: 570
x: 1195
y: 455
width: 150
height: 84
positionRect: {x: 625, y: 570}
positionRect: {x: 1195, y: 455}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1230,14 +1207,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 775
y: 600
x: 1345
y: 485
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 775
y: 610
x: 1345
y: 495
width: 10
height: 10
selectedTrue: 0
@@ -1262,17 +1239,17 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 615
y: 622
x: 1185
y: 507
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 775
y: 632
x: 1345
y: 517
width: 10
height: 10
selectedTrue: 1
selectedTrue: 0
selectedFalse: 0
trueSideRight: 0
falseSideRight: 1
@@ -1406,4 +1383,5 @@ MonoBehaviour:
executionType: 1
editingName: 0
useStrafeMovement: 0
updateRotationInStrafe: 0
speed: 2