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

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

Browse Source
This commit is contained in:
marcin
2025-03-26 14:24:52 +01:00
parent e8d15453be
commit 38b5abd77a
12 changed files with 1860 additions and 1749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/AI/Dog/Others/Invector@MeleeCombat Generic DemonDog2 RM 2.1.controller
View File

@@ -16605,9 +16605,6 @@ AnimatorStateMachine:
- serializedVersion: 1
m_StateMachine: {fileID: 1107872661057384810}
m_Position: {x: -290, y: -170, z: 0}
- serializedVersion: 1
m_StateMachine: {fileID: -4947139199215860103}
m_Position: {x: 0, y: 0, z: 0}
- serializedVersion: 1
m_StateMachine: {fileID: 493505427603169778}
m_Position: {x: 0, y: 0, z: 0}
@@ -20974,13 +20971,18 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -2333760002916662957}
m_Position: {x: 290, y: 110, z: 0}
m_ChildStateMachines: []
m_ChildStateMachines:
- serializedVersion: 1
m_StateMachine: {fileID: -4947139199215860103}
m_Position: {x: 0, y: 50, z: 0}
m_AnyStateTransitions: []
m_EntryTransitions:
- {fileID: -5010378082669446064}
m_StateMachineTransitions:
- first: {fileID: 0}
second: []
- first: {fileID: -4947139199215860103}
second: []
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 48, y: 168, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}

241
Assets/AI/FSM/FSM_Dog2 Attack 1.0.asset
View File

@@ -71,11 +71,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 260
y: 260
x: 310
y: 215
width: 150
height: 30
positionRect: {x: 260, y: 260}
positionRect: {x: 310, y: 215}
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: 335
y: 275
x: 385
y: 230
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 335
y: 275
x: 385
y: 230
width: 0
height: 0
selectedTrue: 0
@@ -167,11 +167,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 485
y: 240
x: 535
y: 195
width: 150
height: 30
positionRect: {x: 485, y: 240}
positionRect: {x: 535, y: 195}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -198,14 +198,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 560
y: 255
x: 610
y: 210
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 560
y: 255
x: 610
y: 210
width: 0
height: 0
selectedTrue: 0
@@ -230,14 +230,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 560
y: 255
x: 610
y: 210
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 560
y: 255
x: 610
y: 210
width: 0
height: 0
selectedTrue: 0
@@ -266,14 +266,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 560
y: 255
x: 610
y: 210
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 560
y: 255
x: 610
y: 210
width: 0
height: 0
selectedTrue: 0
@@ -314,11 +314,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 355
y: 550
x: 405
y: 505
width: 185
height: 30
positionRect: {x: 355, y: 550}
positionRect: {x: 405, y: 505}
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: 447.5
y: 565
x: 497.5
y: 520
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 447.5
y: 565
x: 497.5
y: 520
width: 0
height: 0
selectedTrue: 0
@@ -382,14 +382,14 @@ MonoBehaviour:
canEditName: 1
canEditColor: 1
isOpen: 0
isSelected: 0
isSelected: 1
nodeRect:
serializedVersion: 2
x: 775
y: 550
x: 825
y: 505
width: 205
height: 30
positionRect: {x: 775, y: 550}
positionRect: {x: 825, y: 505}
rectWidth: 205
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -398,11 +398,7 @@ MonoBehaviour:
inDrag: 0
resetCurrentDestination: 1
transitions:
- decisions:
- trueValue: 0
decision: {fileID: 4688631099215210201}
isValid: 1
validated: 0
- decisions: []
trueState: {fileID: 2986668563461644515}
falseState: {fileID: 0}
muteTrue: 0
@@ -412,14 +408,14 @@ MonoBehaviour:
parentState: {fileID: -4796202230079492937}
trueRect:
serializedVersion: 2
x: 877.5
y: 565
x: 927.5
y: 520
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 877.5
y: 565
x: 927.5
y: 520
width: 0
height: 0
selectedTrue: 0
@@ -430,11 +426,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
@@ -444,14 +436,14 @@ MonoBehaviour:
parentState: {fileID: -4796202230079492937}
trueRect:
serializedVersion: 2
x: 877.5
y: 565
x: 927.5
y: 520
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 877.5
y: 565
x: 927.5
y: 520
width: 0
height: 0
selectedTrue: 0
@@ -537,11 +529,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 480
y: 160
x: 530
y: 115
width: 150
height: 30
positionRect: {x: 480, y: 160}
positionRect: {x: 530, y: 115}
rectWidth: 150
editingName: 1
nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1}
@@ -560,14 +552,14 @@ MonoBehaviour:
parentState: {fileID: -3177478727897100882}
trueRect:
serializedVersion: 2
x: 555
y: 175
x: 605
y: 130
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 555
y: 175
x: 605
y: 130
width: 0
height: 0
selectedTrue: 0
@@ -607,11 +599,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 790
y: 230
x: 840
y: 185
width: 150
height: 30
positionRect: {x: 790, y: 230}
positionRect: {x: 840, y: 185}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1}
@@ -621,10 +613,6 @@ MonoBehaviour:
resetCurrentDestination: 0
transitions:
- decisions:
- trueValue: 1
decision: {fileID: -8891615738546387327}
isValid: 1
validated: 0
- trueValue: 0
decision: {fileID: 7927421991537792917}
isValid: 1
@@ -638,14 +626,14 @@ MonoBehaviour:
parentState: {fileID: -2904979146780567904}
trueRect:
serializedVersion: 2
x: 865
y: 245
x: 915
y: 200
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 865
y: 245
x: 915
y: 200
width: 0
height: 0
selectedTrue: 0
@@ -765,11 +753,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 680
y: 100
x: 730
y: 55
width: 150
height: 30
positionRect: {x: 680, y: 100}
positionRect: {x: 730, y: 55}
rectWidth: 150
editingName: 0
nodeColor: {r: 0, g: 1, b: 0, a: 1}
@@ -836,6 +824,8 @@ MonoBehaviour:
editingName: 0
debugMode: 0
patrolSpeed: 2
patrolInStrafe: 0
updateRotationInStrafe: 1
--- !u!114 &-312774025800194259
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -856,14 +846,14 @@ MonoBehaviour:
canEditName: 1
canEditColor: 1
isOpen: 0
isSelected: 1
isSelected: 0
nodeRect:
serializedVersion: 2
x: 485
y: 415
x: 535
y: 370
width: 150
height: 30
positionRect: {x: 485, y: 415}
positionRect: {x: 535, y: 370}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1}
@@ -890,14 +880,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
selectedTrue: 0
@@ -922,14 +912,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
selectedTrue: 0
@@ -962,14 +952,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
selectedTrue: 0
@@ -994,14 +984,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
selectedTrue: 0
@@ -1034,14 +1024,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 560
y: 430
x: 610
y: 385
width: 0
height: 0
selectedTrue: 0
@@ -1088,7 +1078,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
m_Name: FSM_Dog2 Attack 1.0
m_EditorClassIdentifier:
selectedNode: {fileID: -312774025800194259}
selectedNode: {fileID: -4796202230079492937}
wantConnection: 0
connectionNode: {fileID: 0}
showProperties: 1
@@ -1103,7 +1093,7 @@ MonoBehaviour:
- {fileID: 7097515675205929255}
- {fileID: -4796202230079492937}
- {fileID: -6141831253483727528}
panOffset: {x: 680, y: 100}
panOffset: {x: 730, y: 55}
overNode: 0
actions:
- {fileID: 0}
@@ -1129,9 +1119,6 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
icon: {fileID: 0}
--- !u!114 &117913083446138218
MonoBehaviour:
@@ -1235,11 +1222,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 790
y: 425
x: 840
y: 380
width: 150
height: 30
positionRect: {x: 790, y: 425}
positionRect: {x: 840, y: 380}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1262,14 +1249,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 865
y: 440
x: 915
y: 395
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 865
y: 440
x: 915
y: 395
width: 0
height: 0
selectedTrue: 0
@@ -1294,14 +1281,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 865
y: 440
x: 915
y: 395
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 865
y: 440
x: 915
y: 395
width: 0
height: 0
selectedTrue: 0
@@ -1312,11 +1299,7 @@ MonoBehaviour:
isOpen: 0
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
- decisions:
- trueValue: 1
decision: {fileID: 4688631099215210201}
isValid: 0
validated: 0
- decisions: []
trueState: {fileID: -4796202230079492937}
falseState: {fileID: 0}
muteTrue: 0
@@ -1326,14 +1309,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 865
y: 440
x: 915
y: 395
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 865
y: 440
x: 915
y: 395
width: 0
height: 0
selectedTrue: 0
@@ -1493,6 +1476,7 @@ MonoBehaviour:
editingName: 0
_animationState: Idle_aggressive _2
_layer: 0
crossfade: 0.2
--- !u!114 &7097515675205929255
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1516,11 +1500,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 260
y: 420
x: 310
y: 375
width: 150
height: 30
positionRect: {x: 260, y: 420}
positionRect: {x: 310, y: 375}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1539,14 +1523,14 @@ MonoBehaviour:
parentState: {fileID: 7097515675205929255}
trueRect:
serializedVersion: 2
x: 335
y: 435
x: 385
y: 390
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 335
y: 435
x: 385
y: 390
width: 0
height: 0
selectedTrue: 0
@@ -1629,6 +1613,7 @@ MonoBehaviour:
executionType: 1
editingName: 0
useStrafeMovement: 0
updateRotationInStrafe: 0
speed: 2
--- !u!114 &8953018458060020886
MonoBehaviour:

292
Assets/AI/FSM/FSM_Dog2 Attack 1.1.asset
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:

249
Assets/AI/FSM/FSM_Dog2 Attack 1.2.asset
View File

@@ -71,11 +71,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: -105
y: 310
x: 495
y: 245
width: 150
height: 30
positionRect: {x: -105, y: 310}
positionRect: {x: 495, y: 245}
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: -30
y: 325
x: 570
y: 260
width: 0
height: 0
falseRect:
serializedVersion: 2
x: -30
y: 325
x: 570
y: 260
width: 0
height: 0
selectedTrue: 0
@@ -157,21 +157,21 @@ MonoBehaviour:
m_Name: Chase
m_EditorClassIdentifier:
description: FSM State
selectedDecisionIndex: 0
selectedDecisionIndex: 2
canRemove: 1
canTranstTo: 1
canSetAsDefault: 1
canEditName: 1
canEditColor: 1
isOpen: 0
isSelected: 0
isSelected: 1
nodeRect:
serializedVersion: 2
x: 115
y: 290
x: 715
y: 225
width: 150
height: 30
positionRect: {x: 115, y: 290}
positionRect: {x: 715, y: 225}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -198,14 +198,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 190
y: 305
x: 790
y: 240
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 190
y: 305
x: 790
y: 240
width: 0
height: 0
selectedTrue: 0
@@ -230,14 +230,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 190
y: 305
x: 790
y: 240
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 190
y: 305
x: 790
y: 240
width: 0
height: 0
selectedTrue: 0
@@ -266,18 +266,18 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: 190
y: 305
x: 790
y: 240
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 190
y: 305
x: 790
y: 240
width: 0
height: 0
selectedTrue: 0
selectedFalse: 0
selectedTrue: 1
selectedFalse: 1
trueSideRight: 0
falseSideRight: 0
decisionEditor: {fileID: 0}
@@ -314,11 +314,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: -10
y: 600
x: 590
y: 535
width: 185
height: 30
positionRect: {x: -10, y: 600}
positionRect: {x: 590, y: 535}
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: 82.5
y: 615
x: 682.5
y: 550
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 82.5
y: 615
x: 682.5
y: 550
width: 0
height: 0
selectedTrue: 0
@@ -382,14 +382,14 @@ MonoBehaviour:
canEditName: 1
canEditColor: 1
isOpen: 1
isSelected: 1
isSelected: 0
nodeRect:
serializedVersion: 2
x: 380
y: 650
x: 980
y: 600
width: 205
height: 84
positionRect: {x: 380, y: 650}
positionRect: {x: 980, y: 600}
rectWidth: 205
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -398,11 +398,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
@@ -412,14 +408,14 @@ MonoBehaviour:
parentState: {fileID: -4796202230079492937}
trueRect:
serializedVersion: 2
x: 585
y: 680
x: 1185
y: 630
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 585
y: 690
x: 1185
y: 640
width: 10
height: 10
selectedTrue: 0
@@ -430,11 +426,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
@@ -444,14 +436,14 @@ MonoBehaviour:
parentState: {fileID: -4796202230079492937}
trueRect:
serializedVersion: 2
x: 370
y: 702
x: 970
y: 652
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 585
y: 712
x: 1185
y: 662
width: 10
height: 10
selectedTrue: 0
@@ -538,11 +530,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 110
y: 210
x: 710
y: 145
width: 150
height: 30
positionRect: {x: 110, y: 210}
positionRect: {x: 710, y: 145}
rectWidth: 150
editingName: 1
nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1}
@@ -561,14 +553,14 @@ MonoBehaviour:
parentState: {fileID: -3177478727897100882}
trueRect:
serializedVersion: 2
x: 185
y: 225
x: 785
y: 160
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 185
y: 225
x: 785
y: 160
width: 0
height: 0
selectedTrue: 0
@@ -608,11 +600,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 420
y: 280
x: 1020
y: 215
width: 150
height: 30
positionRect: {x: 420, y: 280}
positionRect: {x: 1020, y: 215}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1}
@@ -622,10 +614,6 @@ MonoBehaviour:
resetCurrentDestination: 0
transitions:
- decisions:
- trueValue: 1
decision: {fileID: -8891615738546387327}
isValid: 1
validated: 0
- trueValue: 0
decision: {fileID: 7927421991537792917}
isValid: 1
@@ -639,14 +627,14 @@ MonoBehaviour:
parentState: {fileID: -2904979146780567904}
trueRect:
serializedVersion: 2
x: 495
y: 295
x: 1095
y: 230
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 495
y: 295
x: 1095
y: 230
width: 0
height: 0
selectedTrue: 0
@@ -766,11 +754,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 310
y: 150
x: 910
y: 85
width: 150
height: 30
positionRect: {x: 310, y: 150}
positionRect: {x: 910, y: 85}
rectWidth: 150
editingName: 0
nodeColor: {r: 0, g: 1, b: 0, a: 1}
@@ -837,6 +825,8 @@ MonoBehaviour:
editingName: 0
debugMode: 0
patrolSpeed: 2
patrolInStrafe: 0
updateRotationInStrafe: 1
--- !u!114 &-312774025800194259
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -860,11 +850,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 115
y: 465
x: 715
y: 400
width: 150
height: 30
positionRect: {x: 115, y: 465}
positionRect: {x: 715, y: 400}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1}
@@ -891,14 +881,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
selectedTrue: 0
@@ -923,14 +913,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
selectedTrue: 0
@@ -963,14 +953,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
selectedTrue: 0
@@ -995,14 +985,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
selectedTrue: 0
@@ -1035,14 +1025,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 190
y: 480
x: 790
y: 415
width: 0
height: 0
selectedTrue: 0
@@ -1089,7 +1079,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
m_Name: FSM_Dog2 Attack 1.2
m_EditorClassIdentifier:
selectedNode: {fileID: -4796202230079492937}
selectedNode: {fileID: -6144582714324757854}
wantConnection: 0
connectionNode: {fileID: 0}
showProperties: 1
@@ -1104,7 +1094,7 @@ MonoBehaviour:
- {fileID: 7097515675205929255}
- {fileID: -4796202230079492937}
- {fileID: -6141831253483727528}
panOffset: {x: 310, y: 150}
panOffset: {x: 335, y: 135}
overNode: 0
actions:
- {fileID: 0}
@@ -1130,9 +1120,6 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
icon: {fileID: 0}
--- !u!114 &117913083446138218
MonoBehaviour:
@@ -1236,11 +1223,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 420
y: 475
x: 1055
y: 390
width: 150
height: 106
positionRect: {x: 420, y: 475}
positionRect: {x: 1055, y: 390}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1263,19 +1250,19 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 570
y: 505
x: 1045
y: 420
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 570
y: 515
x: 1205
y: 430
width: 10
height: 10
selectedTrue: 0
selectedFalse: 0
trueSideRight: 1
trueSideRight: 0
falseSideRight: 1
decisionEditor: {fileID: 0}
isOpen: 0
@@ -1295,14 +1282,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 410
y: 527
x: 1045
y: 442
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 570
y: 537
x: 1205
y: 452
width: 10
height: 10
selectedTrue: 0
@@ -1313,11 +1300,7 @@ MonoBehaviour:
isOpen: 0
scroolView: {x: 0, y: 0, z: 0}
sameTargetCount: 0
- decisions:
- trueValue: 1
decision: {fileID: 4688631099215210201}
isValid: 0
validated: 0
- decisions: []
trueState: {fileID: -4796202230079492937}
falseState: {fileID: 0}
muteTrue: 0
@@ -1327,14 +1310,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 410
y: 549
x: 1045
y: 464
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 570
y: 559
x: 1205
y: 474
width: 10
height: 10
selectedTrue: 0
@@ -1494,6 +1477,7 @@ MonoBehaviour:
editingName: 0
_animationState: Idle_aggressive _2
_layer: 0
crossfade: 0.2
--- !u!114 &7097515675205929255
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1517,11 +1501,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: -105
y: 470
x: 495
y: 405
width: 150
height: 30
positionRect: {x: -105, y: 470}
positionRect: {x: 495, y: 405}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1540,14 +1524,14 @@ MonoBehaviour:
parentState: {fileID: 7097515675205929255}
trueRect:
serializedVersion: 2
x: -30
y: 485
x: 570
y: 420
width: 0
height: 0
falseRect:
serializedVersion: 2
x: -30
y: 485
x: 570
y: 420
width: 0
height: 0
selectedTrue: 0
@@ -1630,6 +1614,7 @@ MonoBehaviour:
executionType: 1
editingName: 0
useStrafeMovement: 0
updateRotationInStrafe: 0
speed: 2
--- !u!114 &8953018458060020886
MonoBehaviour:

9
Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat
View File

@@ -16,11 +16,10 @@ Material:
- USEDISSOLVE_WITH_ALPHA_CUTOUT
- USEFRESNEL
- _ALPHATEST_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords:
- _RECEIVE_SHADOWS_OFF
- _SPECULAR_SETUP
- _USEDISSOLVE_WITHOUT_ALPHA_CUTOUT
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@@ -125,7 +124,7 @@ Material:
- USEDISSOLVEMASK: 0
- USEFRESNEL: 1
- Vector1_473704f964214ae2bc68475022d1524b: 0.0432
- _AOStrength: 1.1
- _AOStrength: 0.44
- _AlphaClip: 1
- _AlphaClipThreshold: 0.51
- _AlphaToMask: 0
@@ -164,7 +163,7 @@ Material:
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 0
- _Smoothness: 2.27
- _Smoothness: 0.17
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5

1567
Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Scripts/Skills/TreeSpotController.cs
View File

@@ -420,6 +420,8 @@ namespace Beyond
public void ValidateRequiredItemsToPlant(GameObject gameObject = null)
{
if (GameStateManager.Instance.CurrentState != GameStateManager.State.NORMAL)
return;
if (currentTreeState != TreeState.Empty)
{
infoTextObject.SetActive(false);
@@ -462,6 +464,8 @@ namespace Beyond
public void ValidateRequiredItemToSpeedGrow(GameObject gameObject = null)
{
if (GameStateManager.Instance.CurrentState != GameStateManager.State.NORMAL)
return;
if (currentTreeState == TreeState.FullyGrown)
{
ResetInteractionButtonImage();

22
Assets/Scripts/Tutorial/FinishTreeGrowthStep.cs
View File

@@ -4,17 +4,17 @@ namespace Beyond
{
public class FinishTreeGrowthStep : MonoBehaviour
{
public BaseStepController baseStepController; // Odwołanie do BaseStepController
public TreeSpotController treeSpotController; // Odwołanie do kontrolera drzewa
public BaseStepController baseStepController; // Odwo<EFBFBD>anie do BaseStepController
public TreeSpotController treeSpotController; // Odwo<EFBFBD>anie do kontrolera drzewa
private bool isTreeFullyGrown = false; // Flaga wskazująca, czy drzewo jest w pełni wyrośnięte
private bool isTreeFullyGrown = false; // Flaga wskazuj<EFBFBD>ca, czy drzewo jest w pe<EFBFBD>ni wyro<EFBFBD>ni<EFBFBD>te
private void Start()
{
// Subskrybuje wydarzenie rozpoczęcia kroku tutoriala
// Subskrybuje wydarzenie rozpocz<EFBFBD>cia kroku tutoriala
baseStepController.OnStarted += OnStepStarted;
// Dodaje warunek do BaseStepController, który określa, czy krok może zostać zakończony
// Dodaje warunek do BaseStepController, kt<EFBFBD>ry okre<EFBFBD>la, czy krok mo<EFBFBD>e zosta<EFBFBD> zako<EFBFBD>czony
baseStepController.ConditionsAreMet += () => isTreeFullyGrown;
// Subskrybuje zdarzenie zmiany stanu drzewa
@@ -22,22 +22,26 @@ namespace Beyond
{
treeSpotController.onStateChanged.AddListener(OnTreeStateChanged);
}
}
private void OnStepStarted()
{
// Ustawiamy flagę na false przy rozpoczęciu kroku
// Ustawiamy flag<EFBFBD> na false przy rozpocz<EFBFBD>ciu kroku
isTreeFullyGrown = false;
//replenish faith so we can grow tree for sure
PlayerAttribute faithAttribute = Player.Instance.GetAttribute("Faith");
faithAttribute.AttributeCurrentValue = faithAttribute.AttributeMaxValue;
}
private void OnTreeStateChanged(TreeState newState)
{
// Sprawdzamy, czy drzewo osiągnęło stan w pełni wyrośnięty
// Sprawdzamy, czy drzewo osi<EFBFBD>gn<EFBFBD>o stan w pe<EFBFBD>ni wyro<EFBFBD>ni<EFBFBD>ty
if (newState == TreeState.FullyGrown)
{
isTreeFullyGrown = true;
Debug.Log("Drzewo jest w pełni wyrośnięte. Zakończenie tutoriala.");
baseStepController.ForceStepFinished(); // Kończymy krok i wyłączamy tutorial
Debug.Log("Drzewo jest w pe<EFBFBD>ni wyro<EFBFBD>ni<EFBFBD>te. Zako<EFBFBD>czenie tutoriala.");
baseStepController.ForceStepFinished(); // Ko<EFBFBD>czymy krok i wy<EFBFBD><EFBFBD>czamy tutorial
}
}
}

4
Assets/Shaders/Dissolve.shadersubgraph
View File

@@ -6253,8 +6253,8 @@
"m_ObjectId": "e72492cea22443c78c24cffbda7b593f",
"m_Title": "EffectThreshold",
"m_Position": {
"x": -49.0,
"y": 828.0
"x": -48.99990463256836,
"y": 827.9999389648438
}
}

140
Assets/Shaders/DistortedSceneColor.shadersubgraph
View File

@@ -2,7 +2,11 @@
"m_SGVersion": 3,
"m_Type": "UnityEditor.ShaderGraph.GraphData",
"m_ObjectId": "aca365a9fdb4441f9ed6b193f8ca0927",
"m_Properties": [],
"m_Properties": [
{
"m_Id": "e0b98803c3ab49bc8789d6c9d3e3b3e7"
}
],
"m_Keywords": [],
"m_Dropdowns": [],
"m_CategoryData": [
@@ -43,6 +47,9 @@
},
{
"m_Id": "28959b94bca2490eac1c9770b3f1ff10"
},
{
"m_Id": "34171cda976e4c1e8e7415c5573b40dc"
}
],
"m_GroupDatas": [
@@ -108,6 +115,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "34171cda976e4c1e8e7415c5573b40dc"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "136791cd79de4f3f9f17e95eedfe5be3"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -164,20 +185,6 @@
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "a721560411ba476d99ad4c62f0278974"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "136791cd79de4f3f9f17e95eedfe5be3"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -512,6 +519,42 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
"m_ObjectId": "34171cda976e4c1e8e7415c5573b40dc",
"m_Group": {
"m_Id": "484016ef888d4dd7a1c939b5fbcaf0e5"
},
"m_Name": "Property",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -785.0001220703125,
"y": -551.0,
"width": 93.00006103515625,
"height": 34.0
}
},
"m_Slots": [
{
"m_Id": "7019169c6d68407282f8ee1d2da1532b"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Property": {
"m_Id": "e0b98803c3ab49bc8789d6c9d3e3b3e7"
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SceneColorNode",
@@ -590,8 +633,8 @@
"m_ObjectId": "484016ef888d4dd7a1c939b5fbcaf0e5",
"m_Title": "Distortion",
"m_Position": {
"x": -999.0000610351563,
"y": -576.0
"x": -1059.0001220703125,
"y": -627.0
}
}
@@ -929,6 +972,27 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
"m_ObjectId": "7019169c6d68407282f8ee1d2da1532b",
"m_Id": 0,
"m_DisplayName": "UV",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0
},
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -1073,7 +1137,11 @@
"m_Type": "UnityEditor.ShaderGraph.CategoryData",
"m_ObjectId": "8eba4991aca74b539cbc7946d2817edf",
"m_Name": "",
"m_ChildObjectList": []
"m_ChildObjectList": [
{
"m_Id": "e0b98803c3ab49bc8789d6c9d3e3b3e7"
}
]
}
{
@@ -1199,10 +1267,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -814.4000244140625,
"y": -496.39996337890627,
"width": 206.0001220703125,
"height": 130.5
"x": -1034.0001220703125,
"y": -568.0,
"width": 206.0,
"height": 130.00003051757813
}
},
"m_Slots": [
@@ -1354,6 +1422,34 @@
"m_HashType": 0
}
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty",
"m_ObjectId": "e0b98803c3ab49bc8789d6c9d3e3b3e7",
"m_Guid": {
"m_GuidSerialized": "38444e1c-e234-43cb-acc2-89b360bb48ed"
},
"m_Name": "UV",
"m_DefaultRefNameVersion": 1,
"m_RefNameGeneratedByDisplayName": "UV",
"m_DefaultReferenceName": "_UV",
"m_OverrideReferenceName": "",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_DismissedVersion": 0,
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
"m_Hidden": false,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",

3
Assets/Shaders/InvisibleMat.mat
View File

@@ -15,6 +15,7 @@ Material:
m_ValidKeywords:
- USEDISSOLVE_WITHOUT_ALPHA_CUTOUT
- USEFRESNEL
- _ALPHAPREMULTIPLY_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords:
- _USEDISSOLVE_WITHOUT_ALPHA_CUTOUT
@@ -138,7 +139,7 @@ Material:
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _SrcBlend: 1
- _Surface: 1
- _Threshold: 0
- _USEDISSOLVE: 1

1068
Assets/Shaders/InvisibleMat.shadergraph
View File

File diff suppressed because it is too large Load Diff