Skip to content

Commit 8e9968c

Browse files
committed
Update combat SM
1 parent 6be6f64 commit 8e9968c

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/Timer_AttackAnimation.asset

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 8139f9f328ed1144690b7a9ffca2d5b4, type: 3}
1313
m_Name: Timer_AttackAnimation
1414
m_EditorClassIdentifier:
15-
cacheResult: 1
16-
timerLength: 0.5
15+
timerLength: 0.75

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,6 @@ MonoBehaviour:
175175
- ExpectedResult: 0
176176
Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
177177
Operator: 0
178-
- ExpectedResult: 1
179-
Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
180-
Operator: 0
181178
- FromState: {fileID: 11400000, guid: bda8bfafdf35e3e4092bb96279d4894c, type: 2}
182179
ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
183180
Conditions:
@@ -187,9 +184,6 @@ MonoBehaviour:
187184
- ExpectedResult: 1
188185
Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
189186
Operator: 0
190-
- ExpectedResult: 1
191-
Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
192-
Operator: 0
193187
- FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
194188
ToState: {fileID: 11400000, guid: 78675b2bf031c3f4a9c28dda969298e2, type: 2}
195189
Conditions:

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Attack.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
_actions:
1616
- {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}
17+
- {fileID: 11400000, guid: 23e8862a3aca1b6439bda3bf27d03897, type: 2}

0 commit comments

Comments
 (0)