From 65a52f526cd8abcd86cc6f45e80817e14c834218 Mon Sep 17 00:00:00 2001
From: spatialfree <ethan@dofdev.org>
Date: Wed, 9 Sep 2020 15:02:03 -0700
Subject: [PATCH] oculus go & gear vr update

---
 Assets/Scenes/Main.unity               | 23 ++++++++++++-----------
 Assets/Scripts/GraphX.cs               |  5 +++++
 ProjectSettings/GraphicsSettings.asset |  1 +
 ProjectSettings/ProjectSettings.asset  |  4 ++--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index 9a29eea..2c55355 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -251,7 +251,7 @@ MonoBehaviour:
     lineCount: 3
     pageCount: 1
     materialCount: 1
-  m_havePropertiesChanged: 1
+  m_havePropertiesChanged: 0
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_spriteAnimator: {fileID: 0}
@@ -758,7 +758,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 79236691}
   m_LocalRotation: {x: 0.007157867, y: 0.7070706, z: 0.007157867, w: 0.7070706}
-  m_LocalPosition: {x: 3.626, y: -1.3, z: 3.88}
+  m_LocalPosition: {x: 3.626, y: -0.08, z: 3.9}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8339389}
@@ -1948,6 +1948,7 @@ MonoBehaviour:
   controllerRot: {x: 0, y: 0, z: 0, w: 1}
   inputRot: {x: 0, y: 0, z: 0, w: 1}
   controllerPos: {x: 0, y: 0, z: 0}
+  joystick: {x: 0, y: 0, z: 0}
   boxShake: {x: 0, y: 0, z: 0}
   boxOffset: {x: 0, y: 0, z: 0}
   ready: 0
@@ -2448,7 +2449,7 @@ MonoBehaviour:
     lineCount: 2
     pageCount: 1
     materialCount: 1
-  m_havePropertiesChanged: 1
+  m_havePropertiesChanged: 0
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_spriteAnimator: {fileID: 0}
@@ -3531,7 +3532,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &850212508
 Transform:
   m_ObjectHideFlags: 0
@@ -3879,7 +3880,7 @@ MonoBehaviour:
     lineCount: 2
     pageCount: 1
     materialCount: 1
-  m_havePropertiesChanged: 1
+  m_havePropertiesChanged: 0
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_spriteAnimator: {fileID: 0}
@@ -4602,9 +4603,9 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 965477372}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.56, y: -1.35, z: 7.22}
-  m_LocalScale: {x: 0.666, y: 0.666, z: 0.666}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0}
+  m_LocalPosition: {x: -1.22, y: -2.59, z: 5.86}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2065174152}
   - {fileID: 485926733}
@@ -4612,7 +4613,7 @@ Transform:
   - {fileID: 888073834}
   m_Father: {fileID: 383045425}
   m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0}
 --- !u!23 &965477374
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -8367,7 +8368,7 @@ MonoBehaviour:
     lineCount: 1
     pageCount: 1
     materialCount: 1
-  m_havePropertiesChanged: 1
+  m_havePropertiesChanged: 0
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_spriteAnimator: {fileID: 0}
@@ -8777,7 +8778,7 @@ MonoBehaviour:
     lineCount: 0
     pageCount: 0
     materialCount: 1
-  m_havePropertiesChanged: 1
+  m_havePropertiesChanged: 0
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_spriteAnimator: {fileID: 0}
diff --git a/Assets/Scripts/GraphX.cs b/Assets/Scripts/GraphX.cs
index ca39892..0bd7462 100644
--- a/Assets/Scripts/GraphX.cs
+++ b/Assets/Scripts/GraphX.cs
@@ -140,6 +140,11 @@ public class GraphX
       rollTime = Mathf.Clamp01((60 / (float)main.bpm) / 27);
     }
 
+    if (!main.sideQuest)
+    {
+      return;
+    }
+
     controllerMatrix.SetTRS(
       main.rig.controllerPos,
       main.rig.controllerRot * Quaternion.Euler(Vector3.up * 90),
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index 7997460..283d5a6 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -38,6 +38,7 @@ GraphicsSettings:
   - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index f675049..f2ff986 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -121,7 +121,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 8
+  bundleVersion: 11
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -162,7 +162,7 @@ PlayerSettings:
     Android: com.dofdev.SnakeInABox
     Standalone: com.dofdev.SnakeInABox
   buildNumber: {}
-  AndroidBundleVersionCode: 58
+  AndroidBundleVersionCode: 61
   AndroidMinSdkVersion: 22
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 0