mirror of
				https://github.com/DerTyp7/defrain-shooter-unity.git
				synced 2025-11-03 22:58:59 +01:00 
			
		
		
		
	
		
			
				
	
	
		
			194 lines
		
	
	
		
			5.7 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			194 lines
		
	
	
		
			5.7 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
%YAML 1.1
 | 
						|
%TAG !u! tag:unity3d.com,2011:
 | 
						|
<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller
 | 
						|
--- !u!1102 &-7052686061329051644
 | 
						|
=======
 | 
						|
--- !u!1102 &-4337559610742278692
 | 
						|
>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller
 | 
						|
AnimatorState:
 | 
						|
  serializedVersion: 6
 | 
						|
  m_ObjectHideFlags: 1
 | 
						|
  m_CorrespondingSourceObject: {fileID: 0}
 | 
						|
  m_PrefabInstance: {fileID: 0}
 | 
						|
  m_PrefabAsset: {fileID: 0}
 | 
						|
  m_Name: Shoot
 | 
						|
  m_Speed: 4
 | 
						|
  m_CycleOffset: 0
 | 
						|
  m_Transitions:
 | 
						|
  - {fileID: -1689963099303595595}
 | 
						|
  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: 1
 | 
						|
  m_Motion: {fileID: -8945691123924629249, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
 | 
						|
  m_Tag: 
 | 
						|
  m_SpeedParameter: Time
 | 
						|
  m_MirrorParameter: 
 | 
						|
  m_CycleOffsetParameter: 
 | 
						|
<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller
 | 
						|
  m_TimeParameter: Time
 | 
						|
--- !u!1107 &-2034536485000263243
 | 
						|
AnimatorStateMachine:
 | 
						|
  serializedVersion: 6
 | 
						|
=======
 | 
						|
  m_TimeParameter: 
 | 
						|
--- !u!1101 &-1689963099303595595
 | 
						|
AnimatorStateTransition:
 | 
						|
>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller
 | 
						|
  m_ObjectHideFlags: 1
 | 
						|
  m_CorrespondingSourceObject: {fileID: 0}
 | 
						|
  m_PrefabInstance: {fileID: 0}
 | 
						|
  m_PrefabAsset: {fileID: 0}
 | 
						|
<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller
 | 
						|
  m_Name: Base Layer
 | 
						|
  m_ChildStates:
 | 
						|
  - serializedVersion: 1
 | 
						|
    m_State: {fileID: -7052686061329051644}
 | 
						|
    m_Position: {x: 247.81976, y: 182.43098, z: 0}
 | 
						|
  m_ChildStateMachines: []
 | 
						|
  m_AnyStateTransitions: []
 | 
						|
  m_EntryTransitions: []
 | 
						|
  m_StateMachineTransitions: {}
 | 
						|
  m_StateMachineBehaviours: []
 | 
						|
  m_AnyStatePosition: {x: 50, y: 20, z: 0}
 | 
						|
  m_EntryPosition: {x: 50, y: 120, z: 0}
 | 
						|
  m_ExitPosition: {x: 800, y: 120, z: 0}
 | 
						|
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
 | 
						|
  m_DefaultState: {fileID: -7052686061329051644}
 | 
						|
=======
 | 
						|
  m_Name: 
 | 
						|
  m_Conditions: []
 | 
						|
  m_DstStateMachine: {fileID: 0}
 | 
						|
  m_DstState: {fileID: 2698501508598014645}
 | 
						|
  m_Solo: 0
 | 
						|
  m_Mute: 0
 | 
						|
  m_IsExit: 0
 | 
						|
  serializedVersion: 3
 | 
						|
  m_TransitionDuration: 0
 | 
						|
  m_TransitionOffset: 0
 | 
						|
  m_ExitTime: 1
 | 
						|
  m_HasExitTime: 1
 | 
						|
  m_HasFixedDuration: 1
 | 
						|
  m_InterruptionSource: 0
 | 
						|
  m_OrderedInterruption: 1
 | 
						|
  m_CanTransitionToSelf: 1
 | 
						|
--- !u!1101 &-900705370146274576
 | 
						|
AnimatorStateTransition:
 | 
						|
  m_ObjectHideFlags: 1
 | 
						|
  m_CorrespondingSourceObject: {fileID: 0}
 | 
						|
  m_PrefabInstance: {fileID: 0}
 | 
						|
  m_PrefabAsset: {fileID: 0}
 | 
						|
  m_Name: 
 | 
						|
  m_Conditions:
 | 
						|
  - m_ConditionMode: 1
 | 
						|
    m_ConditionEvent: shootTrigger
 | 
						|
    m_EventTreshold: 0
 | 
						|
  m_DstStateMachine: {fileID: 0}
 | 
						|
  m_DstState: {fileID: -4337559610742278692}
 | 
						|
  m_Solo: 0
 | 
						|
  m_Mute: 0
 | 
						|
  m_IsExit: 0
 | 
						|
  serializedVersion: 3
 | 
						|
  m_TransitionDuration: 0
 | 
						|
  m_TransitionOffset: 0
 | 
						|
  m_ExitTime: 0.9945216
 | 
						|
  m_HasExitTime: 0
 | 
						|
  m_HasFixedDuration: 1
 | 
						|
  m_InterruptionSource: 2
 | 
						|
  m_OrderedInterruption: 1
 | 
						|
  m_CanTransitionToSelf: 1
 | 
						|
>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller
 | 
						|
--- !u!91 &9100000
 | 
						|
AnimatorController:
 | 
						|
  m_ObjectHideFlags: 0
 | 
						|
  m_CorrespondingSourceObject: {fileID: 0}
 | 
						|
  m_PrefabInstance: {fileID: 0}
 | 
						|
  m_PrefabAsset: {fileID: 0}
 | 
						|
  m_Name: PlayerAnimatior
 | 
						|
  serializedVersion: 5
 | 
						|
  m_AnimatorParameters:
 | 
						|
<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller
 | 
						|
  - m_Name: Time
 | 
						|
    m_Type: 1
 | 
						|
=======
 | 
						|
  - m_Name: shootTrigger
 | 
						|
    m_Type: 9
 | 
						|
>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller
 | 
						|
    m_DefaultFloat: 0
 | 
						|
    m_DefaultInt: 0
 | 
						|
    m_DefaultBool: 0
 | 
						|
    m_Controller: {fileID: 0}
 | 
						|
  m_AnimatorLayers:
 | 
						|
  - serializedVersion: 5
 | 
						|
    m_Name: Base Layer
 | 
						|
    m_StateMachine: {fileID: -2034536485000263243}
 | 
						|
    m_Mask: {fileID: 0}
 | 
						|
    m_Motions: []
 | 
						|
    m_Behaviours: []
 | 
						|
    m_BlendingMode: 0
 | 
						|
    m_SyncedLayerIndex: -1
 | 
						|
    m_DefaultWeight: 0
 | 
						|
    m_IKPass: 0
 | 
						|
    m_SyncedLayerAffectsTiming: 0
 | 
						|
    m_Controller: {fileID: 9100000}
 | 
						|
<<<<<<< Updated upstream:Assets/Animation/Animatior Objects/PlayerAnimatior.controller
 | 
						|
=======
 | 
						|
--- !u!1102 &2698501508598014645
 | 
						|
AnimatorState:
 | 
						|
  serializedVersion: 6
 | 
						|
  m_ObjectHideFlags: 1
 | 
						|
  m_CorrespondingSourceObject: {fileID: 0}
 | 
						|
  m_PrefabInstance: {fileID: 0}
 | 
						|
  m_PrefabAsset: {fileID: 0}
 | 
						|
  m_Name: Default
 | 
						|
  m_Speed: 3
 | 
						|
  m_CycleOffset: 0
 | 
						|
  m_Transitions:
 | 
						|
  - {fileID: -900705370146274576}
 | 
						|
  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: -3100369314251171874, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
 | 
						|
  m_Tag: 
 | 
						|
  m_SpeedParameter: 
 | 
						|
  m_MirrorParameter: 
 | 
						|
  m_CycleOffsetParameter: 
 | 
						|
  m_TimeParameter: 
 | 
						|
--- !u!1107 &7614406280852874800
 | 
						|
AnimatorStateMachine:
 | 
						|
  serializedVersion: 6
 | 
						|
  m_ObjectHideFlags: 1
 | 
						|
  m_CorrespondingSourceObject: {fileID: 0}
 | 
						|
  m_PrefabInstance: {fileID: 0}
 | 
						|
  m_PrefabAsset: {fileID: 0}
 | 
						|
  m_Name: Base Layer
 | 
						|
  m_ChildStates:
 | 
						|
  - serializedVersion: 1
 | 
						|
    m_State: {fileID: 2698501508598014645}
 | 
						|
    m_Position: {x: 260, y: 10, z: 0}
 | 
						|
  - serializedVersion: 1
 | 
						|
    m_State: {fileID: -4337559610742278692}
 | 
						|
    m_Position: {x: 260, y: 100, z: 0}
 | 
						|
  m_ChildStateMachines: []
 | 
						|
  m_AnyStateTransitions: []
 | 
						|
  m_EntryTransitions: []
 | 
						|
  m_StateMachineTransitions: {}
 | 
						|
  m_StateMachineBehaviours: []
 | 
						|
  m_AnyStatePosition: {x: 30, y: 10, z: 0}
 | 
						|
  m_EntryPosition: {x: 30, y: 130, z: 0}
 | 
						|
  m_ExitPosition: {x: 800, y: 120, z: 0}
 | 
						|
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
 | 
						|
  m_DefaultState: {fileID: 2698501508598014645}
 | 
						|
>>>>>>> Stashed changes:Assets/Objects/Weapons/M9/M9 Animation Controller.controller
 |