Skip to content

Commit c75c989

Browse files
committed
Rock critter snooze state tweaking after animation integration
1 parent 54c8865 commit c75c989

File tree

6 files changed

+30120
-8
lines changed

6 files changed

+30120
-8
lines changed

UOP1_Project/Assets/Art/Characters/RockCritter/Animation/RockCritter.overrideController

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ AnimatorOverrideController:
3333
type: 3}
3434
- m_OriginalClip: {fileID: -5795714674559577720, guid: 52ff7facc4957e944815ef86a2669a4a,
3535
type: 3}
36-
m_OverrideClip: {fileID: 1827226128182048838, guid: 26bc6bb160e2055459c48676762c2e74,
37-
type: 3}
36+
m_OverrideClip: {fileID: 7400000, guid: cdaa7c76efa91a44e842d9766003e634, type: 2}

UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.anim

Lines changed: 30106 additions & 0 deletions
Large diffs are not rendered by default.

UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.anim.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.
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: 176cefe776b9f114393e9f982ce6e208, type: 3}
13-
m_Name: SnoozeTime Elapsed Random Condition
12+
m_Script: {fileID: 11500000, guid: 8139f9f328ed1144690b7a9ffca2d5b4, type: 3}
13+
m_Name: SnoozeTime Elapsed Condition
1414
m_EditorClassIdentifier:
15-
minTimerLength: 8
16-
maxTimerLength: 12
15+
timerLength: 8
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,5 +149,5 @@ MonoBehaviour:
149149
ToState: {fileID: 11400000, guid: 0fe0dc68c0fc2604ca06ad36d16b1117, type: 2}
150150
Conditions:
151151
- ExpectedResult: 0
152-
Condition: {fileID: 11400000, guid: 64622fb90aa1df4499ab86d9672714f6, type: 2}
152+
Condition: {fileID: 11400000, guid: bf212c05964237d4fa32865d4f5bf9a5, type: 2}
153153
Operator: 0

0 commit comments

Comments
 (0)