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

@@ -119,109 +119,6 @@ MonoBehaviour:
floatValue: 0
intValue: 0
boolValue: 0
--- !u!114 &-6987484206971833696
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: 3b73a6f13cf18194e889cafd0287a9ec, type: 3}
m_Name: Move Back
m_EditorClassIdentifier:
description: FSM State
selectedDecisionIndex: 0
canRemove: 1
canTranstTo: 1
canSetAsDefault: 1
canEditName: 1
canEditColor: 1
isOpen: 0
isSelected: 0
nodeRect:
serializedVersion: 2
x: 630
y: 450
width: 150
height: 30
positionRect: {x: 630, y: 450}
rectWidth: 150
editingName: 1
nodeColor: {r: 0.15496778, g: 1, b: 0, a: 1}
resizeLeft: 0
resizeRight: 0
inDrag: 0
resetCurrentDestination: 1
transitions:
- decisions:
- trueValue: 1
decision: {fileID: 7963497582555310150}
isValid: 1
validated: 0
trueState: {fileID: 3522127403913465562}
falseState: {fileID: 0}
muteTrue: 0
muteFalse: 0
transitionType: 0
transitionDelay: 0
parentState: {fileID: -6987484206971833696}
trueRect:
serializedVersion: 2
x: 705
y: 465
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 705
y: 465
width: 0
height: 0
selectedTrue: 0
selectedFalse: 0
trueSideRight: 0
falseSideRight: 1
decisionEditor: {fileID: 0}
isOpen: 0
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
- decisions: []
trueState: {fileID: 271125091381381572}
falseState: {fileID: 0}
muteTrue: 0
muteFalse: 0
transitionType: 0
transitionDelay: 2
parentState: {fileID: -6987484206971833696}
trueRect:
serializedVersion: 2
x: 705
y: 465
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 705
y: 465
width: 0
height: 0
selectedTrue: 0
selectedFalse: 0
trueSideRight: 0
falseSideRight: 0
decisionEditor: {fileID: 0}
isOpen: 0
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
actions:
- {fileID: -1781127013718542219}
- {fileID: -7241765882706441239}
useActions: 1
useDecisions: 1
parentGraph: {fileID: 11400000}
defaultTransition: {fileID: 0}
--- !u!114 &-6568372008305276654
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -245,11 +142,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 370
y: 210
x: 535
y: 0
width: 150
height: 30
positionRect: {x: 370, y: 210}
positionRect: {x: 535, y: 0}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 1, a: 1}
@@ -259,13 +156,9 @@ MonoBehaviour:
resetCurrentDestination: 0
transitions:
- decisions:
- trueValue: 1
decision: {fileID: 6826334675167494044}
isValid: 0
validated: 0
- trueValue: 0
decision: {fileID: -1523554798597696118}
isValid: 0
isValid: 1
validated: 0
trueState: {fileID: 8920381803127701203}
falseState: {fileID: 0}
@@ -276,14 +169,14 @@ MonoBehaviour:
parentState: {fileID: -6568372008305276654}
trueRect:
serializedVersion: 2
x: 445
y: 225
x: 610
y: 15
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 445
y: 225
x: 610
y: 15
width: 0
height: 0
selectedTrue: 0
@@ -297,10 +190,6 @@ MonoBehaviour:
- decisions:
- trueValue: 1
decision: {fileID: -1523554798597696118}
isValid: 1
validated: 0
- trueValue: 0
decision: {fileID: 8873468930554738780}
isValid: 0
validated: 0
trueState: {fileID: -1839963680886773275}
@@ -312,14 +201,14 @@ MonoBehaviour:
parentState: {fileID: -6568372008305276654}
trueRect:
serializedVersion: 2
x: 445
y: 225
x: 610
y: 15
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 445
y: 225
x: 610
y: 15
width: 0
height: 0
selectedTrue: 0
@@ -378,11 +267,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 810
y: 210
x: 975
y: 0
width: 150
height: 30
positionRect: {x: 810, y: 210}
positionRect: {x: 975, y: 0}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -391,15 +280,7 @@ MonoBehaviour:
inDrag: 0
resetCurrentDestination: 1
transitions:
- decisions:
- trueValue: 1
decision: {fileID: 7876490987293532877}
isValid: 1
validated: 0
- trueValue: 1
decision: {fileID: -1153213989563949640}
isValid: 1
validated: 0
- decisions: []
trueState: {fileID: -2487766245252807409}
falseState: {fileID: 0}
muteTrue: 0
@@ -409,14 +290,14 @@ MonoBehaviour:
parentState: {fileID: -5940605157849060294}
trueRect:
serializedVersion: 2
x: 885
y: 225
x: 1050
y: 15
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 885
y: 225
x: 1050
y: 15
width: 0
height: 0
selectedTrue: 0
@@ -553,11 +434,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 155
y: 195
x: 320
y: -15
width: 150
height: 30
positionRect: {x: 155, y: 195}
positionRect: {x: 320, y: -15}
rectWidth: 150
editingName: 1
nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1}
@@ -576,14 +457,14 @@ MonoBehaviour:
parentState: {fileID: -3177478727897100882}
trueRect:
serializedVersion: 2
x: 230
y: 210
x: 395
y: 0
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 230
y: 210
x: 395
y: 0
width: 0
height: 0
selectedTrue: 0
@@ -621,14 +502,14 @@ MonoBehaviour:
canEditName: 1
canEditColor: 1
isOpen: 0
isSelected: 0
isSelected: 1
nodeRect:
serializedVersion: 2
x: 155
y: 430
x: 320
y: 220
width: 150
height: 30
positionRect: {x: 155, y: 430}
positionRect: {x: 320, y: 220}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 0.05528426, a: 1}
@@ -651,14 +532,14 @@ MonoBehaviour:
parentState: {fileID: -3087414886854181027}
trueRect:
serializedVersion: 2
x: 230
y: 445
x: 395
y: 235
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 230
y: 445
x: 395
y: 235
width: 0
height: 0
selectedTrue: 0
@@ -683,14 +564,14 @@ MonoBehaviour:
parentState: {fileID: -3087414886854181027}
trueRect:
serializedVersion: 2
x: 230
y: 445
x: 395
y: 235
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 230
y: 445
x: 395
y: 235
width: 0
height: 0
selectedTrue: 0
@@ -715,14 +596,14 @@ MonoBehaviour:
parentState: {fileID: -3087414886854181027}
trueRect:
serializedVersion: 2
x: 230
y: 445
x: 395
y: 235
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 230
y: 445
x: 395
y: 235
width: 0
height: 0
selectedTrue: 0
@@ -785,11 +666,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 145
y: 310
x: 310
y: 100
width: 180
height: 30
positionRect: {x: 145, y: 310}
positionRect: {x: 310, y: 100}
rectWidth: 180
editingName: 1
nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1}
@@ -816,14 +697,14 @@ MonoBehaviour:
parentState: {fileID: -2904979146780567904}
trueRect:
serializedVersion: 2
x: 235
y: 325
x: 400
y: 115
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 235
y: 325
x: 400
y: 115
width: 0
height: 0
selectedTrue: 0
@@ -834,11 +715,7 @@ MonoBehaviour:
isOpen: 0
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
- decisions:
- trueValue: 1
decision: {fileID: -7465732019226277435}
isValid: 1
validated: 0
- decisions: []
trueState: {fileID: 0}
falseState: {fileID: 0}
muteTrue: 0
@@ -848,14 +725,14 @@ MonoBehaviour:
parentState: {fileID: -2904979146780567904}
trueRect:
serializedVersion: 2
x: 235
y: 325
x: 400
y: 115
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 235
y: 325
x: 400
y: 115
width: 0
height: 0
selectedTrue: 0
@@ -897,11 +774,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 830
y: 130
x: 995
y: -70
width: 150
height: 30
positionRect: {x: 830, y: 130}
positionRect: {x: 995, y: -70}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -920,14 +797,14 @@ MonoBehaviour:
parentState: {fileID: -2487766245252807409}
trueRect:
serializedVersion: 2
x: 905
y: 145
x: 1070
y: -55
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 905
y: 145
x: 1070
y: -55
width: 0
height: 0
selectedTrue: 0
@@ -960,6 +837,7 @@ MonoBehaviour:
executionType: 1
editingName: 0
useStrafeMovement: 0
updateRotationInStrafe: 0
speed: 1
--- !u!114 &-2316234088715192456
MonoBehaviour:
@@ -1014,11 +892,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 585
y: 210
x: 740
y: -5
width: 150
height: 30
positionRect: {x: 585, y: 210}
positionRect: {x: 740, y: -5}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1037,14 +915,14 @@ MonoBehaviour:
parentState: {fileID: -1839963680886773275}
trueRect:
serializedVersion: 2
x: 660
y: 225
x: 815
y: 10
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 660
y: 225
x: 815
y: 10
width: 0
height: 0
selectedTrue: 0
@@ -1161,7 +1039,7 @@ MonoBehaviour:
editingName: 0
setSignedAngle: 1
dampTime: 0
parameterName: TurnOnSpotDir
parameterName: TurnOnSpotDirection
--- !u!114 &-712571192746352845
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1185,11 +1063,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 155
y: 140
x: 320
y: -70
width: 150
height: 30
positionRect: {x: 155, y: 140}
positionRect: {x: 320, y: -70}
rectWidth: 150
editingName: 0
nodeColor: {r: 0, g: 1, b: 0, a: 1}
@@ -1220,6 +1098,8 @@ MonoBehaviour:
editingName: 0
debugMode: 0
patrolSpeed: 1
patrolInStrafe: 0
updateRotationInStrafe: 1
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1232,7 +1112,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
m_Name: FSM_Spider Boss
m_EditorClassIdentifier:
selectedNode: {fileID: -2487766245252807409}
selectedNode: {fileID: -3087414886854181027}
wantConnection: 0
connectionNode: {fileID: 0}
showProperties: 1
@@ -1244,12 +1124,11 @@ MonoBehaviour:
- {fileID: 8920381803127701203}
- {fileID: 3522127403913465562}
- {fileID: -3087414886854181027}
- {fileID: -6987484206971833696}
- {fileID: 271125091381381572}
- {fileID: -1839963680886773275}
- {fileID: -5940605157849060294}
- {fileID: -2487766245252807409}
panOffset: {x: -200, y: 165}
panOffset: {x: -20, y: -45}
overNode: 0
actions:
- {fileID: 0}
@@ -1273,12 +1152,6 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
icon: {fileID: 0}
--- !u!114 &271125091381381572
MonoBehaviour:
@@ -1303,11 +1176,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 395
y: 550
x: 560
y: 340
width: 145
height: 30
positionRect: {x: 395, y: 550}
positionRect: {x: 560, y: 340}
rectWidth: 145
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1330,14 +1203,14 @@ MonoBehaviour:
parentState: {fileID: 271125091381381572}
trueRect:
serializedVersion: 2
x: 467.5
y: 565
x: 632.5
y: 355
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 467.5
y: 565
x: 632.5
y: 355
width: 0
height: 0
selectedTrue: 0
@@ -1362,14 +1235,14 @@ MonoBehaviour:
parentState: {fileID: 271125091381381572}
trueRect:
serializedVersion: 2
x: 467.5
y: 565
x: 632.5
y: 355
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 467.5
y: 565
x: 632.5
y: 355
width: 0
height: 0
selectedTrue: 0
@@ -1390,14 +1263,14 @@ MonoBehaviour:
parentState: {fileID: 271125091381381572}
trueRect:
serializedVersion: 2
x: 467.5
y: 565
x: 632.5
y: 355
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 467.5
y: 565
x: 632.5
y: 355
width: 0
height: 0
selectedTrue: 0
@@ -1411,7 +1284,6 @@ MonoBehaviour:
actions:
- {fileID: 7387870274225354479}
- {fileID: -5102987269989112679}
- {fileID: 0}
useActions: 1
useDecisions: 1
parentGraph: {fileID: 11400000}
@@ -1526,11 +1398,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 385
y: 440
x: 550
y: 230
width: 150
height: 30
positionRect: {x: 385, y: 440}
positionRect: {x: 550, y: 230}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0.8700229, b: 0, a: 1}
@@ -1553,14 +1425,14 @@ MonoBehaviour:
parentState: {fileID: 3522127403913465562}
trueRect:
serializedVersion: 2
x: 460
y: 455
x: 625
y: 245
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 460
y: 455
x: 625
y: 245
width: 0
height: 0
selectedTrue: 0
@@ -1585,14 +1457,14 @@ MonoBehaviour:
parentState: {fileID: 3522127403913465562}
trueRect:
serializedVersion: 2
x: 460
y: 455
x: 625
y: 245
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 460
y: 455
x: 625
y: 245
width: 0
height: 0
selectedTrue: 0
@@ -1608,7 +1480,7 @@ MonoBehaviour:
decision: {fileID: 1614817502384238172}
isValid: 0
validated: 0
trueState: {fileID: -6987484206971833696}
trueState: {fileID: 0}
falseState: {fileID: 0}
muteTrue: 0
muteFalse: 0
@@ -1617,14 +1489,14 @@ MonoBehaviour:
parentState: {fileID: 3522127403913465562}
trueRect:
serializedVersion: 2
x: 460
y: 455
x: 625
y: 245
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 460
y: 455
x: 625
y: 245
width: 0
height: 0
selectedTrue: 0
@@ -1653,14 +1525,14 @@ MonoBehaviour:
parentState: {fileID: 3522127403913465562}
trueRect:
serializedVersion: 2
x: 460
y: 455
x: 625
y: 245
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 460
y: 455
x: 625
y: 245
width: 0
height: 0
selectedTrue: 0
@@ -1893,11 +1765,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 365
y: 305
x: 525
y: 95
width: 150
height: 30
positionRect: {x: 365, y: 305}
positionRect: {x: 525, y: 95}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 0.07041359, a: 1}
@@ -1907,10 +1779,6 @@ MonoBehaviour:
resetCurrentDestination: 1
transitions:
- decisions:
- trueValue: 1
decision: {fileID: -7465732019226277435}
isValid: 1
validated: 0
- trueValue: 0
decision: {fileID: 4309174516795352292}
isValid: 0
@@ -1924,14 +1792,14 @@ MonoBehaviour:
parentState: {fileID: 8920381803127701203}
trueRect:
serializedVersion: 2
x: 440
y: 320
x: 600
y: 110
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 440
y: 320
x: 600
y: 110
width: 0
height: 0
selectedTrue: 0
@@ -1943,10 +1811,6 @@ MonoBehaviour:
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
- decisions:
- trueValue: 1
decision: {fileID: -7465732019226277435}
isValid: 1
validated: 0
- trueValue: 1
decision: {fileID: 4309174516795352292}
isValid: 1
@@ -1960,14 +1824,14 @@ MonoBehaviour:
parentState: {fileID: 8920381803127701203}
trueRect:
serializedVersion: 2
x: 440
y: 320
x: 600
y: 110
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 440
y: 320
x: 600
y: 110
width: 0
height: 0
selectedTrue: 0