diff --git a/Assets/CameraController.cs b/Assets/CameraController.cs new file mode 100644 index 0000000..ab022c0 --- /dev/null +++ b/Assets/CameraController.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using System.Collections; + +public class CameraController : MonoBehaviour { + + public GameObject player; + private Vector3 offset; + + // Use this for initialization + void Start () + { + offset = transform.position; + } + + // Update is called once per frame + void LateUpdate () + { + transform.position = player.transform.position + offset; + } +} diff --git a/Assets/CameraController.cs.meta b/Assets/CameraController.cs.meta new file mode 100644 index 0000000..a279985 --- /dev/null +++ b/Assets/CameraController.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae2ca4205f0f47a4fa626bd81ae8c2da +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Music.meta b/Assets/Music.meta new file mode 100644 index 0000000..703e2e3 --- /dev/null +++ b/Assets/Music.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: f2d2ec3a8f93ef441a8c8c07d4728a12 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Music/sundrop - angry angel (azreal dark remix)2.mp3.meta b/Assets/Music/sundrop - angry angel (azreal dark remix)2.mp3.meta new file mode 100644 index 0000000..fa302aa --- /dev/null +++ b/Assets/Music/sundrop - angry angel (azreal dark remix)2.mp3.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 5ab19e4fca2c8cc41a23f4765c3d3b4a +AudioImporter: + serializedVersion: 4 + format: 0 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Music/sundrop - petrafide.mp3.meta b/Assets/Music/sundrop - petrafide.mp3.meta new file mode 100644 index 0000000..343b8f8 --- /dev/null +++ b/Assets/Music/sundrop - petrafide.mp3.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 40170d1178cdaa44ba1364b4564d1f5e +AudioImporter: + serializedVersion: 4 + format: 0 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Music/sundrop - slowly losing my dreams.mp3.meta b/Assets/Music/sundrop - slowly losing my dreams.mp3.meta new file mode 100644 index 0000000..324e98e --- /dev/null +++ b/Assets/Music/sundrop - slowly losing my dreams.mp3.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 9d23e8dbce2858741a1e11735d7264c3 +AudioImporter: + serializedVersion: 4 + format: 0 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..7f677d5 --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 29c1768c6c30eed47af26641c30da26a +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Prefabs/Shanking Cube.prefab b/Assets/Prefabs/Shanking Cube.prefab new file mode 100644 index 0000000..4ece5f7 --- /dev/null +++ b/Assets/Prefabs/Shanking Cube.prefab @@ -0,0 +1,96 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &100000 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 400000} + - 33: {fileID: 3300000} + - 65: {fileID: 6500000} + - 23: {fileID: 2300000} + - 114: {fileID: 11400000} + m_Layer: 0 + m_Name: Shanking Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &400000 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 6.66666651, y: .0625, z: .166666672} + m_Children: [] + m_Father: {fileID: 0} +--- !u!23 &2300000 +Renderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 +--- !u!33 &3300000 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &6500000 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 025a712113e797c408ae9865e9ac79c6, type: 3} + m_Name: + m_EditorClassIdentifier: + length: 1 +--- !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: 100000} + m_IsPrefabParent: 1 + m_IsExploded: 1 diff --git a/Assets/Prefabs/Shanking Cube.prefab.meta b/Assets/Prefabs/Shanking Cube.prefab.meta new file mode 100644 index 0000000..417b0a7 --- /dev/null +++ b/Assets/Prefabs/Shanking Cube.prefab.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 0dd5d3e41887306468e6f9dd9d58b975 +NativeFormatImporter: + userData: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 98245c5..bb313cb 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -345,7 +345,7 @@ Transform: m_LocalPosition: {x: 0, y: 2, z: 0} m_LocalScale: {x: 1.5, y: 4, z: 1.5} m_Children: - - {fileID: 2004495485} + - {fileID: 2119789981} m_Father: {fileID: 0} --- !u!54 &972571125 Rigidbody: @@ -357,7 +357,7 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: .0500000007 - m_UseGravity: 0 + m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 @@ -374,6 +374,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 10 + nextFire: 1 + fireRate: 1 + shank: {fileID: 0} + shankSpawn: {fileID: 2119789981} --- !u!1 &1043241741 GameObject: m_ObjectHideFlags: 0 @@ -714,6 +718,7 @@ GameObject: - 92: {fileID: 2004495483} - 124: {fileID: 2004495482} - 81: {fileID: 2004495481} + - 114: {fileID: 2004495486} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -751,7 +756,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -778,7 +783,45 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2004495480} m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} - m_LocalPosition: {x: 0, y: 2, z: -5} - m_LocalScale: {x: .5, y: .350000024, z: .349999964} + m_LocalPosition: {x: 0, y: 8, z: -6} + m_LocalScale: {x: .75, y: .962499917, z: .962499976} + m_Children: [] + m_Father: {fileID: 0} +--- !u!114 &2004495486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2004495480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae2ca4205f0f47a4fa626bd81ae8c2da, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 972571120} +--- !u!1 &2119789980 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2119789981} + m_Layer: 0 + m_Name: Shank Spawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2119789981 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2119789980} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .947009742, y: .199999988, z: 0} + m_LocalScale: {x: .100000001, y: .100000001, z: .100000001} m_Children: [] m_Father: {fileID: 972571124} diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index c1eb00a..b77b80f 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -4,19 +4,42 @@ using System.Collections; public class PlayerController : MonoBehaviour { public float speed; + public float nextFire; + public float fireRate; + public GameObject shank; + public Transform shankSpawn; - void Update() { - + void Update() + { + if (Input.GetButton("Fire1") && Time.time > nextFire) + { + nextFire = Time.time + fireRate; + Instantiate(shank, shankSpawn.position, rigidbody.rotation); + } } void FixedUpdate() { float moveHorizontal = Input.GetAxis ("Horizontal"); float moveVertical = Input.GetAxis ("Vertical"); + if (moveHorizontal < 0) + transform.eulerAngles = new Vector3(0f, -180f, 0f); + else if (moveHorizontal > 0)// transform.RotateAround(Vector3.zero, Vector3.up, 0f); + transform.eulerAngles = new Vector3(0f, 0f, 0f); + else if (moveVertical < 0) + transform.eulerAngles = new Vector3(0f, -270f, 0f); + else if (moveVertical > 0) + transform.eulerAngles = new Vector3(0f, -90f, 0f); + Vector3 movement = new Vector3 (moveHorizontal, 0.0f, moveVertical); rigidbody.MovePosition (rigidbody.position + movement * speed * Time.deltaTime); rigidbody.freezeRotation = true; + rigidbody.position.Normalize (); } -} + + void Shank(){ + + } +} \ No newline at end of file diff --git a/Assets/ShankTimer.cs b/Assets/ShankTimer.cs new file mode 100644 index 0000000..06c1b34 --- /dev/null +++ b/Assets/ShankTimer.cs @@ -0,0 +1,21 @@ +using UnityEngine; +using System.Collections; + +public class ShankTimer : MonoBehaviour { + + private float timer; + public float length; + + // Use this for initialization + void Start () { + timer = 0f; + } + + // Update is called once per frame + void Update () { + timer += Time.deltaTime; + + if (timer > length) + GameObject.Destroy (gameObject); + } +} diff --git a/Assets/ShankTimer.cs.meta b/Assets/ShankTimer.cs.meta new file mode 100644 index 0000000..3778243 --- /dev/null +++ b/Assets/ShankTimer.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 025a712113e797c408ae9865e9ac79c6 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Sprites/bartable.ase.meta b/Assets/Sprites/bartable.ase.meta new file mode 100644 index 0000000..312e6d7 --- /dev/null +++ b/Assets/Sprites/bartable.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: d4451a10284ee3e4fbe3e90e224b62c9 +DefaultImporter: + userData: diff --git a/Assets/Sprites/bartable.png.meta b/Assets/Sprites/bartable.png.meta new file mode 100644 index 0000000..9b58702 --- /dev/null +++ b/Assets/Sprites/bartable.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: b4e4fc967fc663b40a468866f9eb935d +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Sprites/chair1.ase.meta b/Assets/Sprites/chair1.ase.meta new file mode 100644 index 0000000..3008702 --- /dev/null +++ b/Assets/Sprites/chair1.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 05a5b6b445694064f83ef591f0122234 +DefaultImporter: + userData: diff --git a/Assets/Sprites/chair1.png.meta b/Assets/Sprites/chair1.png.meta new file mode 100644 index 0000000..12d53d5 --- /dev/null +++ b/Assets/Sprites/chair1.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: a6c2e52f09b4a5b4cb2aa039dcba57fc +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Sprites/stool.ase.meta b/Assets/Sprites/stool.ase.meta new file mode 100644 index 0000000..3e57eb5 --- /dev/null +++ b/Assets/Sprites/stool.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 9780a24c42de13844b6eabdc146d48c7 +DefaultImporter: + userData: diff --git a/Assets/Sprites/stool.png.meta b/Assets/Sprites/stool.png.meta new file mode 100644 index 0000000..d956473 --- /dev/null +++ b/Assets/Sprites/stool.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: a8790e3080b6f134c9146700b51820a4 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Sprites/table.ase.meta b/Assets/Sprites/table.ase.meta new file mode 100644 index 0000000..e86d549 --- /dev/null +++ b/Assets/Sprites/table.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 43b377f1dd9277b4591716abfa8e3e37 +DefaultImporter: + userData: diff --git a/Assets/Sprites/table.png.meta b/Assets/Sprites/table.png.meta new file mode 100644 index 0000000..eb61508 --- /dev/null +++ b/Assets/Sprites/table.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: fe4a1068e59359d4496b85146ec773d4 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Sprites/window.ase.meta b/Assets/Sprites/window.ase.meta new file mode 100644 index 0000000..a7f9386 --- /dev/null +++ b/Assets/Sprites/window.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 43285a6f22a4e8f4e899b915878dad21 +DefaultImporter: + userData: diff --git a/Assets/Sprites/window.png.meta b/Assets/Sprites/window.png.meta new file mode 100644 index 0000000..db67613 --- /dev/null +++ b/Assets/Sprites/window.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 378f31aba1740b845811779db7058afe +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index c95d27b..be9e61b 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -41,7 +41,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: left ctrl + positiveButton: space altNegativeButton: altPositiveButton: mouse 0 gravity: 1000 @@ -84,22 +84,6 @@ InputManager: type: 0 axis: 0 joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: space - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: .00100000005 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - serializedVersion: 3 m_Name: Mouse X descriptiveName: