fixed tree tutorial - when fighting, when not enough faith, removed old chest, fixed dogs AI - now chasing player, improved shader

This commit is contained in:
2025-03-26 14:24:52 +01:00
parent e8d15453be
commit 38b5abd77a
12 changed files with 1860 additions and 1749 deletions

View File

@@ -71,11 +71,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 95
y: 280
x: 340
y: 155
width: 150
height: 30
positionRect: {x: 95, y: 280}
positionRect: {x: 340, y: 155}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 1, a: 1}
@@ -102,14 +102,14 @@ MonoBehaviour:
parentState: {fileID: -6568372008305276654}
trueRect:
serializedVersion: 2
x: 170
y: 295
x: 415
y: 170
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 170
y: 295
x: 415
y: 170
width: 0
height: 0
selectedTrue: 0
@@ -167,11 +167,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 270
y: 260
x: 515
y: 135
width: 150
height: 30
positionRect: {x: 270, y: 260}
positionRect: {x: 515, y: 135}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -183,11 +183,11 @@ MonoBehaviour:
- decisions:
- trueValue: 1
decision: {fileID: 7927421991537792917}
isValid: 0
isValid: 1
validated: 0
- trueValue: 1
decision: {fileID: -1886887719286938116}
isValid: 0
isValid: 1
validated: 0
trueState: {fileID: -2904979146780567904}
falseState: {fileID: 0}
@@ -198,14 +198,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 345
y: 275
x: 590
y: 150
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 345
y: 275
x: 590
y: 150
width: 0
height: 0
selectedTrue: 0
@@ -219,7 +219,7 @@ MonoBehaviour:
- decisions:
- trueValue: 0
decision: {fileID: -3690511210373239573}
isValid: 0
isValid: 1
validated: 0
trueState: {fileID: -3177478727897100882}
falseState: {fileID: 0}
@@ -230,14 +230,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 345
y: 275
x: 590
y: 150
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 345
y: 275
x: 590
y: 150
width: 0
height: 0
selectedTrue: 0
@@ -251,7 +251,7 @@ MonoBehaviour:
- decisions:
- trueValue: 1
decision: {fileID: 4031404829621142413}
isValid: 1
isValid: 0
validated: 0
- trueValue: 1
decision: {fileID: -2866484833343459521}
@@ -266,14 +266,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 345
y: 275
x: 590
y: 150
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 345
y: 275
x: 590
y: 150
width: 0
height: 0
selectedTrue: 0
@@ -311,14 +311,14 @@ MonoBehaviour:
canEditName: 1
canEditColor: 1
isOpen: 1
isSelected: 1
isSelected: 0
nodeRect:
serializedVersion: 2
x: 165
y: 570
x: 410
y: 445
width: 185
height: 62
positionRect: {x: 165, y: 570}
positionRect: {x: 410, y: 445}
rectWidth: 185
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -337,14 +337,14 @@ MonoBehaviour:
parentState: {fileID: -6141831253483727528}
trueRect:
serializedVersion: 2
x: 350
y: 600
x: 595
y: 475
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 350
y: 610
x: 595
y: 485
width: 10
height: 10
selectedTrue: 0
@@ -431,11 +431,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 265
y: 180
x: 510
y: 55
width: 150
height: 30
positionRect: {x: 265, y: 180}
positionRect: {x: 510, y: 55}
rectWidth: 150
editingName: 1
nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1}
@@ -454,14 +454,14 @@ MonoBehaviour:
parentState: {fileID: -3177478727897100882}
trueRect:
serializedVersion: 2
x: 340
y: 195
x: 585
y: 70
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 340
y: 195
x: 585
y: 70
width: 0
height: 0
selectedTrue: 0
@@ -501,11 +501,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 575
y: 250
x: 820
y: 125
width: 150
height: 30
positionRect: {x: 575, y: 250}
positionRect: {x: 820, y: 125}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1}
@@ -515,10 +515,6 @@ MonoBehaviour:
resetCurrentDestination: 0
transitions:
- decisions:
- trueValue: 1
decision: {fileID: -8891615738546387327}
isValid: 0
validated: 0
- trueValue: 0
decision: {fileID: 7927421991537792917}
isValid: 1
@@ -532,14 +528,14 @@ MonoBehaviour:
parentState: {fileID: -2904979146780567904}
trueRect:
serializedVersion: 2
x: 650
y: 265
x: 895
y: 140
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 650
y: 265
x: 895
y: 140
width: 0
height: 0
selectedTrue: 0
@@ -659,11 +655,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 465
y: 130
x: 710
y: 10
width: 150
height: 30
positionRect: {x: 465, y: 130}
positionRect: {x: 710, y: 10}
rectWidth: 150
editingName: 0
nodeColor: {r: 0, g: 1, b: 0, a: 1}
@@ -730,6 +726,8 @@ MonoBehaviour:
editingName: 0
debugMode: 0
patrolSpeed: 2
patrolInStrafe: 0
updateRotationInStrafe: 1
--- !u!114 &-312774025800194259
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -753,11 +751,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 270
y: 435
x: 515
y: 310
width: 150
height: 30
positionRect: {x: 270, y: 435}
positionRect: {x: 515, y: 310}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1}
@@ -769,7 +767,7 @@ MonoBehaviour:
- decisions:
- trueValue: 1
decision: {fileID: 4031404829621142413}
isValid: 1
isValid: 0
validated: 0
- trueValue: 1
decision: {fileID: -2866484833343459521}
@@ -784,14 +782,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
selectedTrue: 0
@@ -805,7 +803,7 @@ MonoBehaviour:
- decisions:
- trueValue: 0
decision: {fileID: 4031404829621142413}
isValid: 0
isValid: 1
validated: 0
trueState: {fileID: -2904979146780567904}
falseState: {fileID: 0}
@@ -816,14 +814,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
selectedTrue: 0
@@ -837,7 +835,7 @@ MonoBehaviour:
- decisions:
- trueValue: 1
decision: {fileID: 4031404829621142413}
isValid: 1
isValid: 0
validated: 0
- trueValue: 0
decision: {fileID: -2866484833343459521}
@@ -845,7 +843,7 @@ MonoBehaviour:
validated: 0
- trueValue: 0
decision: {fileID: 7927421991537792917}
isValid: 1
isValid: 0
validated: 0
trueState: {fileID: -6144582714324757854}
falseState: {fileID: 0}
@@ -856,14 +854,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
selectedTrue: 0
@@ -877,7 +875,7 @@ MonoBehaviour:
- decisions:
- trueValue: 1
decision: {fileID: 7927421991537792917}
isValid: 0
isValid: 1
validated: 0
trueState: {fileID: -2904979146780567904}
falseState: {fileID: 0}
@@ -888,14 +886,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
selectedTrue: 0
@@ -909,7 +907,7 @@ MonoBehaviour:
- decisions:
- trueValue: 1
decision: {fileID: -3690511210373239573}
isValid: 1
isValid: 0
validated: 0
- trueValue: 0
decision: {fileID: -2866484833343459521}
@@ -928,14 +926,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 345
y: 450
x: 590
y: 325
width: 0
height: 0
selectedTrue: 0
@@ -986,6 +984,7 @@ MonoBehaviour:
executionType: 1
editingName: 0
useStrafeMovement: 0
updateRotationInStrafe: 0
speed: 1
--- !u!114 &11400000
MonoBehaviour:
@@ -999,7 +998,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
m_Name: FSM_Dog2 Attack 1.1
m_EditorClassIdentifier:
selectedNode: {fileID: -6141831253483727528}
selectedNode: {fileID: 2986668563461644515}
wantConnection: 0
connectionNode: {fileID: 0}
showProperties: 1
@@ -1014,7 +1013,7 @@ MonoBehaviour:
- {fileID: 7097515675205929255}
- {fileID: -6141831253483727528}
- {fileID: 4987615122861547138}
panOffset: {x: 350, y: 130}
panOffset: {x: 605, y: -40}
overNode: 0
actions:
- {fileID: 0}
@@ -1041,9 +1040,6 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
icon: {fileID: 0}
--- !u!114 &117913083446138218
MonoBehaviour:
@@ -1144,14 +1140,14 @@ MonoBehaviour:
canEditName: 1
canEditColor: 1
isOpen: 1
isSelected: 0
isSelected: 1
nodeRect:
serializedVersion: 2
x: 570
y: 445
x: 835
y: 325
width: 150
height: 128
positionRect: {x: 570, y: 445}
height: 106
positionRect: {x: 835, y: 325}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1174,19 +1170,19 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 720
y: 475
x: 825
y: 355
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 720
y: 485
x: 985
y: 365
width: 10
height: 10
selectedTrue: 0
selectedFalse: 0
trueSideRight: 1
trueSideRight: 0
falseSideRight: 1
decisionEditor: {fileID: 0}
isOpen: 0
@@ -1206,46 +1202,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 560
y: 497
x: 825
y: 377
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 720
y: 507
width: 10
height: 10
selectedTrue: 0
selectedFalse: 0
trueSideRight: 0
falseSideRight: 1
decisionEditor: {fileID: 0}
isOpen: 0
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
- decisions:
- trueValue: 1
decision: {fileID: 4688631099215210201}
isValid: 0
validated: 0
trueState: {fileID: 4987615122861547138}
falseState: {fileID: 0}
muteTrue: 0
muteFalse: 0
transitionType: 0
transitionDelay: 0
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 560
y: 519
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 720
y: 529
x: 985
y: 387
width: 10
height: 10
selectedTrue: 0
@@ -1266,14 +1230,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 560
y: 541
x: 825
y: 399
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 720
y: 551
x: 985
y: 409
width: 10
height: 10
selectedTrue: 0
@@ -1391,11 +1355,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 505
y: 710
x: 750
y: 585
width: 150
height: 84
positionRect: {x: 505, y: 710}
positionRect: {x: 750, y: 585}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1404,11 +1368,7 @@ MonoBehaviour:
inDrag: 0
resetCurrentDestination: 1
transitions:
- decisions:
- trueValue: 0
decision: {fileID: 4688631099215210201}
isValid: 0
validated: 0
- decisions: []
trueState: {fileID: 2986668563461644515}
falseState: {fileID: 0}
muteTrue: 0
@@ -1418,14 +1378,14 @@ MonoBehaviour:
parentState: {fileID: 4987615122861547138}
trueRect:
serializedVersion: 2
x: 655
y: 740
x: 900
y: 615
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 655
y: 750
x: 900
y: 625
width: 10
height: 10
selectedTrue: 0
@@ -1436,11 +1396,7 @@ MonoBehaviour:
isOpen: 0
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
- decisions:
- trueValue: 1
decision: {fileID: 1870585818667380970}
isValid: 0
validated: 0
- decisions: []
trueState: {fileID: -6141831253483727528}
falseState: {fileID: 0}
muteTrue: 0
@@ -1450,14 +1406,14 @@ MonoBehaviour:
parentState: {fileID: 4987615122861547138}
trueRect:
serializedVersion: 2
x: 495
y: 762
x: 740
y: 637
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 655
y: 772
x: 900
y: 647
width: 10
height: 10
selectedTrue: 0
@@ -1540,6 +1496,7 @@ MonoBehaviour:
editingName: 0
_animationState: Idle_aggressive _2
_layer: 0
crossfade: 0.2
--- !u!114 &7097515675205929255
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1563,11 +1520,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 95
y: 440
x: 340
y: 315
width: 150
height: 30
positionRect: {x: 95, y: 440}
positionRect: {x: 340, y: 315}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1586,14 +1543,14 @@ MonoBehaviour:
parentState: {fileID: 7097515675205929255}
trueRect:
serializedVersion: 2
x: 170
y: 455
x: 415
y: 330
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 170
y: 455
x: 415
y: 330
width: 0
height: 0
selectedTrue: 0
@@ -1676,6 +1633,7 @@ MonoBehaviour:
executionType: 1
editingName: 0
useStrafeMovement: 0
updateRotationInStrafe: 0
speed: 2
--- !u!114 &8953018458060020886
MonoBehaviour: