summaryrefslogtreecommitdiff
path: root/Assets/Art
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Art')
-rw-r--r--Assets/Art/Controllers/Controller_Saionji.controller31
-rw-r--r--Assets/Art/PostProcessing_setup.asset2
2 files changed, 31 insertions, 2 deletions
diff --git a/Assets/Art/Controllers/Controller_Saionji.controller b/Assets/Art/Controllers/Controller_Saionji.controller
index dcddf24c..959e0150 100644
--- a/Assets/Art/Controllers/Controller_Saionji.controller
+++ b/Assets/Art/Controllers/Controller_Saionji.controller
@@ -78,6 +78,32 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1102 &1102051101437624842
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Idle_Fight
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 5656b5a1f8ec93c40b45feab20055d27, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &1102302620783243694
AnimatorState:
serializedVersion: 5
@@ -323,7 +349,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102909890512155162}
- m_Position: {x: -240, y: 252, z: 0}
+ m_Position: {x: -240, y: 264, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102851928622758184}
m_Position: {x: -240, y: 324, z: 0}
@@ -348,6 +374,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1102589474158252204}
m_Position: {x: 300, y: 336, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102051101437624842}
+ m_Position: {x: -240, y: 204, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
diff --git a/Assets/Art/PostProcessing_setup.asset b/Assets/Art/PostProcessing_setup.asset
index 0b28577b..9f9dac7d 100644
--- a/Assets/Art/PostProcessing_setup.asset
+++ b/Assets/Art/PostProcessing_setup.asset
@@ -74,7 +74,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b94fcd11afffcb142908bfcb1e261fba, type: 3}
m_Name: MotionBlur
m_EditorClassIdentifier:
- active: 1
+ active: 0
enabled:
overrideState: 1
value: 1