Skip to content

Commit ad15699

Browse files
uChemauChema
committed
Use Game States In State Machine
2 parents 5ea8ea1 + 95f1cc2 commit ad15699

24 files changed

+258
-40
lines changed

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/PlantCritter_TransitionTable.asset

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ MonoBehaviour:
4646
- ExpectedResult: 0
4747
Condition: {fileID: 11400000, guid: 3d30788033cfd9d4fa24fa5112d9430c, type: 2}
4848
Operator: 0
49+
- ExpectedResult: 1
50+
Condition: {fileID: 11400000, guid: a8068be10543378448af346b992d58e2, type: 2}
51+
Operator: 0
52+
- ExpectedResult: 1
53+
Condition: {fileID: 11400000, guid: 6316a637501d09e48b48b42da59e4410, type: 2}
54+
Operator: 0
4955
- FromState: {fileID: 11400000, guid: 879aebdccfac8334089096e432810559, type: 2}
5056
ToState: {fileID: 11400000, guid: f61658c3057e2714088359f412d8983e, type: 2}
5157
Conditions:

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/RockCritter_TransitionTable.asset

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ MonoBehaviour:
2525
- ExpectedResult: 1
2626
Condition: {fileID: 11400000, guid: 050fbbaa48ac74961952b20dabfd6e88, type: 2}
2727
Operator: 0
28+
- ExpectedResult: 1
29+
Condition: {fileID: 11400000, guid: 6316a637501d09e48b48b42da59e4410, type: 2}
30+
Operator: 0
31+
- ExpectedResult: 1
32+
Condition: {fileID: 11400000, guid: a8068be10543378448af346b992d58e2, type: 2}
33+
Operator: 0
2834
- FromState: {fileID: 11400000, guid: ea7a8e48b1a87c241bb721da98d1d812, type: 2}
2935
ToState: {fileID: 11400000, guid: 5b0e38103a74c054cb968153b3227b71, type: 2}
3036
Conditions:

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInCombatGameState.asset

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
13+
m_Name: IsInCombatGameState
14+
m_EditorClassIdentifier:
15+
_currentGameState: 6
16+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInCombatGameState.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInDialogueGameState.asset

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
13+
m_Name: IsInDialogueGameState
14+
m_EditorClassIdentifier:
15+
_currentGameState: 3
16+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInDialogueGameState.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInGameplayGameState.asset

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
13+
m_Name: IsInGameplayGameState
14+
m_EditorClassIdentifier:
15+
_currentGameState: 0
16+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInGameplayGameState.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInInventoryGameState.asset

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
13+
m_Name: IsInInventoryGameState
14+
m_EditorClassIdentifier:
15+
_currentGameState: 2
16+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

0 commit comments

Comments
 (0)