Skip to content

Commit

Permalink
Propeller animation fixes and cleanup before 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Hykudoru committed Dec 14, 2020
1 parent ea535b6 commit fc4b089
Show file tree
Hide file tree
Showing 28 changed files with 253 additions and 368 deletions.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,24 +1,46 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-5628956123683015686
AnimatorStateMachine:
serializedVersion: 5
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: 3535255746504411951}
m_Position: {x: 360, y: 140, 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: 3535255746504411951}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Drone_2_Prototype
m_Name: DroneQuad
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Thrust
- m_Name: PropellerSpeed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 4685058069676542804}
m_StateMachine: {fileID: -5628956123683015686}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
Expand All @@ -28,14 +50,14 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &2773849417819151609
--- !u!1102 &3535255746504411951
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fly
m_Name: DroneHoverFly
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
Expand All @@ -48,31 +70,9 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 73b1f0d016da9404bb74967d1617ec7c, type: 2}
m_Motion: {fileID: 7400000, guid: e300b5c4bf8eebe429ff4aa0c4b47544, type: 2}
m_Tag:
m_SpeedParameter: Thrust
m_SpeedParameter: PropellerSpeed
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &4685058069676542804
AnimatorStateMachine:
serializedVersion: 5
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: 2773849417819151609}
m_Position: {x: 360, y: 50, 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: 2773849417819151609}
m_TimeParameter: PropellerSpeed

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

53 changes: 0 additions & 53 deletions Drones/Assets/Drones/Animations/Idle.anim

This file was deleted.

Loading

0 comments on commit fc4b089

Please sign in to comment.