diff --git a/CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity b/CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity index 7f31b24e43ba2071d5a64d3491495492bfed595f..f013a2d676a29c947d1b27eb3dc253ba89faef73 100644 --- a/CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity +++ b/CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity @@ -108,138 +108,191 @@ NavMeshSettings: tileSize: 256 accuratePlacement: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &319617866 +--- !u!1001 &254562271 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1941051258} + m_Modifications: + - target: {fileID: 4288749222566340, guid: 579cbbeb1411b874786580eb34574534, type: 2} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4288749222566340, guid: 579cbbeb1411b874786580eb34574534, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4288749222566340, guid: 579cbbeb1411b874786580eb34574534, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4288749222566340, guid: 579cbbeb1411b874786580eb34574534, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4288749222566340, guid: 579cbbeb1411b874786580eb34574534, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4288749222566340, guid: 579cbbeb1411b874786580eb34574534, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4288749222566340, guid: 579cbbeb1411b874786580eb34574534, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4288749222566340, guid: 579cbbeb1411b874786580eb34574534, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114136635433208434, guid: 579cbbeb1411b874786580eb34574534, + type: 2} + propertyPath: playerTwo + value: + objectReference: {fileID: 970431135} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 579cbbeb1411b874786580eb34574534, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &331967826 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 319617867} - - component: {fileID: 319617872} - - component: {fileID: 319617871} - - component: {fileID: 319617870} - - component: {fileID: 319617869} - - component: {fileID: 319617868} - - component: {fileID: 319617873} + - component: {fileID: 331967829} + - component: {fileID: 331967828} + - component: {fileID: 331967827} m_Layer: 0 - m_Name: Teather_Body - m_TagString: Untagged + m_Name: Barrier (3) + m_TagString: Barrier m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &319617867 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 319617866} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.8, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!233 &319617868 -HingeJoint2D: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 319617866} - m_Enabled: 1 - serializedVersion: 4 - m_EnableCollision: 0 - m_ConnectedRigidBody: {fileID: 467572817} - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_AutoConfigureConnectedAnchor: 0 - m_Anchor: {x: -0.8, y: 0} - m_ConnectedAnchor: {x: 0, y: 0} - m_UseMotor: 1 - m_Motor: - m_MotorSpeed: 0 - m_MaximumMotorForce: 10000 - m_UseLimits: 0 - m_AngleLimits: - m_LowerAngle: 0 - m_UpperAngle: 359 ---- !u!233 &319617869 -HingeJoint2D: +--- !u!212 &331967827 +SpriteRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 319617866} + m_GameObject: {fileID: 331967826} m_Enabled: 1 - serializedVersion: 4 - m_EnableCollision: 0 - m_ConnectedRigidBody: {fileID: 2091671637} - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_AutoConfigureConnectedAnchor: 0 - m_Anchor: {x: -0.08, y: 0} - m_ConnectedAnchor: {x: 0, y: 0} - m_UseMotor: 0 - m_Motor: - m_MotorSpeed: 0 - m_MaximumMotorForce: 10000 - m_UseLimits: 0 - m_AngleLimits: - m_LowerAngle: 0 - m_UpperAngle: 359 ---- !u!61 &319617870 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: dc9bbb5faa0846344bb01d4c4e3b987a, type: 3} + m_Color: {r: 0.039215688, g: 0.039215688, b: 0.039215688, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!61 &331967828 BoxCollider2D: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 319617866} - m_Enabled: 0 + m_GameObject: {fileID: 331967826} + m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: -0.0030164719, y: -0.03741741} m_SpriteTilingProperty: - border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} + border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.16, y: 0.16} + oldSize: {x: 5.12, y: 5.12} newSize: {x: 0.16, y: 0.16} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.16, y: 0.16} + m_Size: {x: 5.1135273, y: 4.9662952} m_EdgeRadius: 0 ---- !u!50 &319617871 -Rigidbody2D: - serializedVersion: 4 +--- !u!4 &331967829 +Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 319617866} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - 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 ---- !u!212 &319617872 + m_GameObject: {fileID: 331967826} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.216, y: 19.492, z: 0} + m_LocalScale: {x: 21.288282, y: -0.827292, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &539924686 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1849681674316268, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 539924687} + - component: {fileID: 539924688} + - component: {fileID: 539924689} + - component: {fileID: 539924690} + m_Layer: 0 + m_Name: CameraTarget + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &539924687 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4579606988426786, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 539924686} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 1} + m_Children: [] + m_Father: {fileID: 1941051258} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &539924688 SpriteRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 212402488118644578, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 319617866} - m_Enabled: 1 + m_GameObject: {fileID: 539924686} + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_MotionVectors: 1 @@ -265,53 +318,44 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 0.8931034, g: 0.41603476, b: 0.039401606, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.16, y: 0.16} + m_Size: {x: 0.2, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!114 &319617873 +--- !u!114 &539924689 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 114445429429291430, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 319617866} + m_GameObject: {fileID: 539924686} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b99857f6300f524c86692000bc5b334, type: 3} + m_Script: {fileID: 11500000, guid: c825d4bed5b4ef14dbdd77b3ceceb25e, type: 3} m_Name: m_EditorClassIdentifier: - left: {fileID: 2091671636} - right: {fileID: 467572816} ---- !u!1 &467572816 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 467572819} - - component: {fileID: 467572818} - - component: {fileID: 467572817} - m_Layer: 0 - m_Name: Shooty_Temp - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!50 &467572817 + AccelerationSpeed: 1 + MaxSpeed: 1 + cameraSpeed: 1 + AccelRatio: 0.7 + maxX: 30 + maxY: 30 + PlayerOne: {fileID: 970431135} + PlayerTwo: {fileID: 1530915660} +--- !u!50 &539924690 Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 50620234936771470, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 467572816} + m_GameObject: {fileID: 539924686} m_BodyType: 0 m_Simulated: 1 m_UseFullKinematicContacts: 0 @@ -319,18 +363,87 @@ Rigidbody2D: m_Mass: 1 m_LinearDrag: 0 m_AngularDrag: 0.05 - m_GravityScale: 1 + m_GravityScale: 0 m_Material: {fileID: 0} m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!212 &467572818 +--- !u!1001 &568827984 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4504003809388494, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2} + propertyPath: m_LocalPosition.x + value: -23.26 + objectReference: {fileID: 0} + - target: {fileID: 4504003809388494, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2} + propertyPath: m_LocalPosition.y + value: 6.14 + objectReference: {fileID: 0} + - target: {fileID: 4504003809388494, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4504003809388494, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4504003809388494, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4504003809388494, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4504003809388494, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4504003809388494, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114941791273446218, guid: 5eed0066b4268c14887ebeafd95873f0, + type: 2} + propertyPath: playerOne + value: + objectReference: {fileID: 1530915660} + - target: {fileID: 114941791273446218, guid: 5eed0066b4268c14887ebeafd95873f0, + type: 2} + propertyPath: playerTwo + value: + objectReference: {fileID: 970431135} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &826563813 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 826563816} + - component: {fileID: 826563815} + - component: {fileID: 826563814} + m_Layer: 0 + m_Name: Barrier + m_TagString: Barrier + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &826563814 SpriteRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 467572816} + m_GameObject: {fileID: 826563813} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -357,8 +470,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: dc9bbb5faa0846344bb01d4c4e3b987a, type: 3} + m_Color: {r: 0.039215688, g: 0.039215688, b: 0.039215688, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -367,23 +480,101 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!4 &467572819 +--- !u!61 &826563815 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 826563813} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0030164719, y: -0.03741741} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 5.12, y: 5.12} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 5.1135273, y: 4.9662952} + m_EdgeRadius: 0 +--- !u!4 &826563816 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 467572816} + m_GameObject: {fileID: 826563813} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.6, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 1} + m_LocalPosition: {x: 0.217, y: -19.1, z: 0} + m_LocalScale: {x: 21.288544, y: 0.58124524, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &970431135 stripped +GameObject: + m_PrefabParentObject: {fileID: 1015685231720104, guid: f5beac725b81ce84e9335ad6d595f36f, + type: 2} + m_PrefabInternal: {fileID: 1045664869} +--- !u!4 &970431140 stripped +Transform: + m_PrefabParentObject: {fileID: 4922380153090630, guid: f5beac725b81ce84e9335ad6d595f36f, + type: 2} + m_PrefabInternal: {fileID: 1045664869} +--- !u!1001 &1045664869 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1941051258} + m_Modifications: + - target: {fileID: 4922380153090630, guid: f5beac725b81ce84e9335ad6d595f36f, type: 2} + propertyPath: m_LocalPosition.x + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 4922380153090630, guid: f5beac725b81ce84e9335ad6d595f36f, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4922380153090630, guid: f5beac725b81ce84e9335ad6d595f36f, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4922380153090630, guid: f5beac725b81ce84e9335ad6d595f36f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4922380153090630, guid: f5beac725b81ce84e9335ad6d595f36f, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4922380153090630, guid: f5beac725b81ce84e9335ad6d595f36f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4922380153090630, guid: f5beac725b81ce84e9335ad6d595f36f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4922380153090630, guid: f5beac725b81ce84e9335ad6d595f36f, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: f5beac725b81ce84e9335ad6d595f36f, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1051337353 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 1364349108589580, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -392,8 +583,9 @@ GameObject: - component: {fileID: 1051337356} - component: {fileID: 1051337355} - component: {fileID: 1051337354} + - component: {fileID: 1051337359} m_Layer: 0 - m_Name: Main Camera + m_Name: PlayerCamera m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -402,28 +594,32 @@ GameObject: --- !u!81 &1051337354 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 81619200610853564, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1051337353} m_Enabled: 1 --- !u!124 &1051337355 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 124531846863175002, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1051337353} m_Enabled: 1 --- !u!92 &1051337356 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 92852386496634100, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1051337353} m_Enabled: 1 --- !u!20 &1051337357 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 20497405407853434, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1051337353} m_Enabled: 1 @@ -440,7 +636,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 18.72 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -459,14 +655,446 @@ Camera: --- !u!4 &1051337358 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 4710321825646756, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1051337353} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -7.29, z: -10} + m_LocalScale: {x: 3, y: 3, z: 1} + m_Children: [] + m_Father: {fileID: 1941051258} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1051337359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114860004238916526, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1051337353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc44086b1fbcdd741acfcf1c53a78c99, type: 3} + m_Name: + m_EditorClassIdentifier: + myTarget: {fileID: 539924686} + Z_ADJ: -10 + PLAYER_Y_ADJ: 14.66 + cameraLag: 30 +--- !u!1 &1154437410 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1154437412} + - component: {fileID: 1154437411} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1154437411 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1154437410} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: a48c4abbe2243e24996b04df8902e466, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 107.25544, y: 37.69958} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!4 &1154437412 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1154437410} 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_LocalPosition: {x: 0.4, y: 0.42, z: 0.30859375} + m_LocalScale: {x: 1, y: 1, z: -1} m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1530915660 stripped +GameObject: + m_PrefabParentObject: {fileID: 1572331492096810, guid: 579cbbeb1411b874786580eb34574534, + type: 2} + m_PrefabInternal: {fileID: 254562271} +--- !u!4 &1530915665 stripped +Transform: + m_PrefabParentObject: {fileID: 4288749222566340, guid: 579cbbeb1411b874786580eb34574534, + type: 2} + m_PrefabInternal: {fileID: 254562271} +--- !u!1 &1698995669 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1698995672} + - component: {fileID: 1698995671} + - component: {fileID: 1698995670} + m_Layer: 0 + m_Name: Barrier (1) + m_TagString: Barrier + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1698995670 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1698995669} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: dc9bbb5faa0846344bb01d4c4e3b987a, type: 3} + m_Color: {r: 0.039215688, g: 0.039215688, b: 0.039215688, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!61 &1698995671 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1698995669} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0030164719, y: -0.03741741} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 5.12, y: 5.12} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 5.1135273, y: 4.9662952} + m_EdgeRadius: 0 +--- !u!4 &1698995672 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1698995669} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 53.665, y: -0.778, z: 0} + m_LocalScale: {x: 0.48638585, y: 7.7381415, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1704310603 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1704310606} + - component: {fileID: 1704310605} + - component: {fileID: 1704310604} + m_Layer: 0 + m_Name: Barrier (2) + m_TagString: Barrier + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1704310604 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1704310603} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: dc9bbb5faa0846344bb01d4c4e3b987a, type: 3} + m_Color: {r: 0.039215688, g: 0.039215688, b: 0.039215688, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!61 &1704310605 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1704310603} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0030164719, y: -0.03741741} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 5.12, y: 5.12} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 5.1135273, y: 4.9662952} + m_EdgeRadius: 0 +--- !u!4 &1704310606 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1704310603} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -53.134, y: -0.096, z: 0} + m_LocalScale: {x: -0.3519798, y: 8.004621, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1941051255 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1248456438693984, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1941051258} + - component: {fileID: 1941051257} + - component: {fileID: 1941051256} + m_Layer: 0 + m_Name: Players + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!120 &1941051256 +LineRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 120924952204677274, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1941051255} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + m_Parameters: + serializedVersion: 2 + widthMultiplier: 0.15 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!114 &1941051257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114236137125434142, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1941051255} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 872cfe10c4cec4943a87446489414c90, type: 3} + m_Name: + m_EditorClassIdentifier: + engageDistance: 10 + elasticity: 1 + curDistance: 0 + playerOne: {fileID: 970431135} + playerTwo: {fileID: 1530915660} +--- !u!4 &1941051258 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4292959204018798, guid: 43a50026743875842b5906d0e5d8116f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1941051255} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 10.73, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 970431140} + - {fileID: 1530915665} + - {fileID: 539924687} + - {fileID: 1051337358} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1917853899 diff --git a/CMPT306_Fall2017/Assets/Prefabs.meta b/CMPT306_Fall2017/Assets/Prefabs.meta new file mode 100755 index 0000000000000000000000000000000000000000..ce292fe210618e8182b311019734e8e443d0600e --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 99848db0aedbf9a46885f33fe7791910 +folderAsset: yes +timeCreated: 1505949909 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Prefabs/Bullet.prefab b/CMPT306_Fall2017/Assets/Prefabs/Bullet.prefab new file mode 100644 index 0000000000000000000000000000000000000000..3df60a615e3e49c1b0e12e40a292c3ecff4bcf1b --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Bullet.prefab @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1253353341930176} + m_IsPrefabParent: 1 +--- !u!1 &1253353341930176 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4081714370824658} + - component: {fileID: 50928207620170448} + - component: {fileID: 58405650602429570} + - component: {fileID: 212661454963508516} + - component: {fileID: 114805036644153682} + m_Layer: 0 + m_Name: Bullet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4081714370824658 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1253353341930176} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.3753, y: 0.072, z: 0} + m_LocalScale: {x: 6.72, y: 4.25, z: 0.45533395} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &50928207620170448 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1253353341930176} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &58405650602429570 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1253353341930176} + 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} + serializedVersion: 2 + m_Radius: 0.03 +--- !u!114 &114805036644153682 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1253353341930176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 363947c89f62102459592507f28d17d8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!212 &212661454963508516 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1253353341930176} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4c0d5e33cca31f645af07cdd532d928f, type: 3} + m_Color: {r: 0.9467993, g: 1, b: 0.09558821, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 0.05117919, y: 0.08388711} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/CMPT306_Fall2017/Assets/Prefabs/Bullet.prefab.meta b/CMPT306_Fall2017/Assets/Prefabs/Bullet.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..46b9711c58a3414b359196b988bb155c06f7ccdd --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Bullet.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 7f6d6c9054649ed4eaa71bfc0c670086 +timeCreated: 1506476904 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Prefabs/Crosshair.prefab b/CMPT306_Fall2017/Assets/Prefabs/Crosshair.prefab new file mode 100644 index 0000000000000000000000000000000000000000..8b3271b43f32124ab29a701deec37cd44b59bb68 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Crosshair.prefab @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1536397821931000} + m_IsPrefabParent: 1 +--- !u!1 &1536397821931000 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4798587563927106} + - component: {fileID: 212361135042990830} + m_Layer: 0 + m_Name: Crosshair + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4798587563927106 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1536397821931000} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.8473, y: -1.5605961, 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} +--- !u!212 &212361135042990830 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1536397821931000} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 1e85f4a77f7ef514fbf963274b097ed9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.56, y: 2.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/CMPT306_Fall2017/Assets/Prefabs/Crosshair.prefab.meta b/CMPT306_Fall2017/Assets/Prefabs/Crosshair.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..6a76a380d642fdc6fcf8d57a00b092924916018e --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Crosshair.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 12d625172ca83dc438e54d9e8158bf5f +timeCreated: 1506564836 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Prefabs/Fighty.prefab b/CMPT306_Fall2017/Assets/Prefabs/Fighty.prefab new file mode 100644 index 0000000000000000000000000000000000000000..8eb3234abd90f5ca01310293eed92700e89ec8fa --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Fighty.prefab @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1015685231720104} + m_IsPrefabParent: 1 +--- !u!1 &1015685231720104 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4922380153090630} + - component: {fileID: 212966878208478210} + - component: {fileID: 58386218871342100} + - component: {fileID: 50856147029049122} + - component: {fileID: 114929608259001202} + m_Layer: 0 + m_Name: Fighty + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1212742193469634 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4351952202177716} + - component: {fileID: 23846092980601120} + - component: {fileID: 102669193244911136} + m_Layer: 0 + m_Name: NumberLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4351952202177716 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1212742193469634} + 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: 4922380153090630} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4922380153090630 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1015685231720104} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3, y: 0, z: 0} + m_LocalScale: {x: 0.45533395, y: 0.45533395, z: 0.45533395} + m_Children: + - {fileID: 4351952202177716} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23846092980601120 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1212742193469634} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!50 &50856147029049122 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1015685231720104} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!58 &58386218871342100 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1015685231720104} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 2.56 +--- !u!102 &102669193244911136 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1212742193469634} + m_Text: 1 + m_OffsetZ: -1 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 1 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 21 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 0} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!114 &114929608259001202 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1015685231720104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79c94baaf6a689347b6e47b5c7edd41c, type: 3} + m_Name: + m_EditorClassIdentifier: + acceleration: 8 + brakeFraction: 0.92 + constantFraction: 0.99 + maxSpeed: 10 + player: {fileID: 1015685231720104} +--- !u!212 &212966878208478210 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1015685231720104} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4c964b2c398a5cb45a675b44f5143019, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/CMPT306_Fall2017/Assets/Prefabs/Fighty.prefab.meta b/CMPT306_Fall2017/Assets/Prefabs/Fighty.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..50c857748d284a610447da2e9b341e884ac85587 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Fighty.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f5beac725b81ce84e9335ad6d595f36f +timeCreated: 1506464070 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Prefabs/Managers.prefab b/CMPT306_Fall2017/Assets/Prefabs/Managers.prefab new file mode 100644 index 0000000000000000000000000000000000000000..bc47d3b01be90ccb158d9135430b9d9de0f7f78b --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Managers.prefab @@ -0,0 +1,55 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1308186397754296} + m_IsPrefabParent: 1 +--- !u!1 &1308186397754296 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4504003809388494} + - component: {fileID: 114941791273446218} + m_Layer: 0 + m_Name: Managers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4504003809388494 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1308186397754296} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -23.26, y: 6.14, 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} +--- !u!114 &114941791273446218 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1308186397754296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95835ff87512cd145bdbfbc80b123bfc, type: 3} + m_Name: + m_EditorClassIdentifier: + playerOne: {fileID: 0} + playerTwo: {fileID: 0} diff --git a/CMPT306_Fall2017/Assets/Prefabs/Managers.prefab.meta b/CMPT306_Fall2017/Assets/Prefabs/Managers.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..f12d9a5ec56d6df275967c77b58ef2f97df2f9d5 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Managers.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5eed0066b4268c14887ebeafd95873f0 +timeCreated: 1506464085 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Prefabs/Players.prefab b/CMPT306_Fall2017/Assets/Prefabs/Players.prefab new file mode 100644 index 0000000000000000000000000000000000000000..1221cc58e8f225357b77411f2f108856fb4b4e2a --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Players.prefab @@ -0,0 +1,784 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1248456438693984} + m_IsPrefabParent: 1 +--- !u!1 &1248456438693984 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4292959204018798} + - component: {fileID: 114236137125434142} + - component: {fileID: 120924952204677274} + m_Layer: 0 + m_Name: Players + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1259618992458192 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4547775109539174} + - component: {fileID: 23845895772655458} + - component: {fileID: 102323351269028102} + m_Layer: 0 + m_Name: NumberLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1364349108589580 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4710321825646756} + - component: {fileID: 20497405407853434} + - component: {fileID: 92852386496634100} + - component: {fileID: 124531846863175002} + - component: {fileID: 81619200610853564} + - component: {fileID: 114860004238916526} + m_Layer: 0 + m_Name: PlayerCamera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1436182535237730 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4799729318299838} + - component: {fileID: 212389780366079344} + - component: {fileID: 58002207139794412} + - component: {fileID: 50248210954898466} + - component: {fileID: 114200218664241116} + m_Layer: 0 + m_Name: Player One + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1763017534516472 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4740771245546172} + - component: {fileID: 212641116473236244} + - component: {fileID: 58594067847029698} + - component: {fileID: 50368696773005908} + - component: {fileID: 114083128046382276} + m_Layer: 0 + m_Name: Player Two + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1849681674316268 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4579606988426786} + - component: {fileID: 212402488118644578} + - component: {fileID: 114445429429291430} + - component: {fileID: 50620234936771470} + m_Layer: 0 + m_Name: CameraTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1914453188911992 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4237229847669624} + - component: {fileID: 23556303289929588} + - component: {fileID: 102954642106451806} + m_Layer: 0 + m_Name: NumberLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4237229847669624 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1914453188911992} + 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: 4799729318299838} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4292959204018798 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1248456438693984} + 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: + - {fileID: 4799729318299838} + - {fileID: 4740771245546172} + - {fileID: 4579606988426786} + - {fileID: 4710321825646756} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4547775109539174 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1259618992458192} + 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: 4740771245546172} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4579606988426786 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1849681674316268} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 1} + m_Children: [] + m_Father: {fileID: 4292959204018798} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4710321825646756 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1364349108589580} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -7.29, z: -10} + m_LocalScale: {x: 3, y: 3, z: 1} + m_Children: [] + m_Father: {fileID: 4292959204018798} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4740771245546172 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1763017534516472} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3, y: 0, z: 0} + m_LocalScale: {x: 0.45533395, y: 0.45533395, z: 0.45533395} + m_Children: + - {fileID: 4547775109539174} + m_Father: {fileID: 4292959204018798} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4799729318299838 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1436182535237730} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3, y: 0, z: 0} + m_LocalScale: {x: 0.45533395, y: 0.45533395, z: 0.45533395} + m_Children: + - {fileID: 4237229847669624} + m_Father: {fileID: 4292959204018798} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &20497405407853434 +Camera: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1364349108589580} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + 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: 18.72 + 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_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!23 &23556303289929588 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1914453188911992} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!23 &23845895772655458 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1259618992458192} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!50 &50248210954898466 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1436182535237730} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!50 &50368696773005908 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1763017534516472} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!50 &50620234936771470 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1849681674316268} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &58002207139794412 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1436182535237730} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 2.56 +--- !u!58 &58594067847029698 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1763017534516472} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 2.56 +--- !u!81 &81619200610853564 +AudioListener: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1364349108589580} + m_Enabled: 1 +--- !u!92 &92852386496634100 +Behaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1364349108589580} + m_Enabled: 1 +--- !u!102 &102323351269028102 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1259618992458192} + m_Text: 2 + m_OffsetZ: -1 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 1 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 21 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 0} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!102 &102954642106451806 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1914453188911992} + m_Text: 1 + m_OffsetZ: -1 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 1 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 21 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 0} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!114 &114083128046382276 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1763017534516472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79c94baaf6a689347b6e47b5c7edd41c, type: 3} + m_Name: + m_EditorClassIdentifier: + acceleration: 8 + brakeFraction: 0.92 + constantFraction: 0.99 + maxSpeed: 10 + player: {fileID: 1763017534516472} +--- !u!114 &114200218664241116 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1436182535237730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79c94baaf6a689347b6e47b5c7edd41c, type: 3} + m_Name: + m_EditorClassIdentifier: + acceleration: 8 + brakeFraction: 0.92 + constantFraction: 0.99 + maxSpeed: 10 + player: {fileID: 1436182535237730} +--- !u!114 &114236137125434142 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1248456438693984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 872cfe10c4cec4943a87446489414c90, type: 3} + m_Name: + m_EditorClassIdentifier: + engageDistance: 10 + elasticity: 1 + curDistance: 0 + playerOne: {fileID: 1436182535237730} + playerTwo: {fileID: 1763017534516472} +--- !u!114 &114445429429291430 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1849681674316268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c825d4bed5b4ef14dbdd77b3ceceb25e, type: 3} + m_Name: + m_EditorClassIdentifier: + AccelerationSpeed: 1 + MaxSpeed: 1 + cameraSpeed: 1 + AccelRatio: 0.7 + maxX: 30 + maxY: 30 + PlayerOne: {fileID: 1436182535237730} + PlayerTwo: {fileID: 1763017534516472} +--- !u!114 &114860004238916526 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1364349108589580} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc44086b1fbcdd741acfcf1c53a78c99, type: 3} + m_Name: + m_EditorClassIdentifier: + myTarget: {fileID: 1849681674316268} + Z_ADJ: -10 + PLAYER_Y_ADJ: 14.66 + cameraLag: 30 +--- !u!120 &120924952204677274 +LineRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1248456438693984} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + m_Parameters: + serializedVersion: 2 + widthMultiplier: 0.15 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!124 &124531846863175002 +Behaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1364349108589580} + m_Enabled: 1 +--- !u!212 &212389780366079344 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1436182535237730} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4c964b2c398a5cb45a675b44f5143019, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!212 &212402488118644578 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1849681674316268} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 0.8931034, g: 0.41603476, b: 0.039401606, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.2, y: 0.2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!212 &212641116473236244 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1763017534516472} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4c964b2c398a5cb45a675b44f5143019, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/CMPT306_Fall2017/Assets/Prefabs/Players.prefab.meta b/CMPT306_Fall2017/Assets/Prefabs/Players.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..400884da6677efefcd02bdfbbbba45977515da81 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Players.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 43a50026743875842b5906d0e5d8116f +timeCreated: 1505965249 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Prefabs/Shooty.prefab b/CMPT306_Fall2017/Assets/Prefabs/Shooty.prefab new file mode 100644 index 0000000000000000000000000000000000000000..1b044f079f7dd2efdcd9cec7c4773fb10eec0fa3 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Shooty.prefab @@ -0,0 +1,257 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1572331492096810} + m_IsPrefabParent: 1 +--- !u!1 &1572331492096810 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4288749222566340} + - component: {fileID: 212055198796995028} + - component: {fileID: 58893135059865760} + - component: {fileID: 50520557927294914} + - component: {fileID: 114488056296134922} + - component: {fileID: 114136635433208434} + - component: {fileID: 114846915378150804} + m_Layer: 0 + m_Name: Shooty + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1671451999108006 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4276863422926892} + - component: {fileID: 23461952486411118} + - component: {fileID: 102307335727843802} + m_Layer: 0 + m_Name: NumberLabel + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4276863422926892 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1671451999108006} + 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: 4288749222566340} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4288749222566340 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1572331492096810} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3, y: 0, z: 0} + m_LocalScale: {x: 0.45533395, y: 0.45533395, z: 0.45533395} + m_Children: + - {fileID: 4276863422926892} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23461952486411118 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1671451999108006} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!50 &50520557927294914 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1572331492096810} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!58 &58893135059865760 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1572331492096810} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 2.56 +--- !u!102 &102307335727843802 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1671451999108006} + m_Text: 2 + m_OffsetZ: -1 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 1 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 21 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 0} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!114 &114136635433208434 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1572331492096810} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95835ff87512cd145bdbfbc80b123bfc, type: 3} + m_Name: + m_EditorClassIdentifier: + playerOne: {fileID: 1572331492096810} + playerTwo: {fileID: 0} +--- !u!114 &114488056296134922 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1572331492096810} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 725479f7b5881874d92cb73b6c876748, type: 3} + m_Name: + m_EditorClassIdentifier: + myPlayer: {fileID: 114846915378150804} + Bullet: {fileID: 1253353341930176, guid: 7f6d6c9054649ed4eaa71bfc0c670086, type: 2} + Crosshair: {fileID: 1536397821931000, guid: 12d625172ca83dc438e54d9e8158bf5f, type: 2} + bulletSpawnDist: 3.5 + crosshairDist: 11 + LightBulletVel: 30 + LightBulletCooldown: 6 + HeavyBulletVel: 0 + HeavyBulletCooldown: 0 +--- !u!114 &114846915378150804 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1572331492096810} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79c94baaf6a689347b6e47b5c7edd41c, type: 3} + m_Name: + m_EditorClassIdentifier: + acceleration: 8 + brakeFraction: 0.92 + constantFraction: 0.99 + maxSpeed: 10 + player: {fileID: 1572331492096810} +--- !u!212 &212055198796995028 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1572331492096810} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4c964b2c398a5cb45a675b44f5143019, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/CMPT306_Fall2017/Assets/Prefabs/Shooty.prefab.meta b/CMPT306_Fall2017/Assets/Prefabs/Shooty.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..67ca57681e82261f373f54fc5bbd04901afc47fc --- /dev/null +++ b/CMPT306_Fall2017/Assets/Prefabs/Shooty.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 579cbbeb1411b874786580eb34574534 +timeCreated: 1506464074 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Scripts.meta b/CMPT306_Fall2017/Assets/Scripts.meta old mode 100644 new mode 100755 index 1ecd8b830754c21a2263658eda7c5d69a271106b..049a5190d59904edd8b4285eb6468c39fb25ccdd --- a/CMPT306_Fall2017/Assets/Scripts.meta +++ b/CMPT306_Fall2017/Assets/Scripts.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: ceceecf1736316049b0d76bef3391332 +guid: 763aaa72d39570948a2a1577d5fa7598 folderAsset: yes -timeCreated: 1506339369 +timeCreated: 1505949909 licenseType: Free DefaultImporter: userData: diff --git a/CMPT306_Fall2017/Assets/Scripts/BulletScript.cs b/CMPT306_Fall2017/Assets/Scripts/BulletScript.cs new file mode 100644 index 0000000000000000000000000000000000000000..d2976aa7c48f9e012021eefe4278356745d7ac31 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/BulletScript.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BulletScript : MonoBehaviour { + + + void OnTriggerEnter2D(Collider2D coll) + { + if(coll.tag != "Untagged") + { + Destroy(gameObject); + } + Debug.Log(coll.tag); + + } + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/CMPT306_Fall2017/Assets/Scripts/BulletScript.cs.meta b/CMPT306_Fall2017/Assets/Scripts/BulletScript.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..86de1676e9a904a4e4b3af2a2dc04eff22c34ce5 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/BulletScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 363947c89f62102459592507f28d17d8 +timeCreated: 1506476943 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Scripts/GamepadInput.cs b/CMPT306_Fall2017/Assets/Scripts/GamepadInput.cs new file mode 100644 index 0000000000000000000000000000000000000000..2fc12d53817fa24996b9470cbaea88e19a7454f4 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/GamepadInput.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GamepadInput : MonoBehaviour { + + [SerializeField] + float Deadzone; + float maxComparable; + + [SerializeField] + PlayerBehavior myPlayer; + + // Use this for initialization + void Start () { + maxComparable = 1 - Deadzone; + } + + // Update is called once per frame + void Update () { + float leftX = Input.GetAxis("Left Horizontal"); + float leftY = Input.GetAxis("Left Vertical"); + + /* Ratio of joystick amount over the deadzone */ + myPlayer.MoveHorizontal(leftX); + myPlayer.MoveVertical(leftY); + + if (Input.GetButton("Xbox B")) + myPlayer.Brake(); + } +} diff --git a/CMPT306_Fall2017/Assets/Scripts/GamepadInput.cs.meta b/CMPT306_Fall2017/Assets/Scripts/GamepadInput.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..f05fd74d948c84f93849019984281fe53fdb6129 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/GamepadInput.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 9ae2cb071c24c534ca4556fd157e062a +timeCreated: 1506465138 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Scripts/InputManagerScript.cs b/CMPT306_Fall2017/Assets/Scripts/InputManagerScript.cs new file mode 100755 index 0000000000000000000000000000000000000000..a769a7fccfd0c3e4af7eb0f6de62371e141f6cb2 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/InputManagerScript.cs @@ -0,0 +1,142 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class InputManagerScript : MonoBehaviour { + + [SerializeField] + private GameObject playerOne; + [SerializeField] + private GameObject playerTwo; + + private PlayerBehavior playerOneBehavior; + private PlayerBehavior playerTwoBehavior; + + private PlayerShooter myShooter; + + private bool isAiming; + + // Use this for initialization + void Start () { + playerOneBehavior = playerOne.GetComponent<PlayerBehavior>(); + playerTwoBehavior = playerTwo.GetComponent<PlayerBehavior>(); + + myShooter = playerOne.GetComponent<PlayerShooter>(); + } + + + private void KeyboardInput() + { + /** + * Player One Movement Controls + */ + if (Input.GetKey(KeyCode.W)) + { + playerOneBehavior.MoveUp(); + } + else if (Input.GetKey(KeyCode.S)) + { + playerOneBehavior.MoveDown(); + } + if (Input.GetKey(KeyCode.A)) + { + playerOneBehavior.MoveLeft(); + } + else if (Input.GetKey(KeyCode.D)) + { + playerOneBehavior.MoveRight(); + } + + if (Input.GetKey(KeyCode.E)) + { + playerOneBehavior.Brake(); + } + + + /** + * Player Two Movement Controls + */ + if (Input.GetKey(KeyCode.UpArrow)) + { + playerTwoBehavior.MoveUp(); + } + else if (Input.GetKey(KeyCode.DownArrow)) + { + playerTwoBehavior.MoveDown(); + } + if (Input.GetKey(KeyCode.LeftArrow)) + { + playerTwoBehavior.MoveLeft(); + } + else if (Input.GetKey(KeyCode.RightArrow)) + { + playerTwoBehavior.MoveRight(); + } + if (Input.GetKey(KeyCode.RightControl)) + { + playerTwoBehavior.Brake(); + } + } + + public void JoypadOneInput() + { + /* Movement based on left stick */ + float leftHorizontal = Input.GetAxis("Left Horizontal"); + float leftVertical = Input.GetAxis("Left Vertical"); + playerOneBehavior.MoveHorizontal(leftHorizontal); + playerOneBehavior.MoveVertical(leftVertical); + + /* Aim based on the right stick */ + Vector2 rightStickOrientation = new Vector2(Input.GetAxis("Right Horizontal"), Input.GetAxis("Right Vertical")); + + if (rightStickOrientation.magnitude > 0) + { + if (!isAiming) + { + isAiming = true; + myShooter.PlayerAimStart(rightStickOrientation); + } + else + { + myShooter.PlayerAimContinue(rightStickOrientation); + } + } + else if((rightStickOrientation.magnitude <= 0) && (isAiming)) + { + isAiming = false; + myShooter.PlayerAimEnd(); + } + + + if (!isAiming) + { + if (rightStickOrientation.magnitude > 0) + { + isAiming = true; + myShooter.PlayerAimStart(rightStickOrientation); + } + } + else + { + + } + + + /* Brake based on the B Button */ + if (Input.GetButton("Xbox B")) + playerOneBehavior.Brake(); + + /* Shoot based on Right Trigger */ + if (Input.GetAxis("Right Trigger") < -.3) + { + myShooter.Shoot(); + } + + } + + // Update is called once per frame + void Update () { + KeyboardInput(); + JoypadOneInput(); + } +} diff --git a/CMPT306_Fall2017/Assets/Scripts/InputManagerScript.cs.meta b/CMPT306_Fall2017/Assets/Scripts/InputManagerScript.cs.meta new file mode 100755 index 0000000000000000000000000000000000000000..cd68268a06b8313ba0c3628de796c200b5210e4f --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/InputManagerScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 95835ff87512cd145bdbfbc80b123bfc +timeCreated: 1505949924 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerBehavior.cs b/CMPT306_Fall2017/Assets/Scripts/PlayerBehavior.cs new file mode 100755 index 0000000000000000000000000000000000000000..a321d31e01d1e5ca6fcb2652512ed9efc1d193d1 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerBehavior.cs @@ -0,0 +1,97 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerBehavior : MonoBehaviour { + + /* Movement to apply this frame */ + private Vector3 frameMovement; + + /* How much force is applied by player movement */ + [SerializeField] + private float acceleration; + + /* How much the velocity is scaled down on brake */ + [SerializeField] + private float brakeFraction; + [SerializeField] + private float constantFraction; + + /* The maximum speed a player is allowed to go */ + [SerializeField] + private float maxSpeed; + + /* Holds our plaayer and player body */ + public GameObject player; + private Rigidbody2D playerBody; + + + /* Getters and Setters */ + public float getMaxSpeed() + { + return maxSpeed; + } + + /** + * Collection of basic movement functions that add to a movement vector, which is + * reset every frame. + */ + public void MoveLeft() + { + frameMovement.x -= acceleration; + } + public void MoveRight() + { + frameMovement.x += acceleration; + } + public void MoveUp() + { + frameMovement.y += acceleration; + } + public void MoveDown() + { + frameMovement.y -= acceleration; + } + + public void MoveHorizontal(float f) + { + if(Mathf.Abs(f) <= 1) + frameMovement.x += f; + } + public void MoveVertical(float f) + { + if (Mathf.Abs(f) <= 1) + frameMovement.y += f; + } + + + /** + * Scale the player's velocity down, if brakeFraction is < zero + */ + public void Brake() + { + playerBody.velocity *= brakeFraction; + } + + + // Use this for initialization + void Start () { + playerBody = this.GetComponent<Rigidbody2D>(); + } + + // Update is called once per frame + void Update () { + /* Accelerate the player with a movement vector based on this frames input */ + playerBody.AddForce(frameMovement.normalized * acceleration); + + /* Cap player speed with a velocity check */ + if (playerBody.velocity.magnitude > maxSpeed) + playerBody.velocity = (playerBody.velocity.normalized * maxSpeed); + + /* Apply some simple friction */ + playerBody.velocity *= constantFraction; + + /* Reset any persistant variables */ + frameMovement = Vector3.zero; + } +} diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerBehavior.cs.meta b/CMPT306_Fall2017/Assets/Scripts/PlayerBehavior.cs.meta new file mode 100755 index 0000000000000000000000000000000000000000..eeb10dbbcb393f8b36597ec617bb8f54b9d22731 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerBehavior.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 79c94baaf6a689347b6e47b5c7edd41c +timeCreated: 1505949924 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerCameraScript.cs b/CMPT306_Fall2017/Assets/Scripts/PlayerCameraScript.cs new file mode 100644 index 0000000000000000000000000000000000000000..59ee863beb8db77a52813fd0f67fc68e26c6fe7e --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerCameraScript.cs @@ -0,0 +1,80 @@ +using UnityEngine; +using System.Collections; + +public class PlayerCameraScript : MonoBehaviour +{ + + private GameObject myCamera; + [SerializeField] + private GameObject myTarget; + + /* Vectors to do trivial adjustments */ + Vector3 ZAdjustVect; + Vector3 PlayerYAdjustVect; + Vector3 CameraSpeedVect; + + /* Subtract these to account for the Z Vector */ + [SerializeField] + private float Z_ADJ; + [SerializeField] + private float PLAYER_Y_ADJ; + /* Camera moves at 1 / CAMERA_SPEED */ + [SerializeField] + private float cameraLag; + + public GameObject MyTarget + { + get + { + return myTarget; + } + + set + { + myTarget = value; + } + } + + + /** + * Does a smooth movement towards the set target, based on speed variables. + */ + private void CameraTracking() + { + /* Adjust the Camera value to the right Z-plane */ + Vector3 target = myTarget.transform.position; + target.z = myCamera.transform.position.z; + + /* Camera speeds up as player leaves centre */ + float speed = Vector3.Distance(myCamera.transform.position, target) / cameraLag; + + /* Set the new camera position */ + myCamera.transform.position = Vector3.MoveTowards(myCamera.transform.position, target, speed); + + return; + } + + + // Use this for initialization + void Start() + { + myCamera = this.gameObject; + + ZAdjustVect = new Vector3(0, 0, Z_ADJ); + PlayerYAdjustVect = new Vector3(0, PLAYER_Y_ADJ, 0); + + /* Initiate Camera */ + myCamera.transform.position = MyTarget.transform.position; + myCamera.transform.position += ZAdjustVect; + } + + // Update is called once per frame + void FixedUpdate() + { + Debug.Log("Moving Camera..."); + + CameraTracking(); + //myCamera.transform.position += ZAdjustVect; + //myCamera.transform.position += PlayerYAdjustVect; + } +} \ No newline at end of file diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerCameraScript.cs.meta b/CMPT306_Fall2017/Assets/Scripts/PlayerCameraScript.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..ae8ef30c081f1baef1b20b0115849e9a99953a56 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerCameraScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: fc44086b1fbcdd741acfcf1c53a78c99 +timeCreated: 1506132733 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerCameraTargetScript.cs b/CMPT306_Fall2017/Assets/Scripts/PlayerCameraTargetScript.cs new file mode 100644 index 0000000000000000000000000000000000000000..0cde1161de5247b6f6c20b36958fe562fa0fb620 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerCameraTargetScript.cs @@ -0,0 +1,74 @@ +using UnityEngine; +using System.Collections; + +public class PlayerCameraTargetScript : MonoBehaviour +{ + int NUM_PLAYERS = 2; + + /* Player target movement variables */ + [SerializeField] + private float AccelerationSpeed; + [SerializeField] + private float MaxSpeed; + [SerializeField] + private float cameraSpeed; + [SerializeField] + private float AccelRatio; + + /* Maximum target movement speeds, independant for screen ratios */ + [SerializeField] + float maxX; + [SerializeField] + float maxY; + Vector3 MAX_X; + Vector3 MAX_Y; + + [SerializeField] + GameObject PlayerOne; + [SerializeField] + GameObject PlayerTwo; + + Rigidbody2D PlayerOneBody; + Rigidbody2D PlayerTwoBody; + + Vector3 tetherCenter; + + // Use this for initialization + void Start() + { + PlayerOneBody = PlayerOne.GetComponent<Rigidbody2D>(); + PlayerTwoBody = PlayerTwo.GetComponent<Rigidbody2D>(); + + MAX_X = new Vector3(maxX, 0, 0); + MAX_Y = new Vector3(0, maxY, 0); + } + + // Update is called once per frame + void Update() + { + /* Start in the Center */ + Vector3 targetPos = (PlayerOne.transform.localPosition + PlayerTwo.transform.localPosition) / NUM_PLAYERS; + + /* Add player velocities */ + Vector3 playerVelocities = ((Vector3)PlayerOneBody.velocity + (Vector3)PlayerTwoBody.velocity) * AccelRatio; + /* Limit to max X and Y */ + // X + if (Mathf.Abs(playerVelocities.x) > maxX) + playerVelocities.x = maxX * Mathf.Sign(playerVelocities.x); + // Y + if (Mathf.Abs(playerVelocities.y) > maxY) + playerVelocities.y = maxY * Mathf.Sign(playerVelocities.y); + + targetPos += playerVelocities; + + /* if we changed direction, double moveToward zero to get ahead */ + if ((Mathf.Sign(playerVelocities.x) != Mathf.Sign(targetPos.x)) || + (Mathf.Sign(playerVelocities.y) != Mathf.Sign(targetPos.y))) + { + this.transform.localPosition = Vector3.MoveTowards(this.transform.localPosition, targetPos, cameraSpeed); + } + + /* Add player velocities */ + this.transform.localPosition = Vector3.MoveTowards(this.transform.localPosition, targetPos, cameraSpeed); + } +} diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerCameraTargetScript.cs.meta b/CMPT306_Fall2017/Assets/Scripts/PlayerCameraTargetScript.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..6a82fbd56b74a05030ce8005a08419f387cbb8fa --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerCameraTargetScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c825d4bed5b4ef14dbdd77b3ceceb25e +timeCreated: 1506132818 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerParentScript.cs b/CMPT306_Fall2017/Assets/Scripts/PlayerParentScript.cs new file mode 100644 index 0000000000000000000000000000000000000000..7936e534b1c49b30bbf8b2b7b3720802c194763a --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerParentScript.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerParentScript : MonoBehaviour { + + [SerializeField] + GameObject PlayerOne; + [SerializeField] + GameObject PlayerTwo; + + Transform myTansform; + Transform playerOneTransform; + Transform playerTwoTransform; + + // Use this for initialization + void Start () { + playerOneTransform = PlayerOne.GetComponent<Transform>(); + playerTwoTransform = PlayerTwo.GetComponent<Transform>(); + } + + // Update is called once per frame + void Update () { + /* Move to Players centre */ + this.transform.position = (playerOneTransform.position + playerTwoTransform.position) / 2; + } +} diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerParentScript.cs.meta b/CMPT306_Fall2017/Assets/Scripts/PlayerParentScript.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..9f82a360c919c16f6db725bcb05bcebd165e94f9 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerParentScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 6d65db0fe24649244939269be11152d8 +timeCreated: 1506231878 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerShooter.cs b/CMPT306_Fall2017/Assets/Scripts/PlayerShooter.cs new file mode 100644 index 0000000000000000000000000000000000000000..6363f63d3b4278ab7ea63fe52fa062b41fd2b7cd --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerShooter.cs @@ -0,0 +1,132 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerShooter : MonoBehaviour { + + int ShotCooldown; + + [SerializeField] + PlayerBehavior myPlayer; + Rigidbody2D myBody; + + [SerializeField] + GameObject Bullet; + [SerializeField] + GameObject Crosshair; + GameObject curCrosshair; + + [SerializeField] + float bulletSpawnDist; // How far to spawn the bullet + [SerializeField] + float crosshairDist; // How away the crasshair is from the player + [SerializeField] + int LightBulletVel; // How fast light bullets travel + [SerializeField] + int LightBulletCooldown; // How many frames before we can shoot again + [SerializeField] + int HeavyBulletVel; // How fast light bullets travel + [SerializeField] + int HeavyBulletCooldown; // How many frames before we can shoot again + + + public enum Weapon { LIGHT_GUN, HEAVY_GUN }; + private Weapon curWeapon; + + /** + * Shoot - Shoot the current weapon + */ + public void Shoot() + { + if (curCrosshair == null) + return; + + if (ShotCooldown > 0) + return; + + switch (curWeapon) + { + case Weapon.LIGHT_GUN: + LightShot(); + break; + + } + } + /** + * LightShot - Instantiate a bullet at the player with trajectory decided by curCrosshair + */ + private void LightShot() + { + GameObject newBullet; + + if (ShotCooldown <= 0) + { + /* Add to Shot cooldown */ + ShotCooldown += LightBulletCooldown; + + /* Create our new bullet */ + newBullet = Instantiate(Bullet, gameObject.transform); + + /* Bullet Position = bulletSpawnDist from centre of player, towards the crasshair*/ + newBullet.transform.localPosition = curCrosshair.transform.localPosition.normalized * bulletSpawnDist; + + /* Bullet Velocity = LightBulletVel, towards the crasshair*/ + Rigidbody2D bulletVel = newBullet.GetComponent<Rigidbody2D>(); + bulletVel.velocity = (curCrosshair.transform.localPosition.normalized * LightBulletVel); + /* Add Player Velocity */ + bulletVel.velocity += myBody.velocity; + + /* Spread, does nothing */ + Vector3 perpendicular = Quaternion.AngleAxis(90, curCrosshair.transform.localPosition.normalized) + * curCrosshair.transform.localPosition.normalized; + /* Apply Bullet Spread */ + bulletVel.AddForce(perpendicular); + } + } + + public void PlayerAimStart(Vector2 joyPos) + { + if (curCrosshair != null) // Updates happen too fast! Fix to ghost crosshair bug. + Destroy(curCrosshair); + + joyPos.Normalize(); + joyPos *= crosshairDist; + + curCrosshair = Instantiate(Crosshair, this.transform); + curCrosshair.transform.localPosition = joyPos; + } + public void PlayerAimContinue(Vector2 joyPos) + { + joyPos.Normalize(); + joyPos *= crosshairDist; + + curCrosshair.transform.localPosition = joyPos; + } + public void PlayerAimEnd() + { + if (curCrosshair != null) // Updates happen too fast! + Destroy(curCrosshair); + } + + + // Use this for initialization + void Start () { + ShotCooldown = 0; + + curWeapon = Weapon.LIGHT_GUN; // Default to the light gun + + myBody = myPlayer.GetComponent<Rigidbody2D>(); + } + + void FixedUpdate() + { + if (ShotCooldown > 0) + ShotCooldown--; + } + + // Update is called once per frame + void Update () + { + + } +} diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerShooter.cs.meta b/CMPT306_Fall2017/Assets/Scripts/PlayerShooter.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..8e070fbf7a2ff5e402bcd54ae58aaab6afd45f14 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerShooter.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 725479f7b5881874d92cb73b6c876748 +timeCreated: 1506477116 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerTetherScript.cs b/CMPT306_Fall2017/Assets/Scripts/PlayerTetherScript.cs new file mode 100755 index 0000000000000000000000000000000000000000..7ed9e338b3978b86e840a6d1ac27ac61af5b18ae --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerTetherScript.cs @@ -0,0 +1,88 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerTetherScript : MonoBehaviour { + + /* How far the players can go before the tether pulls them in */ + [SerializeField] + private float engageDistance; + + /* Hooke's law labels this k, how much force the tether applies */ + [SerializeField] + private float elasticity; + + /* The current distance between the two players */ + [SerializeField] + private float curDistance; + + + /* Our Players */ + [SerializeField] + private GameObject playerOne; + [SerializeField] + private GameObject playerTwo; + + private Rigidbody2D playerOneBody; + private Rigidbody2D playerTwoBody; + + + /* Resource to represent the tether as a line */ + LineRenderer tetherVisual; + + /* Draw the tether as a line between the two players */ + public void DrawTetherAsLine() + { + tetherVisual.SetPosition(0, playerOne.transform.position); + tetherVisual.SetPosition(1, playerTwo.transform.position); + } + + public Vector3 getCentre() + { + return (playerOne.transform.position + playerTwo.transform.position) / 2; + } + + + // Use this for initialization + void Start () { + playerOneBody = playerOne.GetComponent<Rigidbody2D>(); + playerTwoBody = playerTwo.GetComponent<Rigidbody2D>(); + + tetherVisual = this.GetComponent<LineRenderer>(); + } + + // Update is called once per frame + void Update () { + + // Get current distance + Vector3 posOne = playerOne.transform.position; + Vector3 posTwo = playerTwo.transform.position; + + // Calculate vector of p1 to p2 + Vector3 difference = posOne - posTwo; + // curdistance = Magnitide of difference + curDistance = Vector3.Distance(posOne, posTwo); + + /* if The players are far enough apart... */ + if (curDistance > engageDistance) + { + float distance = curDistance - engageDistance; + /* Apply force of Distance squared, Scaled by elasticity, and divide among both players + * + * I used distance squared to make the tether more responsive, though less realistic. - Clint + */ + float tension = (elasticity * (distance * distance)) / 2; + + /* Vector difference gets magnitide = tension */ + difference = Vector3.ClampMagnitude(difference, tension); + + /* Apply said Vector to both players */ + playerOneBody.AddForce(-difference); + playerTwoBody.AddForce(difference); + } + + /* Draw the tether */ + DrawTetherAsLine(); + } + +} diff --git a/CMPT306_Fall2017/Assets/Scripts/PlayerTetherScript.cs.meta b/CMPT306_Fall2017/Assets/Scripts/PlayerTetherScript.cs.meta new file mode 100755 index 0000000000000000000000000000000000000000..ca3c15edec81441af8b0fe2fac80b84444fb4aa4 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Scripts/PlayerTetherScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 872cfe10c4cec4943a87446489414c90 +timeCreated: 1505949924 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites.meta b/CMPT306_Fall2017/Assets/Sprites.meta new file mode 100755 index 0000000000000000000000000000000000000000..f6afc73153dfec2e31f2a4345ef6d770a0fa4c1d --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d2fe6d5cfc8832b42b1675c5ed0d1717 +folderAsset: yes +timeCreated: 1505949909 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/Circle2.png b/CMPT306_Fall2017/Assets/Sprites/Circle2.png new file mode 100755 index 0000000000000000000000000000000000000000..a61bfd2fd9c347c7a392bf5528b4addd1cac3a1e Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/Circle2.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/Circle2.png.meta b/CMPT306_Fall2017/Assets/Sprites/Circle2.png.meta new file mode 100755 index 0000000000000000000000000000000000000000..a1851f8ee16ebfc7f1db7a9c401bee89e73a148a --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/Circle2.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 4c964b2c398a5cb45a675b44f5143019 +timeCreated: 1505949927 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/black.png b/CMPT306_Fall2017/Assets/Sprites/black.png new file mode 100644 index 0000000000000000000000000000000000000000..13a85ff7b170aed04d4e66259ec180f10a469e6e Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/black.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/black.png.meta b/CMPT306_Fall2017/Assets/Sprites/black.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..b9793cb4a869fd75bc25a58a5976cd2c21fbcf24 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/black.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: dc9bbb5faa0846344bb01d4c4e3b987a +timeCreated: 1506132088 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/blue.png b/CMPT306_Fall2017/Assets/Sprites/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..87857becab38fef5a90ee9231e2dc1b6e91e5f29 Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/blue.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/blue.png.meta b/CMPT306_Fall2017/Assets/Sprites/blue.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..a75db42df41610e72aeab31d97e43af8b0fad039 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/blue.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 8fb2af285dcda994eb9d01eac59c7f1f +timeCreated: 1506132088 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/checkerboard.png b/CMPT306_Fall2017/Assets/Sprites/checkerboard.png new file mode 100644 index 0000000000000000000000000000000000000000..91e971b0731dbfd966cd2058c8fc9ae0d5f53a5e Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/checkerboard.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/checkerboard.png.meta b/CMPT306_Fall2017/Assets/Sprites/checkerboard.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..abf8a3ed8d330dc617bc4e2867d2f1ac69cef5c2 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/checkerboard.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: a48c4abbe2243e24996b04df8902e466 +timeCreated: 1506546960 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/crosshair.png b/CMPT306_Fall2017/Assets/Sprites/crosshair.png new file mode 100644 index 0000000000000000000000000000000000000000..e4c4f97c125ef890a04010410adca9dfe061a2df Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/crosshair.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/crosshair.png.meta b/CMPT306_Fall2017/Assets/Sprites/crosshair.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..7c6b8129aa98bcc22a38827c55e0a13cf397a6df --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/crosshair.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 1e85f4a77f7ef514fbf963274b097ed9 +timeCreated: 1506546960 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/green.png b/CMPT306_Fall2017/Assets/Sprites/green.png new file mode 100644 index 0000000000000000000000000000000000000000..415ba38053ccf1badde35fec6812f75eef52aacd Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/green.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/green.png.meta b/CMPT306_Fall2017/Assets/Sprites/green.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..b5c5c85cc105626ad92fbc55486cb1f3a56738d9 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/green.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 311c4a8529091b94a97f6e4dfb1b3cb7 +timeCreated: 1506132088 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/orange.png b/CMPT306_Fall2017/Assets/Sprites/orange.png new file mode 100644 index 0000000000000000000000000000000000000000..64f8b1e772fd6491159b347051e2f5c27a2f7d34 Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/orange.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/orange.png.meta b/CMPT306_Fall2017/Assets/Sprites/orange.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..f5139e1616bd96bb66efe8af51352329f5759846 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/orange.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 62d48793243d6bf458e935c1faf5310b +timeCreated: 1506132088 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/red.png b/CMPT306_Fall2017/Assets/Sprites/red.png new file mode 100644 index 0000000000000000000000000000000000000000..daf22e095198b93926950d243348e5dff6e06a8e Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/red.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/red.png.meta b/CMPT306_Fall2017/Assets/Sprites/red.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..41fd3f2674b626442c6fa3f92ef12b22d6a5991d --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/red.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: c6c2bdabd30594345b5b81ae58aa8262 +timeCreated: 1506132088 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/whitePixel.png b/CMPT306_Fall2017/Assets/Sprites/whitePixel.png new file mode 100644 index 0000000000000000000000000000000000000000..818c71d03f435db011069584cda25c1f66af1a85 Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/whitePixel.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/whitePixel.png.meta b/CMPT306_Fall2017/Assets/Sprites/whitePixel.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..11dddbcaf14a721eb6f3defcecf2683a6da142b4 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/whitePixel.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 4c0d5e33cca31f645af07cdd532d928f +timeCreated: 1506462815 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/Sprites/yellow.png b/CMPT306_Fall2017/Assets/Sprites/yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..7098989b4a7adf2ba23ad67c58533eef212d2bd2 Binary files /dev/null and b/CMPT306_Fall2017/Assets/Sprites/yellow.png differ diff --git a/CMPT306_Fall2017/Assets/Sprites/yellow.png.meta b/CMPT306_Fall2017/Assets/Sprites/yellow.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..0482aca35e401a5fe9283024af67257c5d601fc5 --- /dev/null +++ b/CMPT306_Fall2017/Assets/Sprites/yellow.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: c1f4ea4488d7aa64d83a255dfe8b8c30 +timeCreated: 1506132088 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/Assets/TRT.unity b/CMPT306_Fall2017/Assets/TRT.unity new file mode 100755 index 0000000000000000000000000000000000000000..647fa847c3b68de026b64a706bd4e2694799a0b0 --- /dev/null +++ b/CMPT306_Fall2017/Assets/TRT.unity @@ -0,0 +1,252 @@ +%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: 8 + 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} +--- !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_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 9 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 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: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFiltering: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousColorSigma: 1 + m_PVRFilteringAtrousNormalSigma: 1 + m_PVRFilteringAtrousPositionSigma: 1 + 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 + m_NavMeshData: {fileID: 0} +--- !u!1001 &673091079 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1740818669} + m_Modifications: + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalPosition.x + value: 2.2152882 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalPosition.y + value: -0.5242286 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1950246631194670, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_Name + value: Player Two + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &673091080 stripped +Transform: + m_PrefabParentObject: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, + type: 2} + m_PrefabInternal: {fileID: 673091079} +--- !u!1001 &1515704771 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1740818669} + m_Modifications: + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalPosition.x + value: -2.5432682 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalPosition.y + value: -0.1333642 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114971136317852210, guid: e239ad5d089455347996b1e2851b4faf, + type: 2} + propertyPath: player + value: + objectReference: {fileID: 1515704773} + - target: {fileID: 1950246631194670, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + propertyPath: m_Name + value: Player One + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e239ad5d089455347996b1e2851b4faf, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1515704772 stripped +Transform: + m_PrefabParentObject: {fileID: 4220641316261498, guid: e239ad5d089455347996b1e2851b4faf, + type: 2} + m_PrefabInternal: {fileID: 1515704771} +--- !u!1 &1515704773 stripped +GameObject: + m_PrefabParentObject: {fileID: 1950246631194670, guid: e239ad5d089455347996b1e2851b4faf, + type: 2} + m_PrefabInternal: {fileID: 1515704771} +--- !u!1 &1740818668 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1740818669} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1740818669 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1740818668} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -15.666731, y: 5.023364, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1515704772} + - {fileID: 673091080} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/CMPT306_Fall2017/Assets/TRT.unity.meta b/CMPT306_Fall2017/Assets/TRT.unity.meta new file mode 100755 index 0000000000000000000000000000000000000000..2e205d14b8691bcda07ade93e7d32d6b4e47556f --- /dev/null +++ b/CMPT306_Fall2017/Assets/TRT.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35411b1940641a44293a6c61f8a567df +timeCreated: 1505949909 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/CMPT306_Fall2017/ProjectSettings/InputManager.asset b/CMPT306_Fall2017/ProjectSettings/InputManager.asset index 17c8f538e2152c0a0310b4870979eeecece2153c..5dbd229445d6c4db21c7a4ebc3f0e07b117395fb 100644 --- a/CMPT306_Fall2017/ProjectSettings/InputManager.asset +++ b/CMPT306_Fall2017/ProjectSettings/InputManager.asset @@ -6,7 +6,7 @@ InputManager: serializedVersion: 2 m_Axes: - serializedVersion: 3 - m_Name: Horizontal + m_Name: Left Horizontal descriptiveName: descriptiveNegativeName: negativeButton: left @@ -14,15 +14,15 @@ InputManager: altNegativeButton: a altPositiveButton: d gravity: 3 - dead: 0.001 + dead: 0.7 sensitivity: 3 snap: 1 invert: 0 - type: 0 + type: 2 axis: 0 - joyNum: 0 + joyNum: 1 - serializedVersion: 3 - m_Name: Vertical + m_Name: Left Vertical descriptiveName: descriptiveNegativeName: negativeButton: down @@ -30,266 +30,74 @@ InputManager: altNegativeButton: s altPositiveButton: w gravity: 3 - dead: 0.001 + dead: 0.7 sensitivity: 3 snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left ctrl - altNegativeButton: - altPositiveButton: mouse 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: mouse 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left shift - altNegativeButton: - altPositiveButton: mouse 2 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 + invert: 1 + type: 2 + axis: 1 + joyNum: 1 - serializedVersion: 3 - m_Name: Jump + m_Name: Xbox B descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: space + positiveButton: joystick 1 button 1 altNegativeButton: altPositiveButton: gravity: 1000 - dead: 0.001 + dead: 0 sensitivity: 1000 - snap: 0 + snap: 1 invert: 0 type: 0 axis: 0 - joyNum: 0 + joyNum: 1 - serializedVersion: 3 - m_Name: Mouse X + m_Name: Right Horizontal descriptiveName: descriptiveNegativeName: negativeButton: positiveButton: altNegativeButton: altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse Y - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse ScrollWheel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 + gravity: 3 + dead: 0.15 + sensitivity: 1 + snap: 1 invert: 0 - type: 1 - axis: 2 - joyNum: 0 + type: 2 + axis: 3 + joyNum: 1 - serializedVersion: 3 - m_Name: Horizontal + m_Name: Right Vertical descriptiveName: descriptiveNegativeName: negativeButton: positiveButton: altNegativeButton: altPositiveButton: - gravity: 0 - dead: 0.19 + gravity: 3 + dead: 0.15 sensitivity: 1 - snap: 0 - invert: 0 + snap: 1 + invert: 1 type: 2 - axis: 0 - joyNum: 0 + axis: 4 + joyNum: 1 - serializedVersion: 3 - m_Name: Vertical + m_Name: Right Trigger descriptiveName: descriptiveNegativeName: negativeButton: positiveButton: altNegativeButton: altPositiveButton: - gravity: 0 - dead: 0.19 + gravity: 3 + dead: 0.05 sensitivity: 1 - snap: 0 + snap: 1 invert: 1 type: 2 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: - altPositiveButton: joystick button 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: enter - altNegativeButton: - altPositiveButton: space - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Cancel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: escape - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 + axis: 9 + joyNum: 1 diff --git a/CMPT306_Fall2017/ProjectSettings/TagManager.asset b/CMPT306_Fall2017/ProjectSettings/TagManager.asset index 1c92a7840ec11895c76785f65d949a3d20d53355..447c391a6880571f3bbe5fc74b1e19375e2ae957 100644 --- a/CMPT306_Fall2017/ProjectSettings/TagManager.asset +++ b/CMPT306_Fall2017/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Barrier layers: - Default - TransparentFX