@cutierobot re-fixed the gaze timer positions for issue #10

deco3500-2018 · Oct 4, 2018 · 474b841 · 474b841
1 parent ba36d58
commit 474b841
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 2 deletions.
diff --git a/DECO3500/Assets/MyData/Scripts/Player.cs b/DECO3500/Assets/MyData/Scripts/Player.cs
@@ -19,13 +19,17 @@ public class Player : MonoBehaviour {
 	//graphical progress indicator
 	private ReticleTimer gazeTimer;
 	private GameObject player;
+	private GameObject timer;
+	private Transform timerTrans;
 
 
 	// public event Action
 	// Use this for initialization
 	void Start () {
 		userAtConsole = false;
 		player = GameObject.Find("Player");
+		timer = GameObject.Find("ReticleTimer");
+		timerTrans = timer.GetComponent<Transform>();
 		playerStartingPosition = player.transform.position;
 		x = playerStartingPosition.x;
 		y = playerStartingPosition.y;
@@ -42,10 +46,14 @@ void Update () {
 	 */
 	public void toConsoleTeleport( ) {
 		if (userAtConsole) {
-		player.transform.position = new Vector3(x, y, -8f);
+			player.transform.position = new Vector3(x, y, -8f);
+			timerTrans.localScale = new Vector3(0.001f, 0.001f, 0.83671f);
+			timer.transform.position = new Vector3(-0.5f, 0.9f, -6.868f);
 
 		} else {
 			player.transform.position = new Vector3(x, y, -11.7f);
+			timerTrans.localScale = new Vector3(0.003f, 0.003f, 0.83671f);
+			timer.transform.position = new Vector3(-0.467f, 0.506f, -6.868f);
 		}
 	}
 
@@ -61,7 +69,7 @@ private void consoleTextGaze() {
 			if (lookedAtTimer > timeDuration) {
 				lookedAtTimer = 0f;
 
-				Debug.Log("teleported to console");
+				// Debug.Log("teleported to console");
 				atConsole();
 				toConsoleTeleport();
 			}

diff --git a/DECO3500/Library/ScriptAssemblies/Assembly-CSharp.dll b/DECO3500/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/DECO3500/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/DECO3500/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/DECO3500/Library/assetDatabase3 b/DECO3500/Library/assetDatabase3
diff --git a/DECO3500/Library/metadata/f9/f9dd93f451f080c4ea40b6891e3a4ace b/DECO3500/Library/metadata/f9/f9dd93f451f080c4ea40b6891e3a4ace
diff --git a/DECO3500/Library/shadercompiler-UnityShaderCompiler.exe0.log b/DECO3500/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -3,3 +3,31 @@ Cmd: initializeCompiler
 Cmd: initializeCompiler
 Cmd: initializeCompiler
 Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler