From fb81611a759c8053d0716c96a7493dd71f94b6ad Mon Sep 17 00:00:00 2001 From: Armour <497052684@qq.com> Date: Mon, 28 Dec 2015 17:27:07 -0800 Subject: [PATCH] added mobileSingleStickAnimation --- Assets/Animation/HUDCanvas.controller | 51 --------------- .../MobileSingleStickControl.controller | 63 ++++++++++++++++++- Assets/Scenes/start_scene.unity | 46 ++++++++++++-- Assets/Scripts/Managers/GameOverManager.cs | 2 + ProjectSettings/ProjectSettings.asset | 4 +- 5 files changed, 104 insertions(+), 62 deletions(-) diff --git a/Assets/Animation/HUDCanvas.controller b/Assets/Animation/HUDCanvas.controller index adf4f19..2573371 100644 --- a/Assets/Animation/HUDCanvas.controller +++ b/Assets/Animation/HUDCanvas.controller @@ -51,30 +51,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &110196058 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: GameOver - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 110277312} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.1 - m_TransitionOffset: 0 - m_ExitTime: 0.9 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &110200246 AnimatorState: serializedVersion: 5 @@ -98,29 +74,6 @@ AnimatorState: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: ---- !u!1102 &110277312 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: GameOverClip2 - 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_Motion: {fileID: 7400000, guid: 2f723f84b0d924d05b36dd3607bbb3e7, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: --- !u!1102 &110288786 AnimatorState: serializedVersion: 5 @@ -132,7 +85,6 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 110158796} - - {fileID: 110196058} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -160,9 +112,6 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 110288786} m_Position: {x: 264, y: 120, z: 0} - - serializedVersion: 1 - m_State: {fileID: 110277312} - m_Position: {x: 264, y: 216, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Animation/MobileSingleStickControl.controller b/Assets/Animation/MobileSingleStickControl.controller index c01e0ed..c14a30c 100644 --- a/Assets/Animation/MobileSingleStickControl.controller +++ b/Assets/Animation/MobileSingleStickControl.controller @@ -7,7 +7,13 @@ AnimatorController: m_PrefabInternal: {fileID: 0} m_Name: MobileSingleStickControl serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: GameOver + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -21,6 +27,54 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &110103848 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: GameOver + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 110280644} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &110265900 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 110103848} + 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_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: --- !u!1102 &110280644 AnimatorState: serializedVersion: 5 @@ -54,7 +108,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 110280644} - m_Position: {x: 228, y: 12, z: 0} + m_Position: {x: 276, y: 12, z: 0} + - serializedVersion: 1 + m_State: {fileID: 110265900} + m_Position: {x: 276, y: 108, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -64,4 +121,4 @@ AnimatorStateMachine: 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: 110280644} + m_DefaultState: {fileID: 110265900} diff --git a/Assets/Scenes/start_scene.unity b/Assets/Scenes/start_scene.unity index 72187e2..9cd4985 100644 --- a/Assets/Scenes/start_scene.unity +++ b/Assets/Scenes/start_scene.unity @@ -659,6 +659,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerHealth: {fileID: 30755015} + mobileAnim: {fileID: 1190763568} --- !u!1 &582701474 GameObject: m_ObjectHideFlags: 0 @@ -1279,6 +1280,27 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &1190763567 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} + m_PrefabInternal: {fileID: 1695820005} +--- !u!95 &1190763568 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1190763567} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 75565b594bece4d04a844f5bb987cdae, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!1 &1352128592 GameObject: m_ObjectHideFlags: 0 @@ -1414,19 +1436,19 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} propertyPath: m_AnchoredPosition.x - value: 0 + value: 432 objectReference: {fileID: 0} - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: 223 objectReference: {fileID: 0} - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} propertyPath: m_SizeDelta.x - value: 0 + value: 864 objectReference: {fileID: 0} - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 446 objectReference: {fileID: 0} - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} propertyPath: m_AnchorMin.x @@ -1446,11 +1468,23 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} propertyPath: m_Pivot.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} propertyPath: m_Pivot.y - value: 0 + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22400000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} + propertyPath: m_LocalScale.z + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 9529ecc3d479da5499993355e6c2cb4f, type: 2} diff --git a/Assets/Scripts/Managers/GameOverManager.cs b/Assets/Scripts/Managers/GameOverManager.cs index c33ac8e..8422839 100644 --- a/Assets/Scripts/Managers/GameOverManager.cs +++ b/Assets/Scripts/Managers/GameOverManager.cs @@ -3,6 +3,7 @@ public class GameOverManager : MonoBehaviour { public PlayerHealth playerHealth; + public Animator mobileAnim; Animator anim; @@ -13,6 +14,7 @@ void Awake() { void Update() { if (playerHealth.currentHealth <= 0) { anim.SetTrigger("GameOver"); + mobileAnim.SetTrigger("GameOver"); } } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a9a2273..4db85b6 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -88,7 +88,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleIdentifier: com.Company.ProductName + bundleIdentifier: com.armour.Nightmares-iOS bundleVersion: 1.0 preloadedAssets: [] metroEnableIndependentInputSource: 0 @@ -115,7 +115,7 @@ PlayerSettings: serializedVersion: 2 m_Bits: 238 iPhoneSdkVersion: 988 - iPhoneTargetOSVersion: 26 + iPhoneTargetOSVersion: 24 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1