Skip to content

Commit 310465e

Browse files
Build v1.0.0
2 parents 4b3617a + 70f5e38 commit 310465e

12 files changed

+195
-360
lines changed

Skepticism/Assets/Game/Game State Machine.controller

Lines changed: 103 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ MonoBehaviour:
171171
m_Script: {fileID: 11500000, guid: c441dff1407d86847b214be24050d5ee, type: 3}
172172
m_Name:
173173
m_EditorClassIdentifier:
174-
line: {fileID: 11400000, guid: 783f78bd895e2ce4c871a1b36b9baf98, type: 2}
174+
line: {fileID: 11400000, guid: 4d3806caec562544a808203ba520b820, type: 2}
175175
stopOnExit: 0
176176
--- !u!1102 &-8660941796863622755
177177
AnimatorState:
@@ -759,6 +759,34 @@ AnimatorState:
759759
m_MirrorParameter:
760760
m_CycleOffsetParameter:
761761
m_TimeParameter:
762+
--- !u!1102 &-7274581426228825790
763+
AnimatorState:
764+
serializedVersion: 6
765+
m_ObjectHideFlags: 1
766+
m_CorrespondingSourceObject: {fileID: 0}
767+
m_PrefabInstance: {fileID: 0}
768+
m_PrefabAsset: {fileID: 0}
769+
m_Name: Prefer Pink
770+
m_Speed: 1
771+
m_CycleOffset: 0
772+
m_Transitions:
773+
- {fileID: 3305154611918073046}
774+
m_StateMachineBehaviours:
775+
- {fileID: 6084417634732188682}
776+
m_Position: {x: 50, y: 50, z: 0}
777+
m_IKOnFeet: 0
778+
m_WriteDefaultValues: 1
779+
m_Mirror: 0
780+
m_SpeedParameterActive: 0
781+
m_MirrorParameterActive: 0
782+
m_CycleOffsetParameterActive: 0
783+
m_TimeParameterActive: 0
784+
m_Motion: {fileID: 7400000, guid: be8b6f20fc6cb6f4f9ec40e96b4a1936, type: 2}
785+
m_Tag:
786+
m_SpeedParameter:
787+
m_MirrorParameter:
788+
m_CycleOffsetParameter:
789+
m_TimeParameter:
762790
--- !u!1109 &-7120569037166174879
763791
AnimatorTransition:
764792
m_ObjectHideFlags: 1
@@ -1592,7 +1620,7 @@ MonoBehaviour:
15921620
m_Script: {fileID: 11500000, guid: c441dff1407d86847b214be24050d5ee, type: 3}
15931621
m_Name:
15941622
m_EditorClassIdentifier:
1595-
line: {fileID: 11400000, guid: 17b5f4810934b724c9aa054fbc8cd3f2, type: 2}
1623+
line: {fileID: 11400000, guid: 833de0c5cd6a6014fb3c737a45f04c31, type: 2}
15961624
stopOnExit: 0
15971625
--- !u!1101 &-4503557722663694726
15981626
AnimatorStateTransition:
@@ -1994,7 +2022,10 @@ AnimatorStateTransition:
19942022
m_PrefabInstance: {fileID: 0}
19952023
m_PrefabAsset: {fileID: 0}
19962024
m_Name:
1997-
m_Conditions: []
2025+
m_Conditions:
2026+
- m_ConditionMode: 1
2027+
m_ConditionEvent: Dummy
2028+
m_EventTreshold: 0
19982029
m_DstStateMachine: {fileID: 0}
19992030
m_DstState: {fileID: 1425409853808389297}
20002031
m_Solo: 0
@@ -2004,7 +2035,7 @@ AnimatorStateTransition:
20042035
m_TransitionDuration: 0
20052036
m_TransitionOffset: 0
20062037
m_ExitTime: 1
2007-
m_HasExitTime: 1
2038+
m_HasExitTime: 0
20082039
m_HasFixedDuration: 1
20092040
m_InterruptionSource: 0
20102041
m_OrderedInterruption: 1
@@ -2196,6 +2227,28 @@ AnimatorStateTransition:
21962227
m_InterruptionSource: 0
21972228
m_OrderedInterruption: 1
21982229
m_CanTransitionToSelf: 1
2230+
--- !u!1101 &-2694852800576611939
2231+
AnimatorStateTransition:
2232+
m_ObjectHideFlags: 1
2233+
m_CorrespondingSourceObject: {fileID: 0}
2234+
m_PrefabInstance: {fileID: 0}
2235+
m_PrefabAsset: {fileID: 0}
2236+
m_Name:
2237+
m_Conditions: []
2238+
m_DstStateMachine: {fileID: 0}
2239+
m_DstState: {fileID: -7274581426228825790}
2240+
m_Solo: 0
2241+
m_Mute: 0
2242+
m_IsExit: 0
2243+
serializedVersion: 3
2244+
m_TransitionDuration: 0
2245+
m_TransitionOffset: 0
2246+
m_ExitTime: 1
2247+
m_HasExitTime: 1
2248+
m_HasFixedDuration: 1
2249+
m_InterruptionSource: 0
2250+
m_OrderedInterruption: 1
2251+
m_CanTransitionToSelf: 1
21992252
--- !u!1101 &-2589297886972772891
22002253
AnimatorStateTransition:
22012254
m_ObjectHideFlags: 1
@@ -3393,7 +3446,7 @@ AnimatorState:
33933446
m_Speed: 1
33943447
m_CycleOffset: 0
33953448
m_Transitions:
3396-
- {fileID: 1006443566862948417}
3449+
- {fileID: -2694852800576611939}
33973450
m_StateMachineBehaviours:
33983451
- {fileID: -6376140116918797416}
33993452
m_Position: {x: 50, y: 50, z: 0}
@@ -3450,28 +3503,6 @@ MonoBehaviour:
34503503
m_Name:
34513504
m_EditorClassIdentifier:
34523505
receivesInput: 0
3453-
--- !u!1101 &1006443566862948417
3454-
AnimatorStateTransition:
3455-
m_ObjectHideFlags: 1
3456-
m_CorrespondingSourceObject: {fileID: 0}
3457-
m_PrefabInstance: {fileID: 0}
3458-
m_PrefabAsset: {fileID: 0}
3459-
m_Name:
3460-
m_Conditions: []
3461-
m_DstStateMachine: {fileID: 0}
3462-
m_DstState: {fileID: -2170368206395296342}
3463-
m_Solo: 0
3464-
m_Mute: 0
3465-
m_IsExit: 0
3466-
serializedVersion: 3
3467-
m_TransitionDuration: 0
3468-
m_TransitionOffset: 0
3469-
m_ExitTime: 1
3470-
m_HasExitTime: 1
3471-
m_HasFixedDuration: 1
3472-
m_InterruptionSource: 0
3473-
m_OrderedInterruption: 1
3474-
m_CanTransitionToSelf: 1
34753506
--- !u!1101 &1027611911490248154
34763507
AnimatorStateTransition:
34773508
m_ObjectHideFlags: 1
@@ -4385,6 +4416,28 @@ AnimatorStateTransition:
43854416
m_InterruptionSource: 0
43864417
m_OrderedInterruption: 1
43874418
m_CanTransitionToSelf: 1
4419+
--- !u!1101 &3305154611918073046
4420+
AnimatorStateTransition:
4421+
m_ObjectHideFlags: 1
4422+
m_CorrespondingSourceObject: {fileID: 0}
4423+
m_PrefabInstance: {fileID: 0}
4424+
m_PrefabAsset: {fileID: 0}
4425+
m_Name:
4426+
m_Conditions: []
4427+
m_DstStateMachine: {fileID: 0}
4428+
m_DstState: {fileID: -2170368206395296342}
4429+
m_Solo: 0
4430+
m_Mute: 0
4431+
m_IsExit: 0
4432+
serializedVersion: 3
4433+
m_TransitionDuration: 0
4434+
m_TransitionOffset: 0
4435+
m_ExitTime: 1
4436+
m_HasExitTime: 1
4437+
m_HasFixedDuration: 1
4438+
m_InterruptionSource: 0
4439+
m_OrderedInterruption: 1
4440+
m_CanTransitionToSelf: 1
43884441
--- !u!1102 &3429260228669142023
43894442
AnimatorState:
43904443
serializedVersion: 6
@@ -5166,7 +5219,10 @@ AnimatorStateTransition:
51665219
m_PrefabInstance: {fileID: 0}
51675220
m_PrefabAsset: {fileID: 0}
51685221
m_Name:
5169-
m_Conditions: []
5222+
m_Conditions:
5223+
- m_ConditionMode: 1
5224+
m_ConditionEvent: Dummy
5225+
m_EventTreshold: 0
51705226
m_DstStateMachine: {fileID: 0}
51715227
m_DstState: {fileID: 2357948358090434707}
51725228
m_Solo: 0
@@ -5176,7 +5232,7 @@ AnimatorStateTransition:
51765232
m_TransitionDuration: 0
51775233
m_TransitionOffset: 0
51785234
m_ExitTime: 1
5179-
m_HasExitTime: 1
5235+
m_HasExitTime: 0
51805236
m_HasFixedDuration: 1
51815237
m_InterruptionSource: 0
51825238
m_OrderedInterruption: 1
@@ -5581,6 +5637,20 @@ MonoBehaviour:
55815637
m_Script: {fileID: 11500000, guid: 86e6e0f3c80138547a984f05196627b3, type: 3}
55825638
m_Name:
55835639
m_EditorClassIdentifier:
5640+
--- !u!114 &6084417634732188682
5641+
MonoBehaviour:
5642+
m_ObjectHideFlags: 1
5643+
m_CorrespondingSourceObject: {fileID: 0}
5644+
m_PrefabInstance: {fileID: 0}
5645+
m_PrefabAsset: {fileID: 0}
5646+
m_GameObject: {fileID: 0}
5647+
m_Enabled: 1
5648+
m_EditorHideFlags: 0
5649+
m_Script: {fileID: 11500000, guid: c441dff1407d86847b214be24050d5ee, type: 3}
5650+
m_Name:
5651+
m_EditorClassIdentifier:
5652+
line: {fileID: 11400000, guid: 91b147ab17d868c4997e0e01515effb2, type: 2}
5653+
stopOnExit: 0
55845654
--- !u!114 &6088231232334697394
55855655
MonoBehaviour:
55865656
m_ObjectHideFlags: 1
@@ -5682,13 +5752,16 @@ AnimatorStateMachine:
56825752
m_Position: {x: 30, y: 500, z: 0}
56835753
- serializedVersion: 1
56845754
m_State: {fileID: -2170368206395296342}
5685-
m_Position: {x: -90, y: 240, z: 0}
5755+
m_Position: {x: -90, y: 270, z: 0}
56865756
- serializedVersion: 1
56875757
m_State: {fileID: 4095638258074600887}
56885758
m_Position: {x: -210, y: 320, z: 0}
56895759
- serializedVersion: 1
56905760
m_State: {fileID: -2350494499928787882}
56915761
m_Position: {x: 30, y: 320, z: 0}
5762+
- serializedVersion: 1
5763+
m_State: {fileID: -7274581426228825790}
5764+
m_Position: {x: -160, y: 110, z: 0}
56925765
m_ChildStateMachines: []
56935766
m_AnyStateTransitions: []
56945767
m_EntryTransitions: []

0 commit comments

Comments
 (0)