diff --git a/Assets/Animations/CharacterShoot.anim b/Assets/Animations/CharacterShoot.anim new file mode 100644 index 0000000..e441d83 --- /dev/null +++ b/Assets/Animations/CharacterShoot.anim @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: CharacterShoot + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - path: 0 + attribute: 0 + script: {fileID: 0} + classID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .0833333358 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/CharacterShoot.anim.meta b/Assets/Animations/CharacterShoot.anim.meta new file mode 100644 index 0000000..85f69bd --- /dev/null +++ b/Assets/Animations/CharacterShoot.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07bc70ab175a72b4baf9c1a5dabfe331 +timeCreated: 1447182956 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/JumpShoot.anim b/Assets/Animations/JumpShoot.anim new file mode 100644 index 0000000..59a0b32 --- /dev/null +++ b/Assets/Animations/JumpShoot.anim @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: JumpShoot + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - path: 0 + attribute: 0 + script: {fileID: 0} + classID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .0833333358 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/JumpShoot.anim.meta b/Assets/Animations/JumpShoot.anim.meta new file mode 100644 index 0000000..43449a1 --- /dev/null +++ b/Assets/Animations/JumpShoot.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e793796701ba6c941a5d7263eaf965a6 +timeCreated: 1447188019 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/RunShoot.anim b/Assets/Animations/RunShoot.anim new file mode 100644 index 0000000..0ccac23 --- /dev/null +++ b/Assets/Animations/RunShoot.anim @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: RunShoot + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - path: 0 + attribute: 0 + script: {fileID: 0} + classID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .0833333358 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/RunShoot.anim.meta b/Assets/Animations/RunShoot.anim.meta new file mode 100644 index 0000000..17ba119 --- /dev/null +++ b/Assets/Animations/RunShoot.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f638740b2ffdeb45af40d99ed9b2566 +timeCreated: 1447187440 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/character_0.controller b/Assets/Animations/character_0.controller index 1335456..012023c 100644 --- a/Assets/Animations/character_0.controller +++ b/Assets/Animations/character_0.controller @@ -13,19 +13,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Ground m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 1 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: vSpeed m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Shooting + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -39,6 +45,30 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &110152892 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Shooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 110232456} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: .25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &110160326 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -66,6 +96,30 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &110170126 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Shooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 110265402} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: .25 + m_TransitionOffset: 0 + m_ExitTime: .825174809 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &110183808 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -153,6 +207,7 @@ AnimatorState: m_Transitions: - {fileID: 110160326} - {fileID: 110194588} + - {fileID: 110170126} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -190,6 +245,30 @@ AnimatorState: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: +--- !u!1102 &110265402 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: CharacterShoot + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 110152892} + 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: 07bc70ab175a72b4baf9c1a5dabfe331, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: --- !u!1102 &110287914 AnimatorState: serializedVersion: 5 @@ -231,6 +310,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 110287914} m_Position: {x: 480, y: 168, z: 0} + - serializedVersion: 1 + m_State: {fileID: 110265402} + m_Position: {x: 372, y: -60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -238,6 +320,6 @@ AnimatorStateMachine: m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 72, y: -72, z: 0} m_EntryPosition: {x: 60, y: 192, z: 0} - m_ExitPosition: {x: 1008, y: 156, z: 0} + m_ExitPosition: {x: 468, y: 312, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 110232456} diff --git a/Assets/Graphics/Thumbs.db.meta b/Assets/Graphics/Thumbs.db.meta new file mode 100644 index 0000000..51718ea --- /dev/null +++ b/Assets/Graphics/Thumbs.db.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b048ebc241f547488143f31e2faabf6 +timeCreated: 1447172965 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index f6defc5..a5a6327 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -29,6 +29,14 @@ public class PlayerBehavior : MonoBehaviour { anim.SetBool("Ground", false); rb.AddForce(new Vector2(0, jumpForce)); } + + //for the shooting animations + if (Input.GetButtonDown ("Fire1")) { + anim.SetBool("Shooting", true); + + } else { + anim.SetBool ("Shooting", false); + } } void FixedUpdate() diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f3abab5..24b2ed9 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -8,6 +8,7 @@ PlayerSettings: defaultScreenOrientation: 4 targetDevice: 2 targetResolution: 0 + useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: Laboratoire_2_Equipe_2 @@ -28,6 +29,7 @@ PlayerSettings: androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 + iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -135,6 +137,15 @@ PlayerSettings: iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 iOSLaunchScreenCustomXibPath: + iOSLaunchScreeniPadType: 0 + iOSLaunchScreeniPadImage: {fileID: 0} + iOSLaunchScreeniPadBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreeniPadFillPct: 100 + iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: + iOSDeviceRequirements: [] AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -224,6 +235,8 @@ PlayerSettings: ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -245,6 +258,7 @@ PlayerSettings: ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 ps4attribShareSupport: 0 + ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e040c5c..8a062e6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.0f3 +m_EditorVersion: 5.2.1f1 m_StandardAssetsVersion: 0