diff --git a/Assets/AI/Dog/Others/Invector@MeleeCombat Generic DemonDog2 RM 2.1.controller b/Assets/AI/Dog/Others/Invector@MeleeCombat Generic DemonDog2 RM 2.1.controller index 6b130f99a..04d05c0f5 100644 --- a/Assets/AI/Dog/Others/Invector@MeleeCombat Generic DemonDog2 RM 2.1.controller +++ b/Assets/AI/Dog/Others/Invector@MeleeCombat Generic DemonDog2 RM 2.1.controller @@ -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} diff --git a/Assets/AI/FSM/FSM_Dog2 Attack 1.0.asset b/Assets/AI/FSM/FSM_Dog2 Attack 1.0.asset index f1465a9b0..be340ecc1 100644 --- a/Assets/AI/FSM/FSM_Dog2 Attack 1.0.asset +++ b/Assets/AI/FSM/FSM_Dog2 Attack 1.0.asset @@ -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: diff --git a/Assets/AI/FSM/FSM_Dog2 Attack 1.1.asset b/Assets/AI/FSM/FSM_Dog2 Attack 1.1.asset index b22645b33..1df6e4744 100644 --- a/Assets/AI/FSM/FSM_Dog2 Attack 1.1.asset +++ b/Assets/AI/FSM/FSM_Dog2 Attack 1.1.asset @@ -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: diff --git a/Assets/AI/FSM/FSM_Dog2 Attack 1.2.asset b/Assets/AI/FSM/FSM_Dog2 Attack 1.2.asset index fb1da06d9..6c0338614 100644 --- a/Assets/AI/FSM/FSM_Dog2 Attack 1.2.asset +++ b/Assets/AI/FSM/FSM_Dog2 Attack 1.2.asset @@ -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: diff --git a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat index 90c01dc1e..416207ac6 100644 --- a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat +++ b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat @@ -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 diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index 82894674b..c173353d0 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -41355,7 +41355,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1882198780} - - {fileID: 339154568323727960} - {fileID: 1054165732} m_Father: {fileID: 1565036104} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -43284,70 +43283,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2035809048} m_PrefabAsset: {fileID: 0} ---- !u!21 &142904265 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!21 &143312393 Material: serializedVersion: 8 @@ -218864,39 +218799,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 960b704da69295a49a7f427c1cec32d0, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &814124110 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &814984841 PrefabInstance: m_ObjectHideFlags: 0 @@ -222779,137 +222681,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 839942632} m_PrefabAsset: {fileID: 0} ---- !u!1001 &840661832 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 339154568323727960} - m_Modifications: - - target: {fileID: 896829690368874941, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_Name - value: Trigger_text (1) - objectReference: {fileID: 0} - - target: {fileID: 896829690368874944, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_Volume - value: 0.513 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874944, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_PlayOnAwake - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalScale.x - value: 1.9575119 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalScale.y - value: 3.2831507 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalScale.z - value: 7.475565 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.09 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.07 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.6161616 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.08835937 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.7816516 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.03947628 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -2.704 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -5.141 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -10.777 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874947, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_key - value: Trigger_text1_91134 - objectReference: {fileID: 0} - - target: {fileID: 896829690368874947, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 896829690368874947, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - - target: {fileID: 896829690368874947, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_actionResponse.barkText - value: I knew there was more treasure! - objectReference: {fileID: 0} - - target: {fileID: 896829690368874947, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - propertyPath: m_actionResponse.audioClip - value: - objectReference: {fileID: 8300000, guid: e4b583b02f85fba44bd7cfa376755250, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 35aa077a8a3f28f4c80fdd5a6469c933, type: 3} ---- !u!1 &840661833 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 896829690368874941, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - m_PrefabInstance: {fileID: 840661832} - m_PrefabAsset: {fileID: 0} ---- !u!4 &840661838 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 896829690368874946, guid: 35aa077a8a3f28f4c80fdd5a6469c933, - type: 3} - m_PrefabInstance: {fileID: 840661832} - m_PrefabAsset: {fileID: 0} --- !u!1001 &841031134 PrefabInstance: m_ObjectHideFlags: 0 @@ -274121,171 +273892,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1040461753} m_PrefabAsset: {fileID: 0} ---- !u!43 &1040871337 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1041379245 PrefabInstance: m_ObjectHideFlags: 0 @@ -319035,6 +318641,70 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!21 &1199085623 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1199154122 GameObject: m_ObjectHideFlags: 0 @@ -368191,7 +367861,7 @@ PrefabInstance: type: 3} propertyPath: 'objectsToEnable.Array.data[0]' value: - objectReference: {fileID: 840661833} + objectReference: {fileID: 0} - target: {fileID: 7056881920808824410, guid: 1c273a80690e2224fa08113e83d3daaf, type: 3} propertyPath: m_RootOrder @@ -425623,7 +425293,7 @@ MonoBehaviour: - {fileID: 1493888865} - {fileID: 132977597} - {fileID: 1499737214} - - {fileID: 339154568323727962} + - {fileID: 0} --- !u!4 &1565518999 stripped Transform: m_CorrespondingSourceObject: {fileID: 6092136001238120400, guid: 249f153543576874e84df57b8bb314cd, @@ -463626,171 +463296,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!43 &1701792988 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1702261130 PrefabInstance: m_ObjectHideFlags: 0 @@ -463985,6 +463490,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1586805511} m_PrefabAsset: {fileID: 0} +--- !u!21 &1704178312 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!4 &1704670357 stripped Transform: m_CorrespondingSourceObject: {fileID: 7493040091443043539, guid: 5e5be0791a7b6714da0e091ecd45d36a, @@ -477194,6 +476732,171 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -6964573097935904079, guid: 160f0655a5466da4dab9b951199da54e, type: 3} +--- !u!43 &1762924512 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1762949644 PrefabInstance: m_ObjectHideFlags: 0 @@ -530096,6 +529799,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1957373113} m_PrefabAsset: {fileID: 0} +--- !u!43 &1957931920 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1958416937 PrefabInstance: m_ObjectHideFlags: 0 @@ -626127,579 +625995,6 @@ Transform: - {fileID: 3817957018098451416} m_Father: {fileID: 4757344657699792594} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &339154568323727959 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 132977598} - m_Modifications: - - target: {fileID: 339154567797184847, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_key - value: HiddenChest_139330 - objectReference: {fileID: 0} - - target: {fileID: 339154567797184847, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_addToCompass - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 339154567797184847, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_minCompassDistance - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 339154567797184847, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_removeFromCompassAfter - value: 999999 - objectReference: {fileID: 0} - - target: {fileID: 339154567797184847, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 339154567797184847, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - - target: {fileID: 1401154229547771643, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1401154229547771645, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_Name - value: HiddenChest - objectReference: {fileID: 0} - - target: {fileID: 1401154229547771645, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalPosition.x - value: 13.127 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.579 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.253 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.58141303 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.8136086 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 251.1 - objectReference: {fileID: 0} - - target: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2329883747405184251, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_Size.z - value: 0.51 - objectReference: {fileID: 0} - - target: {fileID: 2329883747405184251, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4850540336141243526, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_Size.x - value: 0.72 - objectReference: {fileID: 0} - - target: {fileID: 4850540336141243526, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_Size.y - value: 1.57 - objectReference: {fileID: 0} - - target: {fileID: 4850540336141243526, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_Size.z - value: 0.78 - objectReference: {fileID: 0} - - target: {fileID: 4850540336141243526, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_Center.y - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 4850540336141243526, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_Center.z - value: 0.24 - objectReference: {fileID: 0} - - target: {fileID: 4850540336141243526, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_IsTrigger - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4850540336141243530, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4850540336479714308, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6863911757721070017, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: HideObject - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: forwardAngle - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: selectedToolbar - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.size - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1565036105} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 1882198779} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_Mode - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[6].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SendToMessageSystem - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: StartSequence - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName - value: Play - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName - value: - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_Target - value: - objectReference: {fileID: 953075856} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_Target - value: - objectReference: {fileID: 1141881517} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[6].m_Target - value: - objectReference: {fileID: 339154568323727968} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[6].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName - value: RemoveFromCompass - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName - value: PlayBark - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[6].m_MethodName - value: Play - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: PixelCrushers.QuestMachine.QuestControl, Assembly-CSharp-firstpass - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: Beyond.EventSequencer, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName - value: UnityEngine.AudioSource, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName - value: Beyond.EventSequencer, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_IntArgument - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: Chest:Found - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName - value: Beyond.Scannable, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_TargetAssemblyTypeName - value: Beyond.BarkManager, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[6].m_TargetAssemblyTypeName - value: UnityEngine.AudioSource, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_IntArgument - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_BoolArgument - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_BoolArgument - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[6].m_Arguments.m_BoolArgument - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 7333626929303206760, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[6].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 1351446967519890138, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, type: 3} - - {fileID: 339154567797184847, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - insertIndex: -1 - addedObject: {fileID: 840661838} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4850540336141243530, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - insertIndex: -1 - addedObject: {fileID: 339154568323727968} - m_SourcePrefab: {fileID: 100100000, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, type: 3} ---- !u!4 &339154568323727960 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1745768233686498375, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - m_PrefabInstance: {fileID: 339154568323727959} - m_PrefabAsset: {fileID: 0} ---- !u!1 &339154568323727962 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4850540336141243530, guid: 3a82fbd46a1d14de9bb6fa15bb49bab0, - type: 3} - m_PrefabInstance: {fileID: 339154568323727959} - m_PrefabAsset: {fileID: 0} ---- !u!82 &339154568323727968 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 339154568323727962} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 19602d8d57ba86d40a3550e60ca18da6, type: 3} - m_Resource: {fileID: 8300000, guid: 19602d8d57ba86d40a3550e60ca18da6, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1 &339168547055086257 GameObject: m_ObjectHideFlags: 0 @@ -632057,7 +631352,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 814124110} + - {fileID: 1704178312} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -632150,7 +631445,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 142904265} + overrideMaterial: {fileID: 1199085623} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 diff --git a/Assets/Scripts/Skills/TreeSpotController.cs b/Assets/Scripts/Skills/TreeSpotController.cs index 1e8524c83..a51a171ba 100644 --- a/Assets/Scripts/Skills/TreeSpotController.cs +++ b/Assets/Scripts/Skills/TreeSpotController.cs @@ -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(); diff --git a/Assets/Scripts/Tutorial/FinishTreeGrowthStep.cs b/Assets/Scripts/Tutorial/FinishTreeGrowthStep.cs index 7859cc173..9ea0d2ce5 100644 --- a/Assets/Scripts/Tutorial/FinishTreeGrowthStep.cs +++ b/Assets/Scripts/Tutorial/FinishTreeGrowthStep.cs @@ -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ďż˝anie do BaseStepController + public TreeSpotController treeSpotController; // Odwoďż˝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ďż˝ca, czy drzewo jest w peďż˝ni wyroďż˝niďż˝te private void Start() { - // Subskrybuje wydarzenie rozpoczęcia kroku tutoriala + // Subskrybuje wydarzenie rozpoczďż˝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ďż˝ry okreďż˝la, czy krok moďż˝e zostaďż˝ zakoďż˝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ďż˝ na false przy rozpoczďż˝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ďż˝gnďż˝o stan w peďż˝ni wyroďż˝niďż˝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ďż˝ni wyroďż˝niďż˝te. Zakoďż˝czenie tutoriala."); + baseStepController.ForceStepFinished(); // Koďż˝czymy krok i wy��czamy tutorial } } } diff --git a/Assets/Shaders/Dissolve.shadersubgraph b/Assets/Shaders/Dissolve.shadersubgraph index 4ec6aeb83..0b265f1dc 100644 --- a/Assets/Shaders/Dissolve.shadersubgraph +++ b/Assets/Shaders/Dissolve.shadersubgraph @@ -6253,8 +6253,8 @@ "m_ObjectId": "e72492cea22443c78c24cffbda7b593f", "m_Title": "EffectThreshold", "m_Position": { - "x": -49.0, - "y": 828.0 + "x": -48.99990463256836, + "y": 827.9999389648438 } } diff --git a/Assets/Shaders/DistortedSceneColor.shadersubgraph b/Assets/Shaders/DistortedSceneColor.shadersubgraph index dd86b8945..66d7cc95a 100644 --- a/Assets/Shaders/DistortedSceneColor.shadersubgraph +++ b/Assets/Shaders/DistortedSceneColor.shadersubgraph @@ -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", diff --git a/Assets/Shaders/InvisibleMat.mat b/Assets/Shaders/InvisibleMat.mat index 2dbc9fae9..eb0775290 100644 --- a/Assets/Shaders/InvisibleMat.mat +++ b/Assets/Shaders/InvisibleMat.mat @@ -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 diff --git a/Assets/Shaders/InvisibleMat.shadergraph b/Assets/Shaders/InvisibleMat.shadergraph index bbe8a6a78..878e32c47 100644 --- a/Assets/Shaders/InvisibleMat.shadergraph +++ b/Assets/Shaders/InvisibleMat.shadergraph @@ -157,9 +157,6 @@ { "m_Id": "bfb3ca936a034a6aa04c64af6b94f1e9" }, - { - "m_Id": "9057ed5a265e40638b3baa6fd2bfae9c" - }, { "m_Id": "3659e7bc940641a08391e651f4de4be0" }, @@ -225,6 +222,33 @@ }, { "m_Id": "89e6757f6e704d9d8685e0aca8e0b0c6" + }, + { + "m_Id": "607a1f532e464308bd6fed2cc5947fef" + }, + { + "m_Id": "90a485a0f09548c59d26108e3a7d3a41" + }, + { + "m_Id": "94d5bda0d37b41fe8a4a0b562977b893" + }, + { + "m_Id": "ff4af4446fba43bf8ba6c1858338092c" + }, + { + "m_Id": "21fe65bd650c4537a977efd13ddc5815" + }, + { + "m_Id": "d46fa3c867314c4a9d1fac40b9624cca" + }, + { + "m_Id": "0143da3e88b24a5c95985d46590e6e55" + }, + { + "m_Id": "3a14a5890e924dc9a8d17a7673dc642c" + }, + { + "m_Id": "63f14804946644c09c879a6422af48a4" } ], "m_GroupDatas": [ @@ -313,7 +337,21 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "9057ed5a265e40638b3baa6fd2bfae9c" + "m_Id": "ff4af4446fba43bf8ba6c1858338092c" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "18533a0be3f14afab4472718809677ca" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3a14a5890e924dc9a8d17a7673dc642c" }, "m_SlotId": 0 } @@ -327,7 +365,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "89e6757f6e704d9d8685e0aca8e0b0c6" + "m_Id": "63f14804946644c09c879a6422af48a4" }, "m_SlotId": 0 } @@ -416,6 +454,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "3a14a5890e924dc9a8d17a7673dc642c" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "98d6b02b6e2c427099d971166e08f545" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -444,6 +496,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4e067c39fb05420082f5aa97282d4a84" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "90a485a0f09548c59d26108e3a7d3a41" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -472,6 +538,34 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "63f14804946644c09c879a6422af48a4" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2d546da5f6f34173b0d42f372707ba16" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "63f14804946644c09c879a6422af48a4" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "89e6757f6e704d9d8685e0aca8e0b0c6" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -612,20 +706,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "89e6757f6e704d9d8685e0aca8e0b0c6" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "2d546da5f6f34173b0d42f372707ba16" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -654,6 +734,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "90a485a0f09548c59d26108e3a7d3a41" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "94d5bda0d37b41fe8a4a0b562977b893" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -668,6 +762,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "94d5bda0d37b41fe8a4a0b562977b893" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "607a1f532e464308bd6fed2cc5947fef" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -766,6 +874,20 @@ "m_SlotId": -1716853730 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ac27351f04c446419049ec0720975607" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "fdf91ec6bc794c6b94f4e54a87bebef7" + }, + "m_SlotId": 625923556 + } + }, { "m_OutputSlot": { "m_Node": { @@ -930,6 +1052,18 @@ }, { "m_Id": "a50383c1d6ea4c63a365fd22920bc12f" + }, + { + "m_Id": "ff4af4446fba43bf8ba6c1858338092c" + }, + { + "m_Id": "21fe65bd650c4537a977efd13ddc5815" + }, + { + "m_Id": "d46fa3c867314c4a9d1fac40b9624cca" + }, + { + "m_Id": "0143da3e88b24a5c95985d46590e6e55" } ] }, @@ -990,6 +1124,40 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0143da3e88b24a5c95985d46590e6e55", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Metallic", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "904f0c639a0645d09d50e64947916969" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Metallic" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", @@ -1392,8 +1560,8 @@ "m_ObjectId": "0ee583451d984067b9fc332bf09f761e", "m_Title": "Distortion", "m_Position": { - "x": -2333.999755859375, - "y": -1293.9998779296875 + "x": -2334.0, + "y": -1294.0 } } @@ -1518,6 +1686,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "1437053c6cc6496b91aed0c2639dad02", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -1665,9 +1857,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1817.9998779296875, - "y": -372.00006103515627, - "width": 273.9998779296875, + "x": -1812.0, + "y": -339.9999694824219, + "width": 274.0, "height": 375.0 } }, @@ -1787,6 +1979,55 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "1cfe6180c4a145e6b7545dc52b0297b0", + "m_Id": 0, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "21fe65bd650c4537a977efd13ddc5815", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "1cfe6180c4a145e6b7545dc52b0297b0" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -2211,30 +2452,6 @@ "m_Space": 3 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "2bf10b05d3ae4fc1819f189eae0bcaa3", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -2506,6 +2723,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", + "m_ObjectId": "3a14a5890e924dc9a8d17a7673dc642c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Redirect Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1126.0, + "y": 205.00001525878907, + "width": 56.0001220703125, + "height": 24.0 + } + }, + "m_Slots": [ + { + "m_Id": "1437053c6cc6496b91aed0c2639dad02" + }, + { + "m_Id": "4d286dabc5c3449dbaae3d12ee97fb4a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2766,6 +3019,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "4d286dabc5c3449dbaae3d12ee97fb4a", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -2855,6 +3132,36 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "5494db3ef8234df18814cfefb60ad9a3", + "m_Id": 0, + "m_DisplayName": "Specular Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Specular", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3177,6 +3484,97 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "607a1f532e464308bd6fed2cc5947fef", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -311.0, + "y": 183.00006103515626, + "width": 208.0000457763672, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "cf052b3d02b54f46b3f4bf1d0e553149" + }, + { + "m_Id": "b27b8c532ff14b88a5430f2d956876a7" + }, + { + "m_Id": "6082a277f4a545bfa1bf2d281dded3be" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "6082a277f4a545bfa1bf2d281dded3be", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3201,6 +3599,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", + "m_ObjectId": "63f14804946644c09c879a6422af48a4", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Redirect Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 733.0267333984375, + "y": -48.004878997802737, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "b29d39b7915549e58d39514eecbd0e21" + }, + { + "m_Id": "a23071c96f28472c92e72b03efb1e365" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3228,10 +3662,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -26.311307907104493, - "y": -42.928932189941409, - "width": 0.0, - "height": 0.0 + "x": -93.0, + "y": -125.0, + "width": 126.0, + "height": 77.0 } }, "m_Slots": [ @@ -3669,21 +4103,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "77a4ddbda40543e7ba355847e88227ee", - "m_Id": 4, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3735,10 +4154,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1996.9998779296875, - "y": -85.00007629394531, + "x": -2041.0, + "y": -119.00003051757813, "width": 140.0, - "height": 34.00008010864258 + "height": 34.000038146972659 } }, "m_Slots": [ @@ -4199,10 +4618,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 877.0000610351563, - "y": -16.999971389770509, + "x": 832.0000610351563, + "y": -35.999977111816409, "width": 208.00006103515626, - "height": 302.0000305175781 + "height": 302.0 } }, "m_Slots": [ @@ -4325,13 +4744,13 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "8fab117b0be740b290fe70c37397fcd3", - "m_Id": 2, - "m_DisplayName": "G", - "m_SlotType": 1, + "m_ObjectId": "904f0c639a0645d09d50e64947916969", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 3, + "m_ShaderOutputName": "Metallic", + "m_StageCapability": 2, "m_Value": 0.0, "m_DefaultValue": 0.0, "m_Labels": [] @@ -4339,42 +4758,31 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SplitNode", - "m_ObjectId": "9057ed5a265e40638b3baa6fd2bfae9c", + "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", + "m_ObjectId": "90a485a0f09548c59d26108e3a7d3a41", "m_Group": { "m_Id": "" }, - "m_Name": "Split", + "m_Name": "Redirect Node", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1425.0, - "y": -340.00006103515627, - "width": 120.0001220703125, - "height": 149.00003051757813 + "x": -471.0, + "y": 91.00004577636719, + "width": 56.000030517578128, + "height": 23.99993133544922 } }, "m_Slots": [ { - "m_Id": "2bf10b05d3ae4fc1819f189eae0bcaa3" + "m_Id": "d1b3a48137dc44d3bf7a741f2d159c6c" }, { - "m_Id": "e4206a11c4d24d429d73a525e6c79842" - }, - { - "m_Id": "8fab117b0be740b290fe70c37397fcd3" - }, - { - "m_Id": "acc09e7a01dd4303a0df0ff945b99218" - }, - { - "m_Id": "77a4ddbda40543e7ba355847e88227ee" + "m_Id": "9efe8d8990ac40eb8a776ad1532f2d86" } ], - "synonyms": [ - "separate" - ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_DismissedVersion": 0, @@ -4476,6 +4884,46 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", + "m_ObjectId": "94d5bda0d37b41fe8a4a0b562977b893", + "m_Group": { + "m_Id": "" + }, + "m_Name": "One Minus", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -554.0, + "y": 183.00006103515626, + "width": 208.0, + "height": 277.9999694824219 + } + }, + "m_Slots": [ + { + "m_Id": "ae717d5e96e84de9841da2af208c1298" + }, + { + "m_Id": "baaf4b7927174d48ab1e1ed3f26b7e4a" + } + ], + "synonyms": [ + "complement", + "invert", + "opposite" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4607,6 +5055,30 @@ "m_SerializedDescriptor": "SurfaceDescription.Smoothness" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "998beadaf2694830aced8e3ba8862aea", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -4831,6 +5303,30 @@ "m_MipSamplingMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "9efe8d8990ac40eb8a776ad1532f2d86", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4883,6 +5379,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "a23071c96f28472c92e72b03efb1e365", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -5104,21 +5624,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "acc09e7a01dd4303a0df0ff945b99218", - "m_Id": 3, - "m_DisplayName": "B", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -5191,6 +5696,102 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ae717d5e96e84de9841da2af208c1298", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "b27b8c532ff14b88a5430f2d956876a7", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.25, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "b29d39b7915549e58d39514eecbd0e21", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", @@ -5397,6 +5998,51 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "ba1dff6fc7db4826a35a3c6b75c12238", + "m_Id": 625923556, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_UV", + "m_StageCapability": 2, + "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.DynamicVectorMaterialSlot", + "m_ObjectId": "baaf4b7927174d48ab1e1ed3f26b7e4a", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5647,12 +6293,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 2, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", - "m_ObjectId": "c7f6c20f44d24a38ac95194b3204739e" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5785,6 +6425,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "cf052b3d02b54f46b3f4bf1d0e553149", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5824,6 +6512,64 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "d1b3a48137dc44d3bf7a741f2d159c6c", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "d46fa3c867314c4a9d1fac40b9624cca", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Specular", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "5494db3ef8234df18814cfefb60ad9a3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Specular" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ClampNode", @@ -5904,7 +6650,7 @@ "m_ObjectId": "d898233e75874a108f4989dcd52f07bb", "m_Datas": [], "m_ActiveSubTarget": { - "m_Id": "c7f6c20f44d24a38ac95194b3204739e" + "m_Id": "fc73b3e15ede43488322d90ba021290a" }, "m_AllowMaterialOverride": true, "m_SurfaceType": 1, @@ -6076,21 +6822,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "e4206a11c4d24d429d73a525e6c79842", - "m_Id": 1, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -6567,7 +7298,7 @@ "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, - "m_Value": 0.4000000059604645, + "m_Value": 0.20000000298023225, "m_DefaultValue": 0.0, "m_Labels": [] } @@ -6711,6 +7442,16 @@ "m_Labels": [] } +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", + "m_ObjectId": "fc73b3e15ede43488322d90ba021290a", + "m_WorkflowMode": 0, + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -6825,13 +7566,16 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -399.0001220703125, - "y": -224.00003051757813, - "width": 208.0001220703125, + "x": -489.0000305175781, + "y": -205.0000457763672, + "width": 208.0, "height": 279.00006103515627 } }, "m_Slots": [ + { + "m_Id": "ba1dff6fc7db4826a35a3c6b75c12238" + }, { "m_Id": "2c5f56c6715c4a4c950c2c5e8be2d990" } @@ -6845,8 +7589,12 @@ "m_SerializableColors": [] }, "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"7f012b3c12c4348ae8841bf214f96c3a\",\n \"type\": 3\n }\n}", - "m_PropertyGuids": [], - "m_PropertyIds": [], + "m_PropertyGuids": [ + "38444e1c-e234-43cb-acc2-89b360bb48ed" + ], + "m_PropertyIds": [ + 625923556 + ], "m_Dropdowns": [], "m_DropdownSelectedEntries": [] } @@ -6899,3 +7647,37 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "ff4af4446fba43bf8ba6c1858338092c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.NormalTS", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "998beadaf2694830aced8e3ba8862aea" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} +