From 0ca5c8a2285df264cc5e766e1fb74347bf3e58d4 Mon Sep 17 00:00:00 2001 From: adrenalx Date: Sat, 25 Jun 2016 17:19:57 -0400 Subject: [PATCH] Fixes to Camera, started Slowmo --- Assets/Prefabs/Character.prefab | Bin 13852 -> 13708 bytes Assets/Prefabs/Main Camera.prefab | Bin 0 -> 8580 bytes Assets/Prefabs/Main Camera.prefab.meta | 8 ++++++ Assets/Scripts/PlayerMovement.cs | 3 +- Assets/Scripts/SlowdownScript.cs | 38 +++++++++++++++++++++++++ Assets/Scripts/SlowdownScript.cs.meta | 12 ++++++++ Assets/Scripts/SphereMover.cs | 30 +++++++++++++++++++ Assets/Scripts/SphereMover.cs.meta | 12 ++++++++ Assets/Scripts/ViewControl.cs | 1 - 9 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 Assets/Prefabs/Main Camera.prefab create mode 100644 Assets/Prefabs/Main Camera.prefab.meta create mode 100644 Assets/Scripts/SlowdownScript.cs create mode 100644 Assets/Scripts/SlowdownScript.cs.meta create mode 100644 Assets/Scripts/SphereMover.cs create mode 100644 Assets/Scripts/SphereMover.cs.meta diff --git a/Assets/Prefabs/Character.prefab b/Assets/Prefabs/Character.prefab index 64c6cce78ce20d0ecdae599f10b3b31f504e88d4..7d640e4d66659c32a058d06c4d32140fd5e079d1 100644 GIT binary patch delta 258 zcmbP}(~~X0z@Tr&z+l?Lz`(!{WCu(X&=j3rSR9&ha&?9(&+nk3*(@1SKuMR)0nF}9 zlczGt@LK}8EI=#?#0(q^lkLT{HuEsQVHTY>W0{WKuh&d}f?wD!;yw9U7APMM*EhL< zQ-aZDawn(#WC1SA$=lgPHkWbTRoWb)tHLN50aW@Q2#P>v0>OgG>%jDd$rJUYSuI!@ z7qL)%)r6GzzBp385kOzq2f{y@yU&Hnw-VC`S~RonR)4(UogF67R^;Kn!e}; zm)4ZS!KZI6k9?p2R9XNsbh00(1f%QZbWVFgka0dh@mL_{0b<$7`JCdCazGX%*fJ&t zJ!Xamc_1IiWssjdpVL9eJux@cKPf9Uxx|hk8OSb5oZQDIz4-|Sv^=87y>5i>WRzF0J3y|GBsfQ|36648MO-_is8iML_KLn ziOIEkk0-w|;Mkm_zlKF{*K$U%B#7wx9>l;fInmgBa)3!4*8zK=7AK%pPLmZ(3?_4! Gwg3Rg5?gEl diff --git a/Assets/Prefabs/Main Camera.prefab b/Assets/Prefabs/Main Camera.prefab new file mode 100644 index 0000000000000000000000000000000000000000..11d0cacd3cf848074ca0800a6190baed6e5ab94d GIT binary patch literal 8580 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 literal 0 HcmV?d00001 diff --git a/Assets/Prefabs/Main Camera.prefab.meta b/Assets/Prefabs/Main Camera.prefab.meta new file mode 100644 index 0000000..b7d6c96 --- /dev/null +++ b/Assets/Prefabs/Main Camera.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6315d57d22df49cabe86636b97689d3 +timeCreated: 1466872062 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index ddaa2e4..227a285 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -5,7 +5,6 @@ public class PlayerMovement : MonoBehaviour { public float speed = 0f; public float turn = 0f; - public GameObject camera; public Rigidbody characterRigidBody; //private Rigidbody rb; @@ -13,7 +12,7 @@ public class PlayerMovement : MonoBehaviour { // Update is called once per frame void Update () { - Vector3 fowardVector = new Vector3(camera.transform.forward.x, 0, camera.transform.forward.z); + Vector3 fowardVector = new Vector3(Camera.main.transform.forward.x, 0, Camera.main.transform.forward.z); if (Input.GetAxis("Vertical")>0) { diff --git a/Assets/Scripts/SlowdownScript.cs b/Assets/Scripts/SlowdownScript.cs new file mode 100644 index 0000000..906ed2a --- /dev/null +++ b/Assets/Scripts/SlowdownScript.cs @@ -0,0 +1,38 @@ +using UnityEngine; +using System.Collections; + +public class SlowdownScript : MonoBehaviour { + + private float duration = 5.0f; + private bool pickedUp = false; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update() + { + if(pickedUp) + { + Time.timeScale = 0.5f; + StartCoroutine(Wait(duration)); + Time.timeScale = 1.0f; + } + } + + void OnTriggerEnter(Collider col) + { + if (col.gameObject.CompareTag("Player")) + { + pickedUp = true; + gameObject.SetActive(false); + } + } + + IEnumerator Wait(float seconds) + { + yield return new WaitForSeconds(seconds); + } +} diff --git a/Assets/Scripts/SlowdownScript.cs.meta b/Assets/Scripts/SlowdownScript.cs.meta new file mode 100644 index 0000000..9d27c8e --- /dev/null +++ b/Assets/Scripts/SlowdownScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c5d317885d9034ae492a544e9dd04107 +timeCreated: 1466884297 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SphereMover.cs b/Assets/Scripts/SphereMover.cs new file mode 100644 index 0000000..1ca2d56 --- /dev/null +++ b/Assets/Scripts/SphereMover.cs @@ -0,0 +1,30 @@ +using UnityEngine; +using System.Collections; + +public class SphereMover : MonoBehaviour { + + public float speed = 2.0f; + private bool bascule = false; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void FixedUpdate() + { + if (bascule) + transform.Translate (Vector2.right * speed * Time.deltaTime); + else + transform.Translate (-Vector2.right * speed * Time.deltaTime); + + if(transform.position.x >= 4.0f) { + bascule = false; + } + + if(transform.position.x <= -4) { + bascule = true; + } + } +} diff --git a/Assets/Scripts/SphereMover.cs.meta b/Assets/Scripts/SphereMover.cs.meta new file mode 100644 index 0000000..ce003ba --- /dev/null +++ b/Assets/Scripts/SphereMover.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b82403f7e7f384b7e99b0c400ba33edd +timeCreated: 1466879067 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ViewControl.cs b/Assets/Scripts/ViewControl.cs index 2bd47f6..c53f884 100644 --- a/Assets/Scripts/ViewControl.cs +++ b/Assets/Scripts/ViewControl.cs @@ -5,7 +5,6 @@ public class ViewControl : MonoBehaviour { // Speed at which the camera will catch up to the mouse pointer location - public float smoothing = 1.5f; public float mouseSensitivity = 100.0f; public float clampAngle = 80.0f;