diff --git a/RWM-P2-TEAM-C/Assets/Animations/Player/Idle_Shoot_Animation.anim b/RWM-P2-TEAM-C/Assets/Animations/Player/Idle_Shoot_Animation.anim new file mode 100644 index 0000000..7f1451b --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Player/Idle_Shoot_Animation.anim @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle_Shoot_Animation + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -987661838687446635, guid: 31b7072394dd43844af6f583ac5307b0, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -987661838687446635, guid: 31b7072394dd43844af6f583ac5307b0, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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_Events: [] diff --git a/RWM-P2-TEAM-C/Assets/Animations/Player/Idle_Shoot_Animation.anim.meta b/RWM-P2-TEAM-C/Assets/Animations/Player/Idle_Shoot_Animation.anim.meta new file mode 100644 index 0000000..f44250f --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Player/Idle_Shoot_Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a0ee43bad210524fb68153a20dcd6e2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Animations/Player/Jumping_Shooting_Animation.anim b/RWM-P2-TEAM-C/Assets/Animations/Player/Jumping_Shooting_Animation.anim new file mode 100644 index 0000000..802a997 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Player/Jumping_Shooting_Animation.anim @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Jumping_Shooting_Animation + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 8205761894758743175, guid: 31b7072394dd43844af6f583ac5307b0, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 8205761894758743175, guid: 31b7072394dd43844af6f583ac5307b0, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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_Events: [] diff --git a/RWM-P2-TEAM-C/Assets/Animations/Player/Jumping_Shooting_Animation.anim.meta b/RWM-P2-TEAM-C/Assets/Animations/Player/Jumping_Shooting_Animation.anim.meta new file mode 100644 index 0000000..3859629 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Player/Jumping_Shooting_Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e9ffcc75cc8ad840a33e0aa5ef51266 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Animations/Player/Left_Animation.anim b/RWM-P2-TEAM-C/Assets/Animations/Player/Left_Animation.anim index b95a74a..4855288 100644 --- a/RWM-P2-TEAM-C/Assets/Animations/Player/Left_Animation.anim +++ b/RWM-P2-TEAM-C/Assets/Animations/Player/Left_Animation.anim @@ -32,7 +32,7 @@ AnimationClip: value: {fileID: -5962389079421231736, guid: 158cc7ffc66fe014fbf16c32faf9fc58, type: 3} - time: 0.53333336 - value: {fileID: -5962389079421231736, guid: 158cc7ffc66fe014fbf16c32faf9fc58, + value: {fileID: -1259408508766424310, guid: 158cc7ffc66fe014fbf16c32faf9fc58, type: 3} attribute: m_Sprite path: @@ -57,7 +57,7 @@ AnimationClip: - {fileID: -5962389079421231736, guid: 158cc7ffc66fe014fbf16c32faf9fc58, type: 3} - {fileID: 2788568348960109317, guid: 158cc7ffc66fe014fbf16c32faf9fc58, type: 3} - {fileID: -5962389079421231736, guid: 158cc7ffc66fe014fbf16c32faf9fc58, type: 3} - - {fileID: -5962389079421231736, guid: 158cc7ffc66fe014fbf16c32faf9fc58, type: 3} + - {fileID: -1259408508766424310, guid: 158cc7ffc66fe014fbf16c32faf9fc58, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/RWM-P2-TEAM-C/Assets/Animations/Player/Player.controller b/RWM-P2-TEAM-C/Assets/Animations/Player/Player.controller index 2771514..12b2ca7 100644 --- a/RWM-P2-TEAM-C/Assets/Animations/Player/Player.controller +++ b/RWM-P2-TEAM-C/Assets/Animations/Player/Player.controller @@ -1,5 +1,77 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-9158162720415348187 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5627657771534494285} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7753429104686804206 +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: isShooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3262392538553935166} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7371396438119360998 +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: isShooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5855026213383108265} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7222222 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-7157073260073572459 AnimatorState: serializedVersion: 6 @@ -13,6 +85,7 @@ AnimatorState: m_Transitions: - {fileID: 360246887640733534} - {fileID: 5135030598657633806} + - {fileID: 5103116358505033846} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -28,6 +101,136 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-6599425270347257068 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7157073260073572459} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-4275255265971592061 +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: isShooting + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: grounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3262392538553935166} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.54545456 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3460468046897411339 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isShooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7157073260073572459} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.54545456 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-3260977326398337211 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walking_Shooting_Animation + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3662948406887936081} + 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: 52ce1345d277b3245a5dce38956a158f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-1446357247693605260 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isShooting + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: grounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5732518890929438716} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-934421538649622587 AnimatorStateMachine: serializedVersion: 6 @@ -42,10 +245,19 @@ AnimatorStateMachine: m_Position: {x: 220, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -7157073260073572459} - m_Position: {x: 560, y: 110, z: 0} + m_Position: {x: 550, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: 5732518890929438716} - m_Position: {x: 370, y: 240, z: 0} + m_Position: {x: 420, y: 340, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5855026213383108265} + m_Position: {x: 220, y: 250, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5627657771534494285} + m_Position: {x: 650, y: -140, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3262392538553935166} + m_Position: {x: 670, y: 340, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -56,6 +268,56 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 7021936351012345101} +--- !u!1101 &-434716195497525013 +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: isShooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4831095165246816765} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7222222 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-391511667270538037 +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: isShooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3260977326398337211} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.54545456 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -70,25 +332,31 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: idle m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: movingRight m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: grounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} + - m_Name: isShooting + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -109,25 +377,181 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: grounded - m_EventTreshold: 0 + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: grounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7021936351012345101} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &360246887640733534 +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: idle + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7021936351012345101} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.42307693 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &889869215574287326 +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: movingLeft + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7157073260073572459} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7222222 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &962715305746924286 +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: movingRight + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: grounded + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: isShooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5627657771534494285} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1681107102371482298 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: grounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5732518890929438716} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7222222 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2600638379910868540 +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: movingLeft + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: grounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7157073260073572459} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2974880970468033214 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 7021936351012345101} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 + m_ExitTime: 0.42307693 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &360246887640733534 +--- !u!1101 &3047226110064603715 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -136,23 +560,57 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: idle + m_ConditionEvent: grounded + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: isShooting + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: movingLeft m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 7021936351012345101} + m_DstState: {fileID: 5627657771534494285} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.42307693 + m_ExitTime: 0 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &889869215574287326 +--- !u!1102 &3262392538553935166 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Jumping_Shooting_Animation + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1446357247693605260} + - {fileID: 8540154963813014323} + 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: 0e9ffcc75cc8ad840a33e0aa5ef51266, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &3330391915790669399 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -160,24 +618,24 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: movingLeft + - m_ConditionMode: 2 + m_ConditionEvent: isShooting m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -7157073260073572459} + m_DstState: {fileID: 7021936351012345101} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.7222222 + m_ExitTime: 0 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1681107102371482298 +--- !u!1101 &3662948406887936081 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -186,23 +644,23 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: grounded + m_ConditionEvent: isShooting m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 5732518890929438716} + m_DstState: {fileID: -7157073260073572459} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.7222222 + m_ExitTime: 0.54545456 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &2600638379910868540 +--- !u!1101 &4569283778761419723 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -211,10 +669,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: movingLeft - m_EventTreshold: 0 - - m_ConditionMode: 1 - m_ConditionEvent: grounded + m_ConditionEvent: movingRight m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -7157073260073572459} @@ -224,13 +679,40 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0 + m_ExitTime: 0.7222222 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &2974880970468033214 +--- !u!1102 &4831095165246816765 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle_Shoot_Animation + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3330391915790669399} + 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: 8a0ee43bad210524fb68153a20dcd6e2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &4911513512301079233 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -239,20 +721,20 @@ AnimatorStateTransition: m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 7021936351012345101} + m_DstState: {fileID: 5855026213383108265} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.42307693 + m_ExitTime: 0.54545456 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &4569283778761419723 +--- !u!1101 &5103116358505033846 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -261,17 +743,45 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: movingRight + m_ConditionEvent: isShooting m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -7157073260073572459} + m_DstState: {fileID: 5627657771534494285} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.7222222 + m_ExitTime: 0.54545456 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5120831841029444968 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: grounded + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: isShooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3262392538553935166} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -346,6 +856,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &5627657771534494285 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walking_Shooting_Animation + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3460468046897411339} + - {fileID: -4275255265971592061} + 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: 52ce1345d277b3245a5dce38956a158f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &5732518890929438716 AnimatorState: serializedVersion: 6 @@ -359,6 +897,7 @@ AnimatorState: m_Transitions: - {fileID: 346008068557190396} - {fileID: 2600638379910868540} + - {fileID: -7753429104686804206} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -374,6 +913,58 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &5855026213383108265 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle_Shoot_Animation + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 7852421043070434702} + - {fileID: 5120831841029444968} + - {fileID: 3047226110064603715} + - {fileID: 962715305746924286} + 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: 8a0ee43bad210524fb68153a20dcd6e2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6014109821843112398 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5627657771534494285} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &7021936351012345101 AnimatorState: serializedVersion: 6 @@ -388,6 +979,7 @@ AnimatorState: - {fileID: 889869215574287326} - {fileID: 4569283778761419723} - {fileID: 1681107102371482298} + - {fileID: -7371396438119360998} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -403,3 +995,53 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &7852421043070434702 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isShooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7021936351012345101} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8540154963813014323 +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: grounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7021936351012345101} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/RWM-P2-TEAM-C/Assets/Animations/Player/Walking_Shooting_Animation.anim b/RWM-P2-TEAM-C/Assets/Animations/Player/Walking_Shooting_Animation.anim new file mode 100644 index 0000000..37de06f --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Player/Walking_Shooting_Animation.anim @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walking_Shooting_Animation + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 4262073813952020003, guid: 31b7072394dd43844af6f583ac5307b0, + type: 3} + - time: 0.13333334 + value: {fileID: -6387936343637127290, guid: 31b7072394dd43844af6f583ac5307b0, + type: 3} + - time: 0.26666668 + value: {fileID: 2986054469329132589, guid: 31b7072394dd43844af6f583ac5307b0, + type: 3} + - time: 0.4 + value: {fileID: -6387936343637127290, guid: 31b7072394dd43844af6f583ac5307b0, + type: 3} + - time: 0.53333336 + value: {fileID: 4262073813952020003, guid: 31b7072394dd43844af6f583ac5307b0, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 4262073813952020003, guid: 31b7072394dd43844af6f583ac5307b0, type: 3} + - {fileID: -6387936343637127290, guid: 31b7072394dd43844af6f583ac5307b0, type: 3} + - {fileID: 2986054469329132589, guid: 31b7072394dd43844af6f583ac5307b0, type: 3} + - {fileID: -6387936343637127290, guid: 31b7072394dd43844af6f583ac5307b0, type: 3} + - {fileID: 4262073813952020003, guid: 31b7072394dd43844af6f583ac5307b0, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.55 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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_Events: [] diff --git a/RWM-P2-TEAM-C/Assets/Animations/Player/Walking_Shooting_Animation.anim.meta b/RWM-P2-TEAM-C/Assets/Animations/Player/Walking_Shooting_Animation.anim.meta new file mode 100644 index 0000000..ebfffe5 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Player/Walking_Shooting_Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52ce1345d277b3245a5dce38956a158f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/InitTestScene637743311169211670.unity b/RWM-P2-TEAM-C/Assets/InitTestScene637743311169211670.unity new file mode 100644 index 0000000..227837d --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/InitTestScene637743311169211670.unity @@ -0,0 +1,417 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!114 &24210408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68f09f0f82599b5448579854e622a4c1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1323225515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d44e6804bc58be84ea71a619b468f150, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1377888090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f3e1b3cbf3fac6a459b1a602167ad311, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1956407220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1956407223} + - component: {fileID: 1956407222} + - component: {fileID: 1956407221} + m_Layer: 0 + m_Name: Code-based tests runner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1956407221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1956407220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3cf5cb9e1ef590c48b1f919f2a7bd895, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1956407222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1956407220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 102e512f651ee834f951a2516c1ea3b8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssembliesWithTests: + - Tests + - UnityEngine.TestRunner + testStartedEvent: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1956407221} + m_MethodName: TestStarted + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1323225515} + m_MethodName: TestStarted + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1377888090} + m_MethodName: TestStarted + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 24210408} + m_MethodName: TestStarted + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + testFinishedEvent: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1956407221} + m_MethodName: TestFinished + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1323225515} + m_MethodName: TestFinished + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1377888090} + m_MethodName: TestFinished + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 24210408} + m_MethodName: TestFinished + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + runStartedEvent: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1956407221} + m_MethodName: RunStarted + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1323225515} + m_MethodName: RunStarted + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1377888090} + m_MethodName: RunStarted + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 24210408} + m_MethodName: RunStarted + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + runFinishedEvent: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1956407221} + m_MethodName: RunFinished + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1323225515} + m_MethodName: RunFinished + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1377888090} + m_MethodName: RunFinished + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 24210408} + m_MethodName: RunFinished + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + settings: + filters: + - assemblyNames: [] + groupNames: [] + categoryNames: [] + testNames: + - Tests.ShootingBulletsTest.PlayerShootingBulletInIdleStateTest + synchronousOnly: 0 + sceneBased: 0 + originalScene: Assets/Scenes/PlayerTestScene.unity + bootstrapScene: Assets/InitTestScene637743311169211670.unity +--- !u!4 &1956407223 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1956407220} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/RWM-P2-TEAM-C/Assets/InitTestScene637743311169211670.unity.meta b/RWM-P2-TEAM-C/Assets/InitTestScene637743311169211670.unity.meta new file mode 100644 index 0000000..b5509e6 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/InitTestScene637743311169211670.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7d48f9bd36809ce4798051a348861420 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Prefabs.meta b/RWM-P2-TEAM-C/Assets/Prefabs.meta new file mode 100644 index 0000000..d521cd2 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1562246d3ea3a574c9ff3975802b6abe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Bullet.prefab b/RWM-P2-TEAM-C/Assets/Prefabs/Bullet.prefab new file mode 100644 index 0000000..b922d27 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Bullet.prefab @@ -0,0 +1,149 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5154881601171482382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5154881601171482371} + - component: {fileID: 5154881601171482380} + - component: {fileID: 5154881601171482381} + - component: {fileID: 5154881601171482370} + - component: {fileID: -2814063281457347250} + m_Layer: 0 + m_Name: Bullet + m_TagString: Bullet + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5154881601171482371 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5154881601171482382} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -88.03792, y: -3.5093899, z: -36.661827} + m_LocalScale: {x: 10, y: 10, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5154881601171482380 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5154881601171482382} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 769105629 + m_SortingLayer: 2 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 6d294ba3ccac623489f467ace592428d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.08, y: 0.08} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &5154881601171482381 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5154881601171482382} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.08, y: 0.08} + newSize: {x: 0.08, y: 0.08} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.08, y: 0.08} + m_EdgeRadius: 0 +--- !u!114 &5154881601171482370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5154881601171482382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1d072132f314bd744b78f6c7c5338dd9, type: 3} + m_Name: + m_EditorClassIdentifier: + bulletManager: {fileID: 0} + bulletDirection: 0 + speed: 20 + lifetime: 2 +--- !u!50 &-2814063281457347250 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5154881601171482382} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 1 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Bullet.prefab.meta b/RWM-P2-TEAM-C/Assets/Prefabs/Bullet.prefab.meta new file mode 100644 index 0000000..b12af2f --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Bullet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6229a9a1966c19441b3647cd59df0518 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Scenes/Game.unity b/RWM-P2-TEAM-C/Assets/Scenes/Game.unity index dff238b..2f2a9ac 100644 --- a/RWM-P2-TEAM-C/Assets/Scenes/Game.unity +++ b/RWM-P2-TEAM-C/Assets/Scenes/Game.unity @@ -312,7 +312,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -64.03, y: -7.14, z: -10} + m_LocalPosition: {x: -68.84, y: -7.14, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -446,6 +446,7 @@ GameObject: - component: {fileID: 706003887} - component: {fileID: 706003889} - component: {fileID: 706003890} + - component: {fileID: 706003891} m_Layer: 0 m_Name: Player m_TagString: Player @@ -511,8 +512,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 560560035 + m_SortingLayer: 4 m_SortingOrder: 0 m_Sprite: {fileID: 8020143640844766479, guid: 158cc7ffc66fe014fbf16c32faf9fc58, type: 3} @@ -571,6 +572,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65acb87fefd0f8042a3f8602ebf90a79, type: 3} m_Name: m_EditorClassIdentifier: + _timeBetweenShots: 0.25 + direction: -1 --- !u!50 &706003890 Rigidbody2D: serializedVersion: 4 @@ -592,6 +595,22 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 +--- !u!114 &706003891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706003884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 671dfec9c69239b4cbd5acb4d9bd85f3, type: 3} + m_Name: + m_EditorClassIdentifier: + bulletPrefab: {fileID: 5154881601171482382, guid: 6229a9a1966c19441b3647cd59df0518, + type: 3} + bulletMoveSpeed: 20 + bulletLifeTime: 1.5 --- !u!1 &794939022 GameObject: m_ObjectHideFlags: 0 @@ -924,8 +943,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1771201005 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 949788d5d08266e4bb4f34879fa217e4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/RWM-P2-TEAM-C/Assets/Scenes/PlayerTestScene.unity b/RWM-P2-TEAM-C/Assets/Scenes/PlayerTestScene.unity index 04725f2..4bde583 100644 --- a/RWM-P2-TEAM-C/Assets/Scenes/PlayerTestScene.unity +++ b/RWM-P2-TEAM-C/Assets/Scenes/PlayerTestScene.unity @@ -72,21 +72,21 @@ LightmapSettings: m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 - m_BakeBackend: 1 + m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 + m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentSampleCount: 500 m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -121,7 +121,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &130105539 +--- !u!1 &24663423 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -129,43 +129,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 130105540} - - component: {fileID: 130105541} + - component: {fileID: 24663424} + - component: {fileID: 24663425} m_Layer: 0 - m_Name: Ledge (3) + m_Name: Ledge (4) m_TagString: Ledge m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &130105540 +--- !u!4 &24663424 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 130105539} + m_GameObject: {fileID: 24663423} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -8.292, y: -1.819, z: -3696.5325} m_LocalScale: {x: 0.25, y: 0.25, z: 1} m_Children: [] - m_Father: {fileID: 1606905565} - m_RootOrder: 3 + m_Father: {fileID: 1392612456} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &130105541 +--- !u!61 &24663425 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 130105539} + m_GameObject: {fileID: 24663423} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 20.385574, y: 2.2616467} + m_Offset: {x: 46.437874, y: 2.282474} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -176,9 +176,9 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.7342377, y: 1.6279535} + m_Size: {x: 0.65592957, y: 1.6696081} m_EdgeRadius: 0 ---- !u!1 &455194387 +--- !u!1 &275450343 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -186,43 +186,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 455194388} - - component: {fileID: 455194389} + - component: {fileID: 275450344} + - component: {fileID: 275450345} m_Layer: 0 - m_Name: Ledge (5) + m_Name: Ledge (2) m_TagString: Ledge m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &455194388 +--- !u!4 &275450344 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 455194387} + m_GameObject: {fileID: 275450343} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -8.292, y: -1.819, z: -3696.5325} m_LocalScale: {x: 0.25, y: 0.25, z: 1} m_Children: [] - m_Father: {fileID: 1606905565} - m_RootOrder: 5 + m_Father: {fileID: 1392612456} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &455194389 +--- !u!61 &275450345 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 455194387} + m_GameObject: {fileID: 275450343} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 61.77932, y: 0.35304517} + m_Offset: {x: 10.846271, y: 0.38022375} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -233,9 +233,9 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.64582825, y: 1.6966375} + m_Size: {x: 0.6608486, y: 1.7604475} m_EdgeRadius: 0 ---- !u!1 &908297430 +--- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -243,43 +243,126 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 908297431} - - component: {fileID: 908297432} + - component: {fileID: 519420032} + - component: {fileID: 519420031} + - component: {fileID: 519420029} m_Layer: 0 - m_Name: Ledge (4) + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &519420029 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 +--- !u!20 &519420031 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0.17395504, b: 0.6509434, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 10.606969 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 0 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 0 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &519420032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -70.37, y: -7.14, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &629650137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629650138} + - component: {fileID: 629650139} + m_Layer: 0 + m_Name: Ledge (1) m_TagString: Ledge m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &908297431 +--- !u!4 &629650138 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 908297430} + m_GameObject: {fileID: 629650137} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -8.292, y: -1.819, z: -3696.5325} m_LocalScale: {x: 0.25, y: 0.25, z: 1} m_Children: [] - m_Father: {fileID: 1606905565} - m_RootOrder: 4 + m_Father: {fileID: 1392612456} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &908297432 +--- !u!61 &629650139 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 908297430} + m_GameObject: {fileID: 629650137} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 46.437874, y: 2.282474} + m_Offset: {x: 0.36110497, y: 0.3802238} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -290,9 +373,9 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.65592957, y: 1.6696081} + m_Size: {x: 0.60040665, y: 1.7034525} m_EdgeRadius: 0 ---- !u!1 &914996117 +--- !u!1 &642322026 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -300,78 +383,106 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 914996123} - - component: {fileID: 914996122} - - component: {fileID: 914996121} - - component: {fileID: 914996120} - - component: {fileID: 914996119} - - component: {fileID: 914996118} + - component: {fileID: 642322027} + - component: {fileID: 642322028} m_Layer: 0 - m_Name: Player - m_TagString: Player + m_Name: Ledge (3) + m_TagString: Ledge m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!50 &914996118 -Rigidbody2D: - serializedVersion: 4 +--- !u!4 &642322027 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 914996117} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0 - m_GravityScale: 6 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!114 &914996119 -MonoBehaviour: + m_GameObject: {fileID: 642322026} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -8.292, y: -1.819, z: -3696.5325} + m_LocalScale: {x: 0.25, y: 0.25, z: 1} + m_Children: [] + m_Father: {fileID: 1392612456} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &642322028 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 914996117} + m_GameObject: {fileID: 642322026} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65acb87fefd0f8042a3f8602ebf90a79, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!95 &914996120 -Animator: - serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 20.385574, y: 2.2616467} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.7342377, y: 1.6279535} + m_EdgeRadius: 0 +--- !u!1 &706003884 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 914996117} + serializedVersion: 6 + m_Component: + - component: {fileID: 706003888} + - component: {fileID: 706003885} + - component: {fileID: 706003886} + - component: {fileID: 706003887} + - component: {fileID: 706003889} + - component: {fileID: 706003890} + - component: {fileID: 706003891} + m_Layer: 0 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &706003885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706003884} m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: a7791ad96a917d045b668deab68c5949, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &914996121 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 434c82429ec95684889105cf450b2b69, type: 3} + m_Name: + m_EditorClassIdentifier: + _walkableSurfaceTagName: Ground + leftKey: 97 + rightKey: 100 + jumpKey: 32 + impluseJumpVel: 6 + TimeToReachMaxHeight: 0.5 + _movementTime: 0.2 + _MAX_WALKING_SPEED: 10 + acclearation: 17 + _LOWEST_WALKING_SPEED: 2 +--- !u!212 &706003886 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 914996117} + m_GameObject: {fileID: 706003884} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -401,8 +512,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 560560035 + m_SortingLayer: 4 m_SortingOrder: 0 m_Sprite: {fileID: 8020143640844766479, guid: 158cc7ffc66fe014fbf16c32faf9fc58, type: 3} @@ -416,100 +527,91 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &914996122 -MonoBehaviour: +--- !u!95 &706003887 +Animator: + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 914996117} + m_GameObject: {fileID: 706003884} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 434c82429ec95684889105cf450b2b69, type: 3} - m_Name: - m_EditorClassIdentifier: - _walkableSurfaceTagName: Ground - leftKey: 97 - rightKey: 100 - jumpKey: 32 - impluseJumpVel: 6 - TimeToReachMaxHeight: 0.5 - _movementTime: 0.2 - _MAX_WALKING_SPEED: 10 - acclearation: 17 - _LOWEST_WALKING_SPEED: 2 ---- !u!4 &914996123 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a7791ad96a917d045b668deab68c5949, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!4 &706003888 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 914996117} + m_GameObject: {fileID: 706003884} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -93.57, y: -7.38, z: -1} + m_LocalPosition: {x: -83.1, y: -7.25, z: -1} m_LocalScale: {x: 12, y: 12, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1020896803 -GameObject: +--- !u!114 &706003889 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1020896804} - - component: {fileID: 1020896805} - m_Layer: 0 - m_Name: Ledge (1) - m_TagString: Ledge - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1020896804 -Transform: + m_GameObject: {fileID: 706003884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 65acb87fefd0f8042a3f8602ebf90a79, type: 3} + m_Name: + m_EditorClassIdentifier: + _timeBetweenShots: 0.25 + direction: -1 +--- !u!50 &706003890 +Rigidbody2D: + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1020896803} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -8.292, y: -1.819, z: -3696.5325} - m_LocalScale: {x: 0.25, y: 0.25, z: 1} - m_Children: [] - m_Father: {fileID: 1606905565} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1020896805 -BoxCollider2D: + m_GameObject: {fileID: 706003884} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0 + m_GravityScale: 6 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!114 &706003891 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1020896803} + m_GameObject: {fileID: 706003884} m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.36110497, y: 0.3802238} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.60040665, y: 1.7034525} - m_EdgeRadius: 0 ---- !u!1 &1419324328 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 671dfec9c69239b4cbd5acb4d9bd85f3, type: 3} + m_Name: + m_EditorClassIdentifier: + bulletPrefab: {fileID: 5154881601171482382, guid: 6229a9a1966c19441b3647cd59df0518, + type: 3} + bulletMoveSpeed: 20 + bulletLifeTime: 1.5 +--- !u!1 &794939022 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -517,43 +619,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1419324329} - - component: {fileID: 1419324330} + - component: {fileID: 794939023} + - component: {fileID: 794939024} m_Layer: 0 - m_Name: LevelBoundary + m_Name: LevelBoundary(2) m_TagString: Boundary m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1419324329 +--- !u!4 &794939023 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1419324328} + m_GameObject: {fileID: 794939022} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -20.03, y: -0.93818176, z: -3748.487} + m_LocalPosition: {x: -17.466667, y: -0.93818176, z: -3748.487} m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 1} m_Children: [] - m_Father: {fileID: 1606905565} - m_RootOrder: 6 + m_Father: {fileID: 1392612456} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1419324330 +--- !u!61 &794939024 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1419324328} + m_GameObject: {fileID: 794939022} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 13.190296, y: 5.6193085} + m_Offset: {x: 104.914444, y: 29.262726} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -564,9 +666,9 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1.2209396, y: 45.9673} + m_Size: {x: 212.65259, y: 0.84617615} m_EdgeRadius: 0 ---- !u!1 &1461524971 +--- !u!1 &836003769 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -574,43 +676,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1461524972} - - component: {fileID: 1461524973} + - component: {fileID: 836003770} + - component: {fileID: 836003771} m_Layer: 0 - m_Name: Ledge (2) - m_TagString: Ledge + m_Name: LevelBoundary(3) + m_TagString: Boundary m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1461524972 +--- !u!4 &836003770 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461524971} + m_GameObject: {fileID: 836003769} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -8.292, y: -1.819, z: -3696.5325} - m_LocalScale: {x: 0.25, y: 0.25, z: 1} + m_LocalPosition: {x: 15.646667, y: -0.93818176, z: -3748.487} + m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 1} m_Children: [] - m_Father: {fileID: 1606905565} - m_RootOrder: 2 + m_Father: {fileID: 1392612456} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1461524973 +--- !u!61 &836003771 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461524971} + m_GameObject: {fileID: 836003769} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 10.846271, y: 0.38022375} + m_Offset: {x: 13.190296, y: 5.6193085} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -621,9 +723,9 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.6608486, y: 1.7604475} + m_Size: {x: 1.2209396, y: 45.9673} m_EdgeRadius: 0 ---- !u!1 &1473669497 +--- !u!1 &1083052252 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -631,36 +733,22 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1473669498} - - component: {fileID: 1473669499} + - component: {fileID: 1083052254} + - component: {fileID: 1083052253} m_Layer: 0 - m_Name: LevelBoundary(3) + m_Name: LevelBoundary m_TagString: Boundary m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1473669498 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1473669497} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 15.646667, y: -0.93818176, z: -3748.487} - m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 1} - m_Children: [] - m_Father: {fileID: 1606905565} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1473669499 +--- !u!61 &1083052253 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1473669497} + m_GameObject: {fileID: 1083052252} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -680,7 +768,21 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.2209396, y: 45.9673} m_EdgeRadius: 0 ---- !u!1 &1606905559 +--- !u!4 &1083052254 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1083052252} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -20.03, y: -0.93818176, z: -3748.487} + m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 1} + m_Children: [] + m_Father: {fileID: 1392612456} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1392612450 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -688,12 +790,12 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1606905565} - - component: {fileID: 1606905564} - - component: {fileID: 1606905563} - - component: {fileID: 1606905562} - - component: {fileID: 1606905561} - - component: {fileID: 1606905560} + - component: {fileID: 1392612456} + - component: {fileID: 1392612455} + - component: {fileID: 1392612454} + - component: {fileID: 1392612453} + - component: {fileID: 1392612452} + - component: {fileID: 1392612451} m_Layer: 0 m_Name: Ground m_TagString: Ground @@ -701,13 +803,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!61 &1606905560 +--- !u!61 &1392612451 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1606905559} + m_GameObject: {fileID: 1392612450} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -727,13 +829,13 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 6.6008615, y: 0.14668226} m_EdgeRadius: 0 ---- !u!61 &1606905561 +--- !u!61 &1392612452 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1606905559} + m_GameObject: {fileID: 1392612450} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -753,13 +855,13 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 12.8074465, y: 0.1395874} m_EdgeRadius: 0 ---- !u!61 &1606905562 +--- !u!61 &1392612453 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1606905559} + m_GameObject: {fileID: 1392612450} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -779,13 +881,13 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.7830534, y: 0.15336466} m_EdgeRadius: 0 ---- !u!61 &1606905563 +--- !u!61 &1392612454 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1606905559} + m_GameObject: {fileID: 1392612450} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -805,13 +907,13 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 35.41175, y: 0.16890907} m_EdgeRadius: 0 ---- !u!212 &1606905564 +--- !u!212 &1392612455 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1606905559} + m_GameObject: {fileID: 1392612450} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -841,8 +943,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1771201005 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 949788d5d08266e4bb4f34879fa217e4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -855,30 +957,30 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1606905565 +--- !u!4 &1392612456 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1606905559} + m_GameObject: {fileID: 1392612450} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 5, y: 3, z: 0} m_LocalScale: {x: 6, y: 6, z: 1} m_Children: - - {fileID: 1876424950} - - {fileID: 1020896804} - - {fileID: 1461524972} - - {fileID: 130105540} - - {fileID: 908297431} - - {fileID: 455194388} - - {fileID: 1419324329} - - {fileID: 2119279956} - - {fileID: 1473669498} + - {fileID: 1710361196} + - {fileID: 629650138} + - {fileID: 275450344} + - {fileID: 642322027} + - {fileID: 24663424} + - {fileID: 2110352887} + - {fileID: 1083052254} + - {fileID: 794939023} + - {fileID: 836003770} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1876424949 +--- !u!1 &1710361195 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -886,8 +988,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1876424950} - - component: {fileID: 1876424951} + - component: {fileID: 1710361196} + - component: {fileID: 1710361197} m_Layer: 0 m_Name: Ledge m_TagString: Ledge @@ -895,27 +997,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1876424950 +--- !u!4 &1710361196 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1876424949} + m_GameObject: {fileID: 1710361195} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10.005, y: -1.819, z: -3696.5325} m_LocalScale: {x: 0.25, y: 0.25, z: 1} m_Children: [] - m_Father: {fileID: 1606905565} + m_Father: {fileID: 1392612456} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1876424951 +--- !u!61 &1710361197 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1876424949} + m_GameObject: {fileID: 1710361195} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -935,7 +1037,7 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.60040665, y: 1.7604475} m_EdgeRadius: 0 ---- !u!1 &2042494159 +--- !u!1 &2110352886 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -943,126 +1045,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2042494162} - - component: {fileID: 2042494161} - - component: {fileID: 2042494160} + - component: {fileID: 2110352887} + - component: {fileID: 2110352888} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &2042494160 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2042494159} - m_Enabled: 1 ---- !u!20 &2042494161 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2042494159} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &2042494162 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2042494159} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2119279955 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2119279956} - - component: {fileID: 2119279957} - m_Layer: 0 - m_Name: LevelBoundary(2) - m_TagString: Boundary + m_Name: Ledge (5) + m_TagString: Ledge m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2119279956 +--- !u!4 &2110352887 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2119279955} + m_GameObject: {fileID: 2110352886} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -17.466667, y: -0.93818176, z: -3748.487} - m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 1} + m_LocalPosition: {x: -8.292, y: -1.819, z: -3696.5325} + m_LocalScale: {x: 0.25, y: 0.25, z: 1} m_Children: [] - m_Father: {fileID: 1606905565} - m_RootOrder: 7 + m_Father: {fileID: 1392612456} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &2119279957 +--- !u!61 &2110352888 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2119279955} + m_GameObject: {fileID: 2110352886} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 104.914444, y: 29.262726} + m_Offset: {x: 61.77932, y: 0.35304517} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -1073,5 +1092,5 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 212.65259, y: 0.84617615} + m_Size: {x: 0.64582825, y: 1.6966375} m_EdgeRadius: 0 diff --git a/RWM-P2-TEAM-C/Assets/Scenes/PlayerTestScene.unity.meta b/RWM-P2-TEAM-C/Assets/Scenes/PlayerTestScene.unity.meta index 6a40c2d..dc80cb6 100644 --- a/RWM-P2-TEAM-C/Assets/Scenes/PlayerTestScene.unity.meta +++ b/RWM-P2-TEAM-C/Assets/Scenes/PlayerTestScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7ca3673c25a388e40a7b4e63568b9f53 +guid: 7b4364dc8444cf34ebba727ce94fa90f DefaultImporter: externalObjects: {} userData: diff --git a/RWM-P2-TEAM-C/Assets/Scripts/Bullet.cs b/RWM-P2-TEAM-C/Assets/Scripts/Bullet.cs new file mode 100644 index 0000000..938fdaa --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Scripts/Bullet.cs @@ -0,0 +1,50 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Bullet : MonoBehaviour +{ + public BulletManager bulletManager; + public float bulletDirection; + public float speed; + public float lifetime; + + // Update is called once per frame + + void Start() + { + StartCoroutine("livingTime"); + + if (null == bulletManager) { bulletManager = GameObject.Find("Player").GetComponent(); } + + transform.position = GameObject.Find("Player").transform.position; + bulletDirection = GameObject.Find("Player").GetComponent().direction; + bulletManager.increaseBullets(); + } + + void Update() + { + transform.position += new Vector3((bulletDirection * speed) * Time.deltaTime, 0); + } + + void OnTriggerEnter2D(Collider2D t_other) + { + if (t_other.tag != "Player") + { + bulletManager.decreaseBullets(); // decrease total number of bullets + StopCoroutine("livingTime"); // stop the co-routine before destroying + Destroy(gameObject); + } + } + + + IEnumerator livingTime() + { + yield return new WaitForSeconds(lifetime); + + bulletManager.decreaseBullets(); // decrease total number of bullets + Destroy(gameObject); // destroy this after a set amount of time + + yield break; + } +} diff --git a/RWM-P2-TEAM-C/Assets/Scripts/Bullet.cs.meta b/RWM-P2-TEAM-C/Assets/Scripts/Bullet.cs.meta new file mode 100644 index 0000000..3571dbb --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Scripts/Bullet.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1d072132f314bd744b78f6c7c5338dd9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Scripts/BulletManager.cs b/RWM-P2-TEAM-C/Assets/Scripts/BulletManager.cs new file mode 100644 index 0000000..01749a5 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Scripts/BulletManager.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BulletManager : MonoBehaviour +{ + public GameObject bulletPrefab; + public float bulletMoveSpeed; + public float bulletLifeTime; + private const float MAX_BULLETS = 3; + public float currentBulletTotal; + + /// + /// Decrease the number of active bullets + /// + public void decreaseBullets() + { + if (currentBulletTotal <= 0) + { + currentBulletTotal = 0; + } + else + { + currentBulletTotal--; + } + } + + public void increaseBullets() + { + currentBulletTotal++; + } + + /// + /// Shoot a bullet in the direction Megaman is looking. + /// -1 for Left, 1 for Right. + /// + public void shootBullet() + { + if (currentBulletTotal < MAX_BULLETS) + { + Instantiate(bulletPrefab); + bulletPrefab.GetComponent().bulletManager = this; + bulletPrefab.GetComponent().speed = bulletMoveSpeed; + bulletPrefab.GetComponent().lifetime = bulletLifeTime; + } + } + + public bool canFire() + { + return currentBulletTotal < MAX_BULLETS; + } +} diff --git a/RWM-P2-TEAM-C/Assets/Scripts/BulletManager.cs.meta b/RWM-P2-TEAM-C/Assets/Scripts/BulletManager.cs.meta new file mode 100644 index 0000000..71f277c --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Scripts/BulletManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 671dfec9c69239b4cbd5acb4d9bd85f3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Scripts/PlayerController.cs b/RWM-P2-TEAM-C/Assets/Scripts/PlayerController.cs index 09cff6f..1961309 100644 --- a/RWM-P2-TEAM-C/Assets/Scripts/PlayerController.cs +++ b/RWM-P2-TEAM-C/Assets/Scripts/PlayerController.cs @@ -7,6 +7,12 @@ public class PlayerController : MonoBehaviour private Animator _animator; private Rigidbody2D _rb; private Runtime2DMovement _2dMovement; + private bool _isShooting = false; + private bool idleshoot; + public float _timeBetweenShots; + public int direction = -1; + private BulletManager _bulletManager; + void Start() { setUpPlayer(); @@ -26,6 +32,7 @@ void setUpPlayer() _rb.constraints = RigidbodyConstraints2D.FreezeRotation; _rb.gravityScale = 3; } + _bulletManager = gameObject.GetComponent(); } // Update is called once per frame @@ -36,6 +43,7 @@ void Update() void updatePlayerAnimationStates() { + getShootInput(); if (_2dMovement.getIsMovingLeft() && _2dMovement.getIsGrounded() && !_animator.GetBool("movingLeft")) { handleLeftAnimation(); @@ -60,6 +68,10 @@ void updatePlayerAnimationStates() { handleIdleAnimation(); } + + Vector3 temp = transform.localScale; + if (temp.x < 0) { direction = 1; } + if (temp.x > 0) { direction = -1; } } public void handleLeftAnimation() @@ -121,4 +133,48 @@ public void handleDirectionWhileJumping() transform.localScale = temp; } } + + void getShootInput() + { + if (Input.GetKeyDown(KeyCode.P) && _bulletManager.canFire()) + { + if (_rb.velocity.SqrMagnitude() <= 0 && _animator.GetBool("grounded")) + { + handleIdlePlayerShooting(); + } + else if (_rb.velocity.SqrMagnitude() > 0 && !idleshoot) + { + handleMovingPlayerShooting(); + } + } + } + + public void handleIdlePlayerShooting() + { + _isShooting = true; + idleshoot = true; + _2dMovement.setStopMovement(true); + _bulletManager.shootBullet(); + _animator.SetBool("isShooting", _isShooting); + StartCoroutine("shootingCooldown"); + } + + public void handleMovingPlayerShooting() + { + _isShooting = true; + _bulletManager.shootBullet(); + _animator.SetBool("isShooting", _isShooting); + StartCoroutine("shootingCooldown"); + } + + + IEnumerator shootingCooldown() + { + yield return new WaitForSeconds(_timeBetweenShots); + _isShooting = false; + idleshoot = false; + _2dMovement.setStopMovement(false); + yield return new WaitForSeconds(_timeBetweenShots); + _animator.SetBool("isShooting", _isShooting); + } } diff --git a/RWM-P2-TEAM-C/Assets/Sprites/Megaman-Standard-Bullet.png b/RWM-P2-TEAM-C/Assets/Sprites/Megaman-Standard-Bullet.png new file mode 100644 index 0000000..4c036ad Binary files /dev/null and b/RWM-P2-TEAM-C/Assets/Sprites/Megaman-Standard-Bullet.png differ diff --git a/RWM-P2-TEAM-C/Assets/Sprites/Megaman-Standard-Bullet.png.meta b/RWM-P2-TEAM-C/Assets/Sprites/Megaman-Standard-Bullet.png.meta new file mode 100644 index 0000000..1325ac4 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Sprites/Megaman-Standard-Bullet.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 6d294ba3ccac623489f467ace592428d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Sprites/shooting spritesheet.PNG b/RWM-P2-TEAM-C/Assets/Sprites/shooting spritesheet.PNG new file mode 100644 index 0000000..5a8bb6c Binary files /dev/null and b/RWM-P2-TEAM-C/Assets/Sprites/shooting spritesheet.PNG differ diff --git a/RWM-P2-TEAM-C/Assets/Sprites/shooting spritesheet.PNG.meta b/RWM-P2-TEAM-C/Assets/Sprites/shooting spritesheet.PNG.meta new file mode 100644 index 0000000..5d5ae59 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Sprites/shooting spritesheet.PNG.meta @@ -0,0 +1,224 @@ +fileFormatVersion: 2 +guid: 31b7072394dd43844af6f583ac5307b0 +TextureImporter: + internalIDToNameTable: + - first: + 213: -987661838687446635 + second: shooting spritesheet_0 + - first: + 213: 4262073813952020003 + second: shooting spritesheet_1 + - first: + 213: -6387936343637127290 + second: shooting spritesheet_2 + - first: + 213: 2986054469329132589 + second: shooting spritesheet_3 + - first: + 213: 8205761894758743175 + second: shooting spritesheet_4 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: shooting spritesheet_0 + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 31 + height: 28 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 59953d26ace1b42f0800000000000000 + internalID: -987661838687446635 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: shooting spritesheet_1 + rect: + serializedVersion: 2 + x: 38 + y: 5 + width: 29 + height: 27 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 32eba176d8de52b30800000000000000 + internalID: 4262073813952020003 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: shooting spritesheet_2 + rect: + serializedVersion: 2 + x: 71 + y: 5 + width: 25 + height: 27 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 68f83bd7dbd7957a0800000000000000 + internalID: -6387936343637127290 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: shooting spritesheet_3 + rect: + serializedVersion: 2 + x: 103 + y: 5 + width: 30 + height: 27 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d2c945418b8907920800000000000000 + internalID: 2986054469329132589 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: shooting spritesheet_4 + rect: + serializedVersion: 2 + x: 140 + y: 1 + width: 29 + height: 31 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 78cf780a7f8b0e170800000000000000 + internalID: 8205761894758743175 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Tests/BackgroundLevelTest.cs b/RWM-P2-TEAM-C/Assets/Tests/BackgroundLevelTest.cs index 3833b3e..1782203 100644 --- a/RWM-P2-TEAM-C/Assets/Tests/BackgroundLevelTest.cs +++ b/RWM-P2-TEAM-C/Assets/Tests/BackgroundLevelTest.cs @@ -62,7 +62,7 @@ public IEnumerator PlayerCanInJumpOntoLedgeTest() _2dMovement.impluseJumpVel = 30.0f; _2dMovement.handleRightInput(); _2dMovement.moveRight(); - yield return new WaitForSeconds(3.5f); + yield return new WaitForSeconds(2.5f); _2dMovement.intialJump(); yield return new WaitForSeconds(1.0f); Assert.Greater(_rb.position.y, intialYPos); @@ -76,7 +76,7 @@ public IEnumerator PlayerCannotWalkOffLevelTest() setUpPlayer(); _2dMovement.handleLeftInput(); _2dMovement.moveLeft(); - yield return new WaitForSeconds(1.0f); + yield return new WaitForSeconds(2.5f); Assert.AreEqual(false, _animator.GetBool("walkingLeft")); } diff --git a/RWM-P2-TEAM-C/Assets/Tests/PlayerShootingTests.cs b/RWM-P2-TEAM-C/Assets/Tests/PlayerShootingTests.cs new file mode 100644 index 0000000..69590f0 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Tests/PlayerShootingTests.cs @@ -0,0 +1,93 @@ +using System.Collections; +using System.Collections.Generic; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; +using UnityEngine.SceneManagement; + +namespace Tests +{ + public class PlayerShootingTests + { + private GameObject _player; + private Animator _animator; + private Runtime2DMovement _2dMovement; + private PlayerController _playerController; + + [SetUp] + public void Setup() + { + SceneManager.LoadScene("PlayerTestScene", LoadSceneMode.Single); + } + + [TearDown] + public void Teardown() + { + SceneManager.UnloadSceneAsync("PlayerTestScene"); + } + + [UnityTest] + public IEnumerator playerIdlePlayerShootingTest() + { + setUpPlayer(); + yield return new WaitForSeconds(1.0f); + Assert.AreEqual(true, _animator.GetBool("idle")); + _playerController.handleIdlePlayerShooting(); + yield return new WaitForSeconds(0.1f); + Assert.AreEqual(true, _animator.GetBool("isShooting")); + Assert.AreEqual(true, (_player.GetComponent().velocity.sqrMagnitude <= 0)); + } + + [UnityTest] + public IEnumerator playerWalkingRightShootingTest() + { + setUpPlayer(); + _2dMovement.handleRightInput(); + _2dMovement.moveRight(); + _playerController.handleRightAnimation(); + yield return new WaitForSeconds(1.0f); + Assert.AreEqual(true, _animator.GetBool("movingRight")); + _playerController.handleMovingPlayerShooting(); + Assert.AreEqual(true, _animator.GetBool("isShooting")); + yield return new WaitForSeconds(0.1f); + Assert.AreEqual(true, (_player.GetComponent().velocity.sqrMagnitude > 0)); + } + + [UnityTest] + public IEnumerator playerWalkingLeftShootingTest() + { + setUpPlayer(); + _2dMovement.handleLeftInput(); + _2dMovement.moveLeft(); + _playerController.handleLeftAnimation(); + yield return new WaitForSeconds(1.0f); + Assert.AreEqual(true, _animator.GetBool("movingLeft")); + _playerController.handleMovingPlayerShooting(); + Assert.AreEqual(true, _animator.GetBool("isShooting")); + yield return new WaitForSeconds(0.1f); + Assert.AreEqual(true, (_player.GetComponent().velocity.sqrMagnitude > 0)); + } + + [UnityTest] + public IEnumerator playerJumpingtShootingTest() + { + setUpPlayer(); + _2dMovement.handleJumpInput(); + _playerController.handleJumpAnimationWhileIdle(); + yield return new WaitForSeconds(0.05f); + Assert.AreEqual(false, _animator.GetBool("grounded")); + _playerController.handleMovingPlayerShooting(); + Assert.AreEqual(true, _animator.GetBool("isShooting")); + yield return new WaitForSeconds(0.1f); + Assert.AreEqual(true, (_player.GetComponent().velocity.sqrMagnitude > 0)); + } + + private void setUpPlayer() + { + _player = GameObject.Find("Player"); + _animator = _player.GetComponent(); + _2dMovement = _player.GetComponent(); + _playerController = _player.GetComponent(); + } + } +} diff --git a/RWM-P2-TEAM-C/Assets/Tests/PlayerShootingTests.cs.meta b/RWM-P2-TEAM-C/Assets/Tests/PlayerShootingTests.cs.meta new file mode 100644 index 0000000..6a1e2eb --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Tests/PlayerShootingTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9513f4974c0c5c443a24ef3cd73b44fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Tests/ShootingBulletsTest.cs b/RWM-P2-TEAM-C/Assets/Tests/ShootingBulletsTest.cs new file mode 100644 index 0000000..919d7d4 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Tests/ShootingBulletsTest.cs @@ -0,0 +1,101 @@ +using System.Collections; +using System.Collections.Generic; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; +using UnityEngine.SceneManagement; + +namespace Tests +{ + public class ShootingBulletsTest + { + private GameObject _player; + private Animator _animator; + private Runtime2DMovement _2dMovement; + private PlayerController _playerController; + + [SetUp] + public void Setup() + { + SceneManager.LoadScene("PlayerTestScene", LoadSceneMode.Single); + } + + [TearDown] + public void Teardown() + { + SceneManager.UnloadSceneAsync("PlayerTestScene"); + } + + [UnityTest] + public IEnumerator PlayerShootingBulletInIdleStateTest() + { + setUpPlayer(); + yield return new WaitForSeconds(1.0f); + Assert.AreEqual(true, _animator.GetBool("idle")); + _playerController.handleIdlePlayerShooting(); + yield return new WaitForSeconds(0.1f); + Assert.AreEqual(true, _animator.GetBool("isShooting")); + GameObject bullet = GameObject.Find("Bullet(Clone)"); + Assert.AreEqual(-1, bullet.GetComponent().bulletDirection); + Assert.Less(bullet.GetComponent().transform.position.x, _player.GetComponent().position.x); + } + + [UnityTest] + public IEnumerator PlayerShootingBulletInWalkingLeftStateTest() + { + setUpPlayer(); + _2dMovement.handleLeftInput(); + _2dMovement.moveLeft(); + _playerController.handleLeftAnimation(); + yield return new WaitForSeconds(1.0f); + Assert.AreEqual(true, _animator.GetBool("movingLeft")); + _playerController.handleMovingPlayerShooting(); + yield return new WaitForSeconds(0.1f); + Assert.AreEqual(true, _animator.GetBool("isShooting")); + GameObject bullet = GameObject.Find("Bullet(Clone)"); + Assert.AreEqual(-1, bullet.GetComponent().bulletDirection); + Assert.Less(bullet.GetComponent().transform.position.x, _player.GetComponent().position.x); + } + + [UnityTest] + public IEnumerator PlayerShootingBulletInWalkingRightStateTest() + { + setUpPlayer(); + _2dMovement.handleRightInput(); + _2dMovement.moveRight(); + _playerController.handleRightAnimation(); + yield return new WaitForSeconds(1.0f); + Assert.AreEqual(true, _animator.GetBool("movingRight")); + _playerController.handleMovingPlayerShooting(); + yield return new WaitForSeconds(0.1f); + Assert.AreEqual(true, _animator.GetBool("isShooting")); + GameObject bullet = GameObject.Find("Bullet(Clone)"); + Assert.AreEqual(1, bullet.GetComponent().bulletDirection); + Assert.Greater(bullet.GetComponent().transform.position.x, _player.GetComponent().position.x); + } + + [UnityTest] + public IEnumerator PlayerShootingBulletInJumpingTest() + { + setUpPlayer(); + _2dMovement.handleJumpInput(); + _playerController.handleJumpAnimationWhileIdle(); + yield return new WaitForSeconds(0.05f); + Assert.AreEqual(false, _animator.GetBool("grounded")); + _playerController.handleMovingPlayerShooting(); + yield return new WaitForSeconds(0.1f); + Assert.AreEqual(true, _animator.GetBool("isShooting")); + GameObject bullet = GameObject.Find("Bullet(Clone)"); + Assert.AreEqual(-1, bullet.GetComponent().bulletDirection); + Assert.Less(bullet.GetComponent().transform.position.x, _player.GetComponent().position.x); + } + + private void setUpPlayer() + { + _player = GameObject.Find("Player"); + _animator = _player.GetComponent(); + _2dMovement = _player.GetComponent(); + _playerController = _player.GetComponent(); + } + } +} diff --git a/RWM-P2-TEAM-C/Assets/Tests/ShootingBulletsTest.cs.meta b/RWM-P2-TEAM-C/Assets/Tests/ShootingBulletsTest.cs.meta new file mode 100644 index 0000000..82c80da --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Tests/ShootingBulletsTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4da62a03ddf7db747a92e0cf9a1cdda3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/ProjectSettings/TagManager.asset b/RWM-P2-TEAM-C/ProjectSettings/TagManager.asset index 409c5f7..dba0405 100644 --- a/RWM-P2-TEAM-C/ProjectSettings/TagManager.asset +++ b/RWM-P2-TEAM-C/ProjectSettings/TagManager.asset @@ -46,3 +46,18 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + - name: Level + uniqueID: 2523766291 + locked: 0 + - name: Bullet + uniqueID: 769105629 + locked: 0 + - name: Enemy + uniqueID: 1823058899 + locked: 0 + - name: Player + uniqueID: 560560035 + locked: 0 + - name: Door + uniqueID: 3523397525 + locked: 0