Erik Wittkorn пре 8 година
родитељ
комит
683888148d
65 измењених фајлова са 3239 додато и 194751 уклоњено
  1. 2 1
      SARDINC/.vscode/settings.json
  2. 0 191617
      SARDINC/Assets/Models/SpaceShip.prefab
  3. 0 8
      SARDINC/Assets/Models/SpaceShip.prefab.meta
  4. 370 1105
      SARDINC/Assets/Oculus/VR/Scenes/GearVrControllerTest.unity
  5. 165 161
      SARDINC/Assets/Oculus/VR/Scripts/Util/OVRGearVrControllerTest.cs
  6. 356 99
      SARDINC/Assets/Scenes/Main.unity
  7. 1 1
      SARDINC/Assets/Scenes/Main.unity.meta
  8. 1758 444
      SARDINC/Assets/Scenes/Movement.unity
  9. BIN
      SARDINC/Build/OGO.apk
  10. 1 1
      SARDINC/Library/AssetImportState
  11. 54 54
      SARDINC/Library/CurrentLayout.dwlt
  12. BIN
      SARDINC/Library/InspectorExpandedItems.asset
  13. BIN
      SARDINC/Library/LastBuild.buildreport
  14. 1 1
      SARDINC/Library/LastSceneManagerSetup.txt
  15. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/0000000000000000f000000000000000
  16. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/2ab721dccaa7e6f4693cedd904dfdcac
  17. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/2bd7618c3fa0e4b4ab8e08dc3fadc376
  18. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/38ad33c152e32ee46a9bbbb0e656f7e1
  19. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/561ccac587275c745aec500620f12fc7
  20. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/9aa46566e1d86644c9a55e3037e935f6
  21. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll
  22. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/Resources/unity_builtin_extra
  23. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/a31796e9e8816c7448b55d584c9417f1
  24. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/a8577c885e80d8043946ac5b7abcf9a1
  25. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/ced943c76cb8fb8489bab18c3dfcdcd3
  26. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/d6708eb99dec8334fb83db57b764097a
  27. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/eaeac9ce83896a04691d2590189776f5
  28. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/globalgamemanagers
  29. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/globalgamemanagers.assets
  30. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/level0
  31. BIN
      SARDINC/Library/PlayerDataCache/Android/Data/sharedassets0.assets
  32. 59 0
      SARDINC/Library/PlayerDataCache/Android/ScriptLayoutHashes.txt
  33. 51 102
      SARDINC/Library/ProjectSettings.asset
  34. BIN
      SARDINC/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
  35. BIN
      SARDINC/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
  36. BIN
      SARDINC/Library/ScriptAssemblies/Assembly-CSharp.dll
  37. BIN
      SARDINC/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
  38. BIN
      SARDINC/Library/ScriptMapper
  39. BIN
      SARDINC/Library/assetDatabase3
  40. BIN
      SARDINC/Library/expandedItems
  41. BIN
      SARDINC/Library/metadata/1f/1fc53ff90e6a94bf3b371b26dc5d82b6
  42. BIN
      SARDINC/Library/metadata/1f/1fc53ff90e6a94bf3b371b26dc5d82b6.info
  43. BIN
      SARDINC/Library/metadata/7a/7acc4619d4cb5e64e9ed05e5a7a8099f
  44. BIN
      SARDINC/Library/metadata/99/99c9720ab356a0642a771bea13969a05
  45. BIN
      SARDINC/Library/metadata/99/99c9720ab356a0642a771bea13969a05.info
  46. 0 30
      SARDINC/Library/shadercompiler-UnityShaderCompiler0.log
  47. 0 12
      SARDINC/Library/shadercompiler-UnityShaderCompiler1.log
  48. 0 10
      SARDINC/Library/shadercompiler-UnityShaderCompiler2.log
  49. 0 12
      SARDINC/Library/shadercompiler-UnityShaderCompiler3.log
  50. 15 12
      SARDINC/ProjectSettings/AudioManager.asset
  51. 20 16
      SARDINC/ProjectSettings/DynamicsManager.asset
  52. 16 4
      SARDINC/ProjectSettings/EditorBuildSettings.asset
  53. 15 15
      SARDINC/ProjectSettings/EditorSettings.asset
  54. 1 1
      SARDINC/ProjectSettings/GraphicsSettings.asset
  55. 32 736
      SARDINC/ProjectSettings/InputManager.asset
  56. 2 2
      SARDINC/ProjectSettings/NavMeshAreas.asset
  57. 37 24
      SARDINC/ProjectSettings/Physics2DSettings.asset
  58. 1 22
      SARDINC/ProjectSettings/PresetManager.asset
  59. 51 102
      SARDINC/ProjectSettings/ProjectSettings.asset
  60. 175 99
      SARDINC/ProjectSettings/QualitySettings.asset
  61. 46 50
      SARDINC/ProjectSettings/TagManager.asset
  62. 8 8
      SARDINC/ProjectSettings/TimeManager.asset
  63. 1 1
      SARDINC/obj/Debug/Assembly-CSharp-Editor.csproj.CoreCompileInputs.cache
  64. 1 1
      SARDINC/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache
  65. BIN
      SARDINC/obj/Debug/Assembly-CSharp.csprojResolveAssemblyReference.cache

+ 2 - 1
SARDINC/.vscode/settings.json

@@ -52,5 +52,6 @@
         "ProjectSettings/":true,
         "temp/":true,
         "Temp/":true
-    }
+    },
+    "git.ignoreLimitWarning": true
 }

Разлика између датотеке није приказан због своје велике величине
+ 0 - 191617
SARDINC/Assets/Models/SpaceShip.prefab


+ 0 - 8
SARDINC/Assets/Models/SpaceShip.prefab.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1fc53ff90e6a94bf3b371b26dc5d82b6
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Разлика између датотеке није приказан због своје велике величине
+ 370 - 1105
SARDINC/Assets/Oculus/VR/Scenes/GearVrControllerTest.unity


+ 165 - 161
SARDINC/Assets/Oculus/VR/Scripts/Util/OVRGearVrControllerTest.cs

@@ -27,191 +27,195 @@ using System.Text;
 
 public class OVRGearVrControllerTest : MonoBehaviour
 {
-	public class BoolMonitor
-	{
-		public delegate bool BoolGenerator();
-
-		private string m_name = "";
-		private BoolGenerator m_generator;
-		private bool m_prevValue = false;
-		private bool m_currentValue = false;
-		private bool m_currentValueRecentlyChanged = false;
-		private float m_displayTimeout = 0.0f;
-		private float m_displayTimer = 0.0f;
-
-		public BoolMonitor(string name, BoolGenerator generator, float displayTimeout = 0.5f)
-		{
-			m_name = name;
-			m_generator = generator;
-			m_displayTimeout = displayTimeout;
-		}
-
-		public void Update()
-		{
-			m_prevValue = m_currentValue;
-			m_currentValue = m_generator();
-
-			if (m_currentValue != m_prevValue)
-			{
-				m_currentValueRecentlyChanged = true;
-				m_displayTimer = m_displayTimeout;
-			}
-
-			if (m_displayTimer > 0.0f)
-			{
-				m_displayTimer -= Time.deltaTime;
-
-				if (m_displayTimer <= 0.0f)
-				{
-					m_currentValueRecentlyChanged = false;
-					m_displayTimer = 0.0f;
-				}
-			}
-		}
-
-		public void AppendToStringBuilder(ref StringBuilder sb)
-		{
-			sb.Append(m_name);
-
-			if (m_currentValue && m_currentValueRecentlyChanged)
-				sb.Append(": *True*\n");
-			else if (m_currentValue)
-				sb.Append(":  True \n");
-			else if (!m_currentValue && m_currentValueRecentlyChanged)
-				sb.Append(": *False*\n");
-			else if (!m_currentValue)
-				sb.Append(":  False \n");
-		}
-	}
-
-	public Text uiText;
-	private List<BoolMonitor> monitors;
-	private StringBuilder data;
-
-	void Start()
-	{
-		if (uiText != null)
-		{
-			uiText.supportRichText = false;
-		}
-
-		data = new StringBuilder(2048);
-
-		monitors = new List<BoolMonitor>()
-		{
+  public class BoolMonitor
+  {
+    public delegate bool BoolGenerator();
+
+    private string m_name = "";
+    private BoolGenerator m_generator;
+    private bool m_prevValue = false;
+    private bool m_currentValue = false;
+    private bool m_currentValueRecentlyChanged = false;
+    private float m_displayTimeout = 0.0f;
+    private float m_displayTimer = 0.0f;
+
+    public BoolMonitor(string name, BoolGenerator generator, float displayTimeout = 0.5f)
+    {
+      m_name = name;
+      m_generator = generator;
+      m_displayTimeout = displayTimeout;
+    }
+
+    public void Update()
+    {
+      m_prevValue = m_currentValue;
+      m_currentValue = m_generator();
+
+      if (m_currentValue != m_prevValue)
+      {
+        m_currentValueRecentlyChanged = true;
+        m_displayTimer = m_displayTimeout;
+      }
+
+      if (m_displayTimer > 0.0f)
+      {
+        m_displayTimer -= Time.deltaTime;
+
+        if (m_displayTimer <= 0.0f)
+        {
+          m_currentValueRecentlyChanged = false;
+          m_displayTimer = 0.0f;
+        }
+      }
+    }
+
+    public void AppendToStringBuilder(ref StringBuilder sb)
+    {
+      sb.Append(m_name);
+
+      if (m_currentValue && m_currentValueRecentlyChanged)
+        sb.Append(": *True*\n");
+      else if (m_currentValue)
+        sb.Append(":  True \n");
+      else if (!m_currentValue && m_currentValueRecentlyChanged)
+        sb.Append(": *False*\n");
+      else if (!m_currentValue)
+        sb.Append(":  False \n");
+    }
+  }
+
+  public Text uiText;
+  private List<BoolMonitor> monitors;
+  private StringBuilder data;
+
+  void Start()
+  {
+    if (uiText != null)
+    {
+      uiText.supportRichText = false;
+    }
+
+    data = new StringBuilder(2048);
+
+    monitors = new List<BoolMonitor>()
+    {
 			// virtual
 			new BoolMonitor("WasRecentered",                    () => OVRInput.GetControllerWasRecentered()),
-			new BoolMonitor("One",                              () => OVRInput.Get(OVRInput.Button.One)),
-			new BoolMonitor("OneDown",                          () => OVRInput.GetDown(OVRInput.Button.One)),
-			new BoolMonitor("OneUp",                            () => OVRInput.GetUp(OVRInput.Button.One)),
-			new BoolMonitor("One (Touch)",                      () => OVRInput.Get(OVRInput.Touch.One)),
-			new BoolMonitor("OneDown (Touch)",                  () => OVRInput.GetDown(OVRInput.Touch.One)),
-			new BoolMonitor("OneUp (Touch)",                    () => OVRInput.GetUp(OVRInput.Touch.One)),
-			new BoolMonitor("Two",                              () => OVRInput.Get(OVRInput.Button.Two)),
-			new BoolMonitor("TwoDown",                          () => OVRInput.GetDown(OVRInput.Button.Two)),
-			new BoolMonitor("TwoUp",                            () => OVRInput.GetUp(OVRInput.Button.Two)),
-			new BoolMonitor("PrimaryIndexTrigger",              () => OVRInput.Get(OVRInput.Button.PrimaryIndexTrigger)),
-			new BoolMonitor("PrimaryIndexTriggerDown",          () => OVRInput.GetDown(OVRInput.Button.PrimaryIndexTrigger)),
-			new BoolMonitor("PrimaryIndexTriggerUp",            () => OVRInput.GetUp(OVRInput.Button.PrimaryIndexTrigger)),
-			new BoolMonitor("PrimaryIndexTrigger (Touch)",      () => OVRInput.Get(OVRInput.Touch.PrimaryIndexTrigger)),
-			new BoolMonitor("PrimaryIndexTriggerDown (Touch)",  () => OVRInput.GetDown(OVRInput.Touch.PrimaryIndexTrigger)),
-			new BoolMonitor("PrimaryIndexTriggerUp (Touch)",    () => OVRInput.GetUp(OVRInput.Touch.PrimaryIndexTrigger)),
-			new BoolMonitor("PrimaryHandTrigger",               () => OVRInput.Get(OVRInput.Button.PrimaryHandTrigger)),
-			new BoolMonitor("PrimaryHandTriggerDown",           () => OVRInput.GetDown(OVRInput.Button.PrimaryHandTrigger)),
-			new BoolMonitor("PrimaryHandTriggerUp",             () => OVRInput.GetUp(OVRInput.Button.PrimaryHandTrigger)),
-			new BoolMonitor("Up",                               () => OVRInput.Get(OVRInput.Button.Up)),
-			new BoolMonitor("Down",                             () => OVRInput.Get(OVRInput.Button.Down)),
-			new BoolMonitor("Left",                             () => OVRInput.Get(OVRInput.Button.Left)),
-			new BoolMonitor("Right",                            () => OVRInput.Get(OVRInput.Button.Right)),
-			new BoolMonitor("Touchpad (Click)",                 () => OVRInput.Get(OVRInput.Button.PrimaryTouchpad)),
-			new BoolMonitor("TouchpadDown (Click)",             () => OVRInput.GetDown(OVRInput.Button.PrimaryTouchpad)),
-			new BoolMonitor("TouchpadUp (Click)",               () => OVRInput.GetUp(OVRInput.Button.PrimaryTouchpad)),
-			new BoolMonitor("Touchpad (Touch)",                 () => OVRInput.Get(OVRInput.Touch.PrimaryTouchpad)),
-			new BoolMonitor("TouchpadDown (Touch)",             () => OVRInput.GetDown(OVRInput.Touch.PrimaryTouchpad)),
-			new BoolMonitor("TouchpadUp (Touch)",               () => OVRInput.GetUp(OVRInput.Touch.PrimaryTouchpad)),
+      new BoolMonitor("One",                              () => OVRInput.Get(OVRInput.Button.One)),
+      new BoolMonitor("OneDown",                          () => OVRInput.GetDown(OVRInput.Button.One)),
+      new BoolMonitor("OneUp",                            () => OVRInput.GetUp(OVRInput.Button.One)),
+      new BoolMonitor("One (Touch)",                      () => OVRInput.Get(OVRInput.Touch.One)),
+      new BoolMonitor("OneDown (Touch)",                  () => OVRInput.GetDown(OVRInput.Touch.One)),
+      new BoolMonitor("OneUp (Touch)",                    () => OVRInput.GetUp(OVRInput.Touch.One)),
+      new BoolMonitor("Two",                              () => OVRInput.Get(OVRInput.Button.Two)),
+      new BoolMonitor("TwoDown",                          () => OVRInput.GetDown(OVRInput.Button.Two)),
+      new BoolMonitor("TwoUp",                            () => OVRInput.GetUp(OVRInput.Button.Two)),
+      new BoolMonitor("PrimaryIndexTrigger",              () => OVRInput.Get(OVRInput.Button.PrimaryIndexTrigger)),
+      new BoolMonitor("PrimaryIndexTriggerDown",          () => OVRInput.GetDown(OVRInput.Button.PrimaryIndexTrigger)),
+      new BoolMonitor("PrimaryIndexTriggerUp",            () => OVRInput.GetUp(OVRInput.Button.PrimaryIndexTrigger)),
+      new BoolMonitor("PrimaryIndexTrigger (Touch)",      () => OVRInput.Get(OVRInput.Touch.PrimaryIndexTrigger)),
+      new BoolMonitor("PrimaryIndexTriggerDown (Touch)",  () => OVRInput.GetDown(OVRInput.Touch.PrimaryIndexTrigger)),
+      new BoolMonitor("PrimaryIndexTriggerUp (Touch)",    () => OVRInput.GetUp(OVRInput.Touch.PrimaryIndexTrigger)),
+      new BoolMonitor("PrimaryHandTrigger",               () => OVRInput.Get(OVRInput.Button.PrimaryHandTrigger)),
+      new BoolMonitor("PrimaryHandTriggerDown",           () => OVRInput.GetDown(OVRInput.Button.PrimaryHandTrigger)),
+      new BoolMonitor("PrimaryHandTriggerUp",             () => OVRInput.GetUp(OVRInput.Button.PrimaryHandTrigger)),
+      new BoolMonitor("Up",                               () => OVRInput.Get(OVRInput.Button.Up)),
+      new BoolMonitor("Down",                             () => OVRInput.Get(OVRInput.Button.Down)),
+      new BoolMonitor("Left",                             () => OVRInput.Get(OVRInput.Button.Left)),
+      new BoolMonitor("Right",                            () => OVRInput.Get(OVRInput.Button.Right)),
+      new BoolMonitor("Touchpad (Click)",                 () => OVRInput.Get(OVRInput.Button.PrimaryTouchpad)),
+      new BoolMonitor("TouchpadDown (Click)",             () => OVRInput.GetDown(OVRInput.Button.PrimaryTouchpad)),
+      new BoolMonitor("TouchpadUp (Click)",               () => OVRInput.GetUp(OVRInput.Button.PrimaryTouchpad)),
+      new BoolMonitor("Touchpad (Touch)",                 () => OVRInput.Get(OVRInput.Touch.PrimaryTouchpad)),
+      new BoolMonitor("TouchpadDown (Touch)",             () => OVRInput.GetDown(OVRInput.Touch.PrimaryTouchpad)),
+      new BoolMonitor("TouchpadUp (Touch)",               () => OVRInput.GetUp(OVRInput.Touch.PrimaryTouchpad)),
 
 			// raw
 			new BoolMonitor("Start",                            () => OVRInput.Get(OVRInput.RawButton.Start)),
-			new BoolMonitor("StartDown",                        () => OVRInput.GetDown(OVRInput.RawButton.Start)),
-			new BoolMonitor("StartUp",                          () => OVRInput.GetUp(OVRInput.RawButton.Start)),
-			new BoolMonitor("Back",                             () => OVRInput.Get(OVRInput.RawButton.Back)),
-			new BoolMonitor("BackDown",                         () => OVRInput.GetDown(OVRInput.RawButton.Back)),
-			new BoolMonitor("BackUp",                           () => OVRInput.GetUp(OVRInput.RawButton.Back)),
-			new BoolMonitor("A",                                () => OVRInput.Get(OVRInput.RawButton.A)),
-			new BoolMonitor("ADown",                            () => OVRInput.GetDown(OVRInput.RawButton.A)),
-			new BoolMonitor("AUp",                              () => OVRInput.GetUp(OVRInput.RawButton.A)),
-		};
-	}
-	static string prevConnected = "";
-	static BoolMonitor controllers = new BoolMonitor("Controllers Changed", () => { return OVRInput.GetConnectedControllers().ToString() != prevConnected; });
-	
-	void Update()
-	{
-		OVRInput.Controller activeController = OVRInput.GetActiveController();
+      new BoolMonitor("StartDown",                        () => OVRInput.GetDown(OVRInput.RawButton.Start)),
+      new BoolMonitor("StartUp",                          () => OVRInput.GetUp(OVRInput.RawButton.Start)),
+      new BoolMonitor("Back",                             () => OVRInput.Get(OVRInput.RawButton.Back)),
+      new BoolMonitor("BackDown",                         () => OVRInput.GetDown(OVRInput.RawButton.Back)),
+      new BoolMonitor("BackUp",                           () => OVRInput.GetUp(OVRInput.RawButton.Back)),
+      new BoolMonitor("A",                                () => OVRInput.Get(OVRInput.RawButton.A)),
+      new BoolMonitor("ADown",                            () => OVRInput.GetDown(OVRInput.RawButton.A)),
+      new BoolMonitor("AUp",                              () => OVRInput.GetUp(OVRInput.RawButton.A)),
+    };
+  }
+  static string prevConnected = "";
+  static BoolMonitor controllers = new BoolMonitor("Controllers Changed", () => { return OVRInput.GetConnectedControllers().ToString() != prevConnected; });
 
-		data.Length = 0;
-		byte recenterCount = OVRInput.GetControllerRecenterCount();
-		data.AppendFormat("RecenterCount: {0}\n", recenterCount);
+  void Update()
+  {
+    OVRInput.Controller activeController = OVRInput.GetActiveController();
 
-		byte battery = OVRInput.GetControllerBatteryPercentRemaining();
-		data.AppendFormat("Battery: {0}\n", battery);
+    data.Length = 0;
+    byte recenterCount = OVRInput.GetControllerRecenterCount();
+    data.AppendFormat("RecenterCount: {0}\n", recenterCount);
 
-		float framerate = OVRPlugin.GetAppFramerate();
-		data.AppendFormat("Framerate: {0:F2}\n", framerate);
+    byte battery = OVRInput.GetControllerBatteryPercentRemaining();
+    data.AppendFormat("Battery: {0}\n", battery);
 
-		string activeControllerName = activeController.ToString();
-		data.AppendFormat("Active: {0}\n", activeControllerName);
+    float framerate = OVRPlugin.GetAppFramerate();
+    data.AppendFormat("Framerate: {0:F2}\n", framerate);
 
-		string connectedControllerNames = OVRInput.GetConnectedControllers().ToString();
-		data.AppendFormat("Connected: {0}\n", connectedControllerNames);
+    string activeControllerName = activeController.ToString();
+    data.AppendFormat("Active: {0}\n", activeControllerName);
 
-		data.AppendFormat("PrevConnected: {0}\n", prevConnected);
+    string connectedControllerNames = OVRInput.GetConnectedControllers().ToString();
+    data.AppendFormat("Connected: {0}\n", connectedControllerNames);
 
-		controllers.Update();
-		controllers.AppendToStringBuilder(ref data);
+    data.AppendFormat("PrevConnected: {0}\n", prevConnected);
 
-		prevConnected = connectedControllerNames;
+    controllers.Update();
+    controllers.AppendToStringBuilder(ref data);
 
-		Quaternion rot = OVRInput.GetLocalControllerRotation(activeController);
-		data.AppendFormat("Orientation: ({0:F2}, {1:F2}, {2:F2}, {3:F2})\n", rot.x, rot.y, rot.z, rot.w);
+    prevConnected = connectedControllerNames;
 
-		Vector3 angVel = OVRInput.GetLocalControllerAngularVelocity(activeController);
-		data.AppendFormat("AngVel: ({0:F2}, {1:F2}, {2:F2})\n", angVel.x, angVel.y, angVel.z);
+    Quaternion rot = OVRInput.GetLocalControllerRotation(activeController);
+    data.AppendFormat("Orientation: ({0:F2}, {1:F2}, {2:F2}, {3:F2})\n", rot.x, rot.y, rot.z, rot.w);
 
-		Vector3 angAcc = OVRInput.GetLocalControllerAngularAcceleration(activeController);
-		data.AppendFormat("AngAcc: ({0:F2}, {1:F2}, {2:F2})\n", angAcc.x, angAcc.y, angAcc.z);
+    Vector3 angVel = OVRInput.GetLocalControllerAngularVelocity(activeController);
+    data.AppendFormat("AngVel: ({0:F2}, {1:F2}, {2:F2})\n", angVel.x, angVel.y, angVel.z);
 
-		Vector3 pos = OVRInput.GetLocalControllerPosition(activeController);
-		data.AppendFormat("Position: ({0:F2}, {1:F2}, {2:F2})\n", pos.x, pos.y, pos.z);
+    Vector3 angAcc = OVRInput.GetLocalControllerAngularAcceleration(activeController);
+    data.AppendFormat("AngAcc: ({0:F2}, {1:F2}, {2:F2})\n", angAcc.x, angAcc.y, angAcc.z);
 
-		Vector3 vel = OVRInput.GetLocalControllerVelocity(activeController);
-		data.AppendFormat("Vel: ({0:F2}, {1:F2}, {2:F2})\n", vel.x, vel.y, vel.z);
+    Vector3 pos = OVRInput.GetLocalControllerPosition(activeController);
+    data.AppendFormat("Position: ({0:F2}, {1:F2}, {2:F2})\n", pos.x, pos.y, pos.z);
 
-		Vector3 acc = OVRInput.GetLocalControllerAcceleration(activeController);
-		data.AppendFormat("Acc: ({0:F2}, {1:F2}, {2:F2})\n", acc.x, acc.y, acc.z);
+    Vector3 vel = OVRInput.GetLocalControllerVelocity(activeController);
+    data.AppendFormat("Vel: ({0:F2}, {1:F2}, {2:F2})\n", vel.x, vel.y, vel.z);
 
-		Vector2 primaryTouchpad = OVRInput.Get(OVRInput.Axis2D.PrimaryTouchpad);
-		data.AppendFormat("PrimaryTouchpad: ({0:F2}, {1:F2})\n", primaryTouchpad.x, primaryTouchpad.y);
+    Vector3 acc = OVRInput.GetLocalControllerAcceleration(activeController);
+    data.AppendFormat("Acc: ({0:F2}, {1:F2}, {2:F2})\n", acc.x, acc.y, acc.z);
 
-		Vector2 secondaryTouchpad = OVRInput.Get(OVRInput.Axis2D.SecondaryTouchpad);
-		data.AppendFormat("SecondaryTouchpad: ({0:F2}, {1:F2})\n", secondaryTouchpad.x, secondaryTouchpad.y);
+    Vector2 primaryTouchpad = OVRInput.Get(OVRInput.Axis2D.PrimaryTouchpad);
+    data.AppendFormat("PrimaryTouchpad: ({0:F2}, {1:F2})\n", primaryTouchpad.x, primaryTouchpad.y);
 
-		float indexTrigger = OVRInput.Get(OVRInput.Axis1D.PrimaryIndexTrigger);
-		data.AppendFormat("PrimaryIndexTriggerAxis1D: ({0:F2})\n", indexTrigger);
+    Vector2 secondaryTouchpad = OVRInput.Get(OVRInput.Axis2D.SecondaryTouchpad);
+    data.AppendFormat("SecondaryTouchpad: ({0:F2}, {1:F2})\n", secondaryTouchpad.x, secondaryTouchpad.y);
 
-		float handTrigger = OVRInput.Get(OVRInput.Axis1D.PrimaryHandTrigger);
-		data.AppendFormat("PrimaryHandTriggerAxis1D: ({0:F2})\n", handTrigger);
+    float indexTrigger = OVRInput.Get(OVRInput.Axis1D.PrimaryIndexTrigger);
+    data.AppendFormat("PrimaryIndexTriggerAxis1D: ({0:F2})\n", indexTrigger);
 
-		for (int i = 0; i < monitors.Count; i++)
-		{
-			monitors[i].Update();
-			monitors[i].AppendToStringBuilder(ref data);
-		}
+    float handTrigger = OVRInput.Get(OVRInput.Axis1D.PrimaryHandTrigger);
+    data.AppendFormat("PrimaryHandTriggerAxis1D: ({0:F2})\n", handTrigger);
 
-		if (uiText != null)
-		{
-			uiText.text = data.ToString();
-		}
-	}
+    for (int i = 0; i < monitors.Count; i++)
+    {
+      monitors[i].Update();
+      monitors[i].AppendToStringBuilder(ref data);
+    }
+
+    data.AppendLine("Tollololo");
+    data.AppendLine(OVRInput.Controller.Active.ToString());
+
+
+    if (uiText != null)
+    {
+      uiText.text = data.ToString();
+    }
+  }
 }
 

Разлика између датотеке није приказан због своје велике величине
+ 356 - 99
SARDINC/Assets/Scenes/Main.unity


+ 1 - 1
SARDINC/Assets/Scenes/Main.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 99c9720ab356a0642a771bea13969a05
+guid: ee27b7a3c44d440c2a554ffebe225732
 DefaultImporter:
   externalObjects: {}
   userData: 

Разлика између датотеке није приказан због своје велике величине
+ 1758 - 444
SARDINC/Assets/Scenes/Movement.unity


BIN
SARDINC/Build/OGO.apk


+ 1 - 1
SARDINC/Library/AssetImportState

@@ -1 +1 @@
-13;524288;2048;0;0
+13;589824;2304;0;0

+ 54 - 54
SARDINC/Library/CurrentLayout.dwlt

@@ -111,7 +111,7 @@ MonoBehaviour:
   m_MinSize: {x: 917, y: 342}
   m_MaxSize: {x: 22012, y: 10021}
   vertical: 0
-  controlID: 64
+  controlID: 24
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -130,12 +130,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 732
+    width: 710
     height: 956
   m_MinSize: {x: 202, y: 342}
   m_MaxSize: {x: 4002, y: 8042}
   vertical: 1
-  controlID: 122
+  controlID: 127
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -152,7 +152,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 732
+    width: 710
     height: 506
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -181,7 +181,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 506
-    width: 732
+    width: 710
     height: 450
   m_MinSize: {x: 102, y: 121}
   m_MaxSize: {x: 4002, y: 4021}
@@ -206,9 +206,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 732
+    x: 710
     y: 0
-    width: 270
+    width: 243
     height: 956
   m_MinSize: {x: 204, y: 221}
   m_MaxSize: {x: 4004, y: 4021}
@@ -231,9 +231,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1002
+    x: 953
     y: 0
-    width: 311
+    width: 360
     height: 956
   m_MinSize: {x: 234, y: 271}
   m_MaxSize: {x: 10004, y: 10021}
@@ -292,8 +292,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 94
-    width: 1262
-    height: 690
+    width: 708
+    height: 485
   m_PersistentViewDataDictionary: {fileID: 0}
 --- !u!114 &13
 MonoBehaviour:
@@ -349,7 +349,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 600
-    width: 830
+    width: 708
     height: 429
   m_PersistentViewDataDictionary: {fileID: 0}
   m_MaximizeOnPlay: 0
@@ -362,8 +362,8 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -207.5
-    m_HBaseRangeMax: 207.5
+    m_HBaseRangeMin: -177
+    m_HBaseRangeMax: 177
     m_VBaseRangeMin: -103
     m_VBaseRangeMax: 103
     m_HAllowExceedBaseRangeMin: 1
@@ -374,7 +374,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -383,25 +383,25 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 17
-      width: 830
+      width: 708
       height: 412
     m_Scale: {x: 2, y: 2}
-    m_Translation: {x: 415, y: 206}
+    m_Translation: {x: 354, y: 206}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -207.5
+      x: -177
       y: -103
-      width: 415
+      width: 354
       height: 206
     m_MinimalGUI: 1
   m_defaultScale: 2
   m_TargetTexture: {fileID: 0}
   m_CurrentColorSpace: 0
-  m_LastWindowPixelSize: {x: 1660, y: 858}
+  m_LastWindowPixelSize: {x: 1416, y: 858}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000100000100
@@ -428,18 +428,18 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 94
-    width: 730
+    width: 708
     height: 485
   m_PersistentViewDataDictionary: {fileID: 0}
   m_SceneLighting: 1
-  lastFramingTime: 479.3235009908676
+  lastFramingTime: 2040.1319350004196
   m_2DMode: 0
   m_isRotationLocked: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0, y: 1.9721649, z: -0.0592478}
+    m_Target: {x: 0.000000059604645, y: -0.075264454, z: 0.006370902}
     speed: 2
-    m_Value: {x: 0, y: 1.9721649, z: -0.0592478}
+    m_Value: {x: 0.000000059604645, y: -0.075264454, z: 0.006370902}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -467,13 +467,13 @@ MonoBehaviour:
       speed: 2
       m_Value: 0
   m_Rotation:
-    m_Target: {x: -0.3004215, y: -0.21860602, z: 0.07094519, w: -0.9257033}
+    m_Target: {x: -0.071853854, y: -0.5839271, z: 0.051995046, w: -0.8069531}
     speed: 2
-    m_Value: {x: -0.3004213, y: -0.21860588, z: 0.070945136, w: -0.92570263}
+    m_Value: {x: -0.071853474, y: -0.58392406, z: 0.051994774, w: -0.80694884}
   m_Size:
-    m_Target: 0.24371168
+    m_Target: 4.6796985
     speed: 2
-    m_Value: 0.24371168
+    m_Value: 4.6796985
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -555,7 +555,7 @@ MonoBehaviour:
   m_AnimEditor: {fileID: 0}
   m_LockTracker:
     m_IsLocked: 0
-  m_LastSelectedObjectID: 12506
+  m_LastSelectedObjectID: 22024
 --- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -578,7 +578,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 600
-    width: 730
+    width: 708
     height: 429
   m_PersistentViewDataDictionary: {fileID: 0}
 --- !u!114 &19
@@ -744,35 +744,35 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 734
+    x: 712
     y: 94
-    width: 266
+    width: 239
     height: 935
   m_PersistentViewDataDictionary: {fileID: 0}
   m_TreeViewState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 62360000
-    m_LastClickedID: 13922
-    m_ExpandedIDs: 24b9ffffc8cdffffd2ceffffc4cfffff46d2ffffe0dbffffe4dcffffd2ddffffe4e0ffffdcfbffff000000004a36000054360000563600005c36000092360000
+    m_SelectedIDs: 9c5c0000
+    m_LastClickedID: 23708
+    m_ExpandedIDs: 6634ffff3435ffffea35ffffdc38ffffc843ffff9644ffff4c45ffff3e48ffff826dffff506effff066ffffff871ffffd278ffff9e79ffff527affff447dffff6297ffff2e98ffffe298ffffd49bffff76a7ffff44a8fffffaa8ffffecabffff18c0ffffe2c0ffff96c1ffff88c4ffff50fbffff00000000524000007e480000dc4b0000344f000076550000e6550000205600002c5c00009c5c0000d65c0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: JetpackWithPlayer
+      m_OriginalName: JetpackWithPlayer
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 23660
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 0
       m_ClientGUIView: {fileID: 9}
     m_SearchString: 
   m_ExpandedScenes:
-  - GearVrControllerTest
+  - Movement
   m_CurrenRootInstanceID: 0
   m_LockTracker:
     m_IsLocked: 0
@@ -797,13 +797,13 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1004
+    x: 955
     y: 94
-    width: 307
+    width: 356
     height: 935
   m_PersistentViewDataDictionary: {fileID: 0}
   m_SearchFilter:
-    m_NameFilter: controller
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -825,9 +825,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 
-    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000042c0000122e0000b0300000b230000000ca9a3b
+    m_SelectedIDs: 54340000
+    m_LastClickedID: 13396
+    m_ExpandedIDs: 000000007c2c0000d02f00001e330000863e0000264200002842000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -855,7 +855,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000042c0000122e0000b0300000b2300000
+    m_ExpandedIDs: 000000007c2c0000d02f00001e330000863e00002642000028420000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -882,24 +882,24 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 1a2700009e260000d22900004a280000402b0000f42700002c4afffff2280000fc280000fc27000000000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: GearVrControllerTest
-      m_OriginalName: GearVrControllerTest
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 12090
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 10}
+      m_ClientGUIView: {fileID: 0}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -909,7 +909,7 @@ MonoBehaviour:
     m_NewAssetIndexInList: -1
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
-  m_DirectoriesAreaWidth: 153
+  m_DirectoriesAreaWidth: 185
 --- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52

BIN
SARDINC/Library/InspectorExpandedItems.asset


BIN
SARDINC/Library/LastBuild.buildreport


+ 1 - 1
SARDINC/Library/LastSceneManagerSetup.txt

@@ -1,4 +1,4 @@
 sceneSetups:
-- path: Assets/Oculus/VR/Scenes/GearVrControllerTest.unity
+- path: Assets/Scenes/Movement.unity
   isLoaded: 1
   isActive: 1

BIN
SARDINC/Library/PlayerDataCache/Android/Data/0000000000000000f000000000000000


BIN
SARDINC/Library/PlayerDataCache/Android/Data/2ab721dccaa7e6f4693cedd904dfdcac


BIN
SARDINC/Library/PlayerDataCache/Android/Data/2bd7618c3fa0e4b4ab8e08dc3fadc376


BIN
SARDINC/Library/PlayerDataCache/Android/Data/38ad33c152e32ee46a9bbbb0e656f7e1


BIN
SARDINC/Library/PlayerDataCache/Android/Data/561ccac587275c745aec500620f12fc7


BIN
SARDINC/Library/PlayerDataCache/Android/Data/9aa46566e1d86644c9a55e3037e935f6


BIN
SARDINC/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll


BIN
SARDINC/Library/PlayerDataCache/Android/Data/Resources/unity_builtin_extra


BIN
SARDINC/Library/PlayerDataCache/Android/Data/a31796e9e8816c7448b55d584c9417f1


BIN
SARDINC/Library/PlayerDataCache/Android/Data/a8577c885e80d8043946ac5b7abcf9a1


BIN
SARDINC/Library/PlayerDataCache/Android/Data/ced943c76cb8fb8489bab18c3dfcdcd3


BIN
SARDINC/Library/PlayerDataCache/Android/Data/d6708eb99dec8334fb83db57b764097a


BIN
SARDINC/Library/PlayerDataCache/Android/Data/eaeac9ce83896a04691d2590189776f5


BIN
SARDINC/Library/PlayerDataCache/Android/Data/globalgamemanagers


BIN
SARDINC/Library/PlayerDataCache/Android/Data/globalgamemanagers.assets


BIN
SARDINC/Library/PlayerDataCache/Android/Data/level0


BIN
SARDINC/Library/PlayerDataCache/Android/Data/sharedassets0.assets


+ 59 - 0
SARDINC/Library/PlayerDataCache/Android/ScriptLayoutHashes.txt

@@ -19,11 +19,20 @@ c7dd12c15208b0447e101f80038706df UnityEngine.Timeline.dll:UnityEngine.Timeline.A
 0ddb2c46096a1e59e0dce07886ce4769 UnityEngine.Timeline.dll:UnityEngine.Timeline.GroupTrack
 0ddb2c46096a1e59e0dce07886ce4769 UnityEngine.Timeline.dll:UnityEngine.Timeline.PlayableTrack
 64f3a13c1277a7f1324321d93d0ec13b UnityEngine.Timeline.dll:UnityEngine.Timeline.TimelineAsset
+faea1a9f378a9d2fe1414a13fb245715 Assembly-CSharp.dll:VRStandardAssets.Utils.SelectionRadial
+ca49566280d633a79d37f8786e35b3ce Assembly-CSharp.dll:VRStandardAssets.Utils.VRCameraFade
+95c241412033d75da3b2703947abc86e Assembly-CSharp.dll:UnityStandardAssets.Effects.ParticleSystemMultiplier
 24ff23a61a7df36a07c26427698cd830 Assembly-CSharp.dll:.OVRGazePointer
 f6637497451c9a030c421de4a1ad5cdb Unity.TextMeshPro.dll:TMPro.TMP_ScrollbarEventHandler
+85bdc37a4af01b3cd6b364a34dcd70fa Assembly-CSharp.dll:UnityStandardAssets.Effects.ExplosionPhysicsForce
+454f1e17edf9fd4401c58c8c3a2b958f Assembly-CSharp.dll:VRStandardAssets.Utils.ObjectPool
+449d082ccb84c78c973d4321966b8f0c Assembly-CSharp.dll:VRStandardAssets.Flyer.EnvironmentController
 8f93321b5b48b5e5b24823c2736a1020 Assembly-CSharp.dll:.OVRDebugHeadController
+19ee770a4dada4e568981b8b1b577514 Assembly-CSharp.dll:VRStandardAssets.Menu.MenuButton
 b14b4630cc47b6e9ea8a644551a6a8cc Unity.TextMeshPro.dll:TMPro.TMP_Text
 f2a9cc196f0f8182fb1a8ed9835c9d46 Assembly-CSharp.dll:.OVRManager
+efdd7cd0814cf7daa1d34652fd4e7485 Assembly-CSharp.dll:VRStandardAssets.Flyer.FlyerAlignmentChecker
+4317bc14aa2893d6b0cf77cee5fe554b Assembly-CSharp.dll:VRStandardAssets.Examples.ExampleTouchpad
 53cefe5d98cadefbab750835e70b89c0 UnityEngine.UI.dll:UnityEngine.UI.AspectRatioFitter
 486cd95c82d8305219c352c06b776e1f UnityEngine.UI.dll:UnityEngine.EventSystems.BaseInput
 da2091a04d360891450faf16cdf621f1 UnityEngine.UI.dll:UnityEngine.UI.Button
@@ -57,6 +66,7 @@ e90403eeda069970e0b9de1533de13a6 UnityEngine.UI.dll:UnityEngine.UI.ToggleGroup
 2d58ca16854b99daea8c45e9c0f367b7 UnityEngine.UI.dll:UnityEngine.EventSystems.TouchInputModule
 16da51d1b62ef6d4ee1849350434023b UnityEngine.UI.dll:UnityEngine.UI.VerticalLayoutGroup
 138b02c36ebc262df754c1b79a6bb10e Assembly-CSharp.dll:.OVRRaycaster
+0bc223deb7c5982ef089fcbe3c1c73da Assembly-CSharp.dll:VRStandardAssets.Utils.VREyeRaycaster
 50b0b141074b216c8b53b1bd467f73c9 Unity.TextMeshPro.dll:TMPro.TMP_InputField
 53cefe5d98cadefbab750835e70b89c0 UnityEngine.UI.dll:UnityEngine.UI.AspectRatioFitter
 486cd95c82d8305219c352c06b776e1f UnityEngine.UI.dll:UnityEngine.EventSystems.BaseInput
@@ -91,7 +101,10 @@ e90403eeda069970e0b9de1533de13a6 UnityEngine.UI.dll:UnityEngine.UI.ToggleGroup
 2d58ca16854b99daea8c45e9c0f367b7 UnityEngine.UI.dll:UnityEngine.EventSystems.TouchInputModule
 16da51d1b62ef6d4ee1849350434023b UnityEngine.UI.dll:UnityEngine.UI.VerticalLayoutGroup
 9663d1f54bae86026520918cbeccb540 Assembly-CSharp.dll:.OVRPlayerController
+c4baca258203e4612a69a24dd79744eb Assembly-CSharp.dll:VRStandardAssets.Examples.ExampleRotation
+7e6ed962606778f6a169b427d02ebc1f Assembly-CSharp.dll:VRStandardAssets.Flyer.FlyerLaserController
 bf9092984e391e854436c93547ae117f Assembly-CSharp.dll:.OVRProfiler
+a5e4fab5dc98a34af69c0f3c1e983e25 Assembly-CSharp.dll:VRStandardAssets.Menu.MenuItemPopout
 486cd95c82d8305219c352c06b776e1f UnityEngine.Timeline.dll:UnityEngine.Timeline.ActivationPlayableAsset
 9e61f3535f3c55760a1cedfbd114f4af UnityEngine.Timeline.dll:UnityEngine.Timeline.ActivationTrack
 754551afe4f2531f58476bf14c510657 UnityEngine.Timeline.dll:UnityEngine.Timeline.AnimationPlayableAsset
@@ -105,6 +118,7 @@ c7dd12c15208b0447e101f80038706df UnityEngine.Timeline.dll:UnityEngine.Timeline.A
 0ddb2c46096a1e59e0dce07886ce4769 UnityEngine.Timeline.dll:UnityEngine.Timeline.PlayableTrack
 64f3a13c1277a7f1324321d93d0ec13b UnityEngine.Timeline.dll:UnityEngine.Timeline.TimelineAsset
 66b3109aa5921cf800bec17926c6adba Unity.TextMeshPro.dll:TMPro.TMP_SubMeshUI
+e68da15e5811445cdb2adeed35c7d6eb Assembly-CSharp.dll:VRStandardAssets.Flyer.FlyerGameController
 201273fb4f889724fb090164b7d6c657 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkAnimator
 486cd95c82d8305219c352c06b776e1f UnityEngine.Networking.dll:UnityEngine.Networking.NetworkBehaviour
 0f27c39183b9eb95eba0a228bea28273 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkDiscovery
@@ -119,10 +133,16 @@ da21fc3f8056b1f91c3dd09c7bf4f90a UnityEngine.Networking.dll:UnityEngine.Networki
 529a95e9e8e7686c4816e08fbb37183f UnityEngine.Networking.dll:UnityEngine.Networking.NetworkTransform
 fc061f3ae8a876c0687e86378d4a447c UnityEngine.Networking.dll:UnityEngine.Networking.NetworkTransformChild
 7ca56e063bd071986fff4f513cc4f477 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkTransformVisualizer
+b66c0bcc9e679a7fe74ee601c210986d Assembly-CSharp.dll:VRStandardAssets.Maze.Turret
 0a006f3734181ba8b26758f0866152c0 UnityEngine.SpatialTracking.dll:UnityEngine.SpatialTracking.TrackedPoseDriver
 7e727e029381ef22f11cd6a9fe412567 Assembly-CSharp.dll:.OVRTrackedRemote
+ec8f4d7c9488546f06bff077efd4a2e4 Assembly-CSharp.dll:VRStandardAssets.Utils.VRInput
+1e660ec6d43323a1fdff939386b34861 Assembly-CSharp.dll:VRStandardAssets.Utils.PlatformDependentText
+486cd95c82d8305219c352c06b776e1f Assembly-CSharp.dll:VRStandardAssets.Maze.AICharacterControl
+10b850d28b8499dc304c20f9697039c5 Assembly-CSharp.dll:VRStandardAssets.Flyer.Ring
 382b8ef512fa8d6108723a01b57af65b UnityEngine.Analytics.dll:UnityEngine.Analytics.AnalyticsEventTracker
 d22c788799ee45d8676254eccf20e8b8 UnityEngine.Analytics.dll:UnityEngine.Analytics.AnalyticsTracker
+ca6db6aff47d6342bca6c689b56ccf23 Assembly-CSharp.dll:VRStandardAssets.Intro.IntroManager
 d75dc834c5dec688db75a55a1724c90f UnityEngine.HoloLens.dll:UnityEngine.Audio.AudioSpatializerMicrosoft
 486cd95c82d8305219c352c06b776e1f UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInput
 e1ea12ca952c81d81a9a21fdf34446ed UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInputModule
@@ -198,17 +218,38 @@ f351a53a5bb6578f76af7819b5eb8592 Vuforia.UnityExtensions.dll:Vuforia.VuforiaConf
 ad24de185ef9a605870b931cda4f181e Vuforia.UnityExtensions.dll:Vuforia.VuMarkBehaviour
 c31ff9acb65f7a15b5c6fd77c3314d83 Vuforia.UnityExtensions.dll:Vuforia.WireframeBehaviour
 486cd95c82d8305219c352c06b776e1f Vuforia.UnityExtensions.dll:Vuforia.WireframeTrackableEventHandler
+d900ad5dcb563a96a836be2d4bc1abc3 Assembly-CSharp.dll:VRStandardAssets.Utils.ReturnToMainMenu
 f16835701e71dd5d6fb1fed4b7aff1d8 Unity.TextMeshPro.dll:TMPro.TMP_Asset
 486cd95c82d8305219c352c06b776e1f Assembly-CSharp.dll:.OVRDebugInfo
+b499d5db749962a1147f55b7756f7f96 Assembly-CSharp.dll:VRStandardAssets.Maze.MazeGameController
+486cd95c82d8305219c352c06b776e1f Assembly-CSharp.dll:VRStandardAssets.Utils.VRDeviceManager
+b6d068be8ff81c32e42df4785c8758d0 Assembly-CSharp.dll:VRStandardAssets.Examples.ExampleRenderScale
 167742deffda96b61118213d41b7cb2a Assembly-CSharp.dll:.OVRResetOrientation
+be37474de58a178da2f35166e380ed58 Assembly-CSharp.dll:VRStandardAssets.Utils.Reticle
 e0e4b9a32071c028a4b6508d73740ee0 Assembly-CSharp.dll:.OVRScreenFade
 486cd95c82d8305219c352c06b776e1f Unity.TextMeshPro.dll:TMPro.TMP_SpriteAnimator
+2ed752ba407f60dac4e9c8745eb37fbf Assembly-CSharp.dll:VRStandardAssets.Flyer.UIController
+2caa239ca7efd2151a976abfd09a17ee Assembly-CSharp.dll:VRStandardAssets.Maze.DestinationMarker
+134f3d3f57d907ac1781d367be7e70e4 Assembly-CSharp.dll:VRStandardAssets.Utils.SelectionSlider
+198cb73222af12581a4383854834b3c4 Assembly-CSharp.dll:VRStandardAssets.ShootingGallery.UIController
+9e933e20048bacb017b0fef7e79d6fc8 Assembly-CSharp.dll:VRStandardAssets.Utils.GUIArrows
 7ebf5a98eca5f71ce192a7112acd6bee Assembly-CSharp.dll:.OVRMonoscopic
+f52395e3634ba9c8e762840ab0f9afba Assembly-CSharp.dll:.Movement
 49fe7781731f28ab328e2101bf14f930 Assembly-CSharp.dll:.OVRGrabbable
 5c5dcbcb96fdbec906622342be7289fa Assembly-CSharp.dll:.OVRCubemapCapture
 eaf0bcdb10d442a4029d615f41d09957 Unity.TextMeshPro.dll:TMPro.TextContainer
+f142e6ecc4808ecaf8c033a7cfbf63da Assembly-CSharp.dll:VRStandardAssets.Utils.VRCameraUI
+b0c185c2e0b70f5f1bd126b7075044d5 Assembly-CSharp.dll:VRStandardAssets.ShootingGallery.ShootingTarget
 167742deffda96b61118213d41b7cb2a Assembly-CSharp.dll:.OVRModeParms
+171e13805221aaf52425128eb501005c Assembly-CSharp.dll:VRStandardAssets.Maze.ExitArea
+f3f3db474d0bc2af6014f5bea08dd97d Assembly-CSharp.dll:VRStandardAssets.Maze.CameraOrbit
 08c6088a45e845ebf0916697678538e3 Assembly-CSharp.dll:.OVRGearVrControllerTest
+3428208e437f187c6585124cb8c982c4 Assembly-CSharp.dll:VRStandardAssets.ShootingGallery.ShootingGalleryScore
+d593806410042a3532ff4ed50fcd77e1 Assembly-CSharp.dll:VRStandardAssets.Utils.UIMovement
+486cd95c82d8305219c352c06b776e1f Assembly-CSharp.dll:VRStandardAssets.Flyer.AsteroidExplosion
+49ec344f50b178e2096dc0f258e2be65 Assembly-CSharp.dll:VRStandardAssets.Menu.MenuSelectorMover
+4bdf374be89a1ff54b3d8eadbbd3a817 Assembly-CSharp.dll:VRStandardAssets.Utils.UITint
+efc6815007da8d44f08411c8ea607d15 Assembly-CSharp.dll:VRStandardAssets.ShootingGallery.ShootingGalleryController
 201273fb4f889724fb090164b7d6c657 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkAnimator
 486cd95c82d8305219c352c06b776e1f UnityEngine.Networking.dll:UnityEngine.Networking.NetworkBehaviour
 0f27c39183b9eb95eba0a228bea28273 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkDiscovery
@@ -223,12 +264,17 @@ da21fc3f8056b1f91c3dd09c7bf4f90a UnityEngine.Networking.dll:UnityEngine.Networki
 529a95e9e8e7686c4816e08fbb37183f UnityEngine.Networking.dll:UnityEngine.Networking.NetworkTransform
 fc061f3ae8a876c0687e86378d4a447c UnityEngine.Networking.dll:UnityEngine.Networking.NetworkTransformChild
 7ca56e063bd071986fff4f513cc4f477 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkTransformVisualizer
+5440610e9288f66234679494f4a81e50 Assembly-CSharp.dll:VRStandardAssets.Flyer.FlyerMovementController
+1b82e86b7a0d411bc84d522100fcfecd Assembly-CSharp.dll:VRStandardAssets.Maze.AgentTrail
 72a8523b432c0a5317826b7a9e0a0e79 Unity.TextMeshPro.dll:TMPro.PackageResourceImporterWindow
+eb2d1be2484ed2230d16fff01912ce44 Assembly-CSharp.dll:VRStandardAssets.Utils.UIFader
 3f221448c36e8fb02d1c702feef5c1de Assembly-CSharp.dll:.OVRWaitCursor
 e53cc67d84060d628c7f03fc725766d8 Unity.TextMeshPro.dll:TMPro.TMP_FontAsset
 392c5b921098bd4c139d9146d0efa6d7 Unity.TextMeshPro.dll:TMPro.TMP_Settings
 7ebf5a98eca5f71ce192a7112acd6bee Assembly-CSharp.dll:.OVRChromaticAberration
 76c85c8250e83ba383db76879a0e3d21 Assembly-CSharp.dll:.OVRSceneSampleController
+09cc796a15735c2dd3d6d6dd9eb245f5 Assembly-CSharp.dll:VRStandardAssets.Flyer.FlyerLaser
+486cd95c82d8305219c352c06b776e1f Assembly-CSharp.dll:VRStandardAssets.Utils.VRFPSCounter
 486cd95c82d8305219c352c06b776e1f UnityEngine.TestRunner.dll:UnityEngine.TestTools.TestRunner.Callbacks.PlayModeRunnerCallback
 e033f131358cea5a0eabf9561e781deb UnityEngine.TestRunner.dll:UnityEngine.TestTools.TestRunner.PlaymodeTestsController
 9d863b523b577f5c3d915351a74cd338 UnityEngine.TestRunner.dll:UnityEngine.TestTools.TestRunner.Callbacks.RemoteTestResultSender
@@ -236,25 +282,35 @@ e033f131358cea5a0eabf9561e781deb UnityEngine.TestRunner.dll:UnityEngine.TestTool
 70f7dc248db3379548a88e8d4fa049f8 UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioRoom
 28a95668dd28649297d595834fe8417e UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioSoundfieldExtension
 28a95668dd28649297d595834fe8417e UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioSourceExtension
+deaf1eec7888232974e5c38ccecf0cb9 Assembly-CSharp.dll:VRStandardAssets.Maze.SwitchButton
 1a90b221dc803408fbafa883c12bcab4 UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioListenerExtension
 70f7dc248db3379548a88e8d4fa049f8 UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioRoom
 28a95668dd28649297d595834fe8417e UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioSoundfieldExtension
 28a95668dd28649297d595834fe8417e UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioSourceExtension
+115d52512c869a5c951f27b2aaac179e Assembly-CSharp.dll:.Readme
+5cb189718fa574fd2bd5b9861c1aa5b5 Assembly-CSharp.dll:VRStandardAssets.Menu.MenuAnimator
+cf4679ea00d1070bb48df067e2788fe2 Assembly-CSharp.dll:VRStandardAssets.Maze.MazeTargetSetting
 d75dc834c5dec688db75a55a1724c90f UnityEngine.HoloLens.dll:UnityEngine.Audio.AudioSpatializerMicrosoft
 486cd95c82d8305219c352c06b776e1f UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInput
 e1ea12ca952c81d81a9a21fdf34446ed UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInputModule
 98d69a140ec0084cde3b6a5e09aea295 UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingCollider
 dfd33ff9ae3ce8d7ca1f22b475ec2387 UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingRenderer
+f0e288d64e1ace72bd8faefc472c60b5 Assembly-CSharp.dll:VRStandardAssets.ShootingGallery.ShootingGalleryGun
 aac9c55ae7ba4b95b852a7d9c191acd1 Unity.TextMeshPro.dll:TMPro.TextMeshProUGUI
 989917e37ada2039978473ea5fc49e70 Assembly-CSharp.dll:UnityEngine.EventSystems.OVRPhysicsRaycaster
 0a006f3734181ba8b26758f0866152c0 UnityEngine.SpatialTracking.dll:UnityEngine.SpatialTracking.TrackedPoseDriver
 e29b82c8bf28b8e4fdcc14242aa8879d Assembly-CSharp.dll:.OVRGridCube
+711833b8994f64313950afd4637d5276 Assembly-CSharp.dll:VRStandardAssets.Examples.ExampleInteractiveItem
+67b464635b42e8bc2201ed6c4f8e3e18 Assembly-CSharp.dll:VRStandardAssets.Flyer.Asteroid
+4b2acc514f8cbce36d6a96119db677d5 Assembly-CSharp.dll:VRStandardAssets.Flyer.FlyerHealthController
 bf9092984e391e854436c93547ae117f Assembly-CSharp.dll:.OVRLint
 d1e8ed93b5353b4bdbd86d474ab618b5 Assembly-CSharp.dll:UnityEngine.EventSystems.OVRInputModule
+4bd2ce0ce7ea9374f663549b0ba0aa06 Assembly-CSharp.dll:VRStandardAssets.Maze.ThirdPersonCharacter
 e7264fa9ee3a8a07bb0d50abc40c07a0 Assembly-CSharp.dll:.OVRGrabber
 e04611b8715e6833d2bd7010fc6be10b Unity.TextMeshPro.dll:TMPro.TMP_StyleSheet
 2f9af06a78208a67db480e9bfed4a076 Unity.TextMeshPro.dll:TMPro.TextMeshPro
 9318334b30e9f195f573b2ce00154b95 Unity.TextMeshPro.dll:TMPro.TMP_ColorGradient
+486cd95c82d8305219c352c06b776e1f Assembly-CSharp.dll:VRStandardAssets.Utils.VRInteractiveItem
 93307bd34e39d73fd24e00ec39c25a91 Unity.TextMeshPro.dll:TMPro.TMP_SubMesh
 182e416670915c50a548c38c642db0d8 Vuforia.UnityExtensions.dll:Vuforia.AnchorBehaviour
 f35860350df72508419d9f9fcd288594 Vuforia.UnityExtensions.dll:Vuforia.AnchorInputListenerBehaviour
@@ -289,6 +345,9 @@ f351a53a5bb6578f76af7819b5eb8592 Vuforia.UnityExtensions.dll:Vuforia.VuforiaConf
 ad24de185ef9a605870b931cda4f181e Vuforia.UnityExtensions.dll:Vuforia.VuMarkBehaviour
 c31ff9acb65f7a15b5c6fd77c3314d83 Vuforia.UnityExtensions.dll:Vuforia.WireframeBehaviour
 486cd95c82d8305219c352c06b776e1f Vuforia.UnityExtensions.dll:Vuforia.WireframeTrackableEventHandler
+032618dc81ba1a8198836919c4d10ec3 Assembly-CSharp.dll:VRStandardAssets.Utils.InputWarnings
+58c21d9d0db573a9790d2c8d64497167 Assembly-CSharp.dll:VRStandardAssets.Maze.Player
+486cd95c82d8305219c352c06b776e1f Assembly-CSharp.dll:VRStandardAssets.Utils.VRTrackingReset
 182e416670915c50a548c38c642db0d8 Vuforia.UnityExtensions.dll:Vuforia.AnchorBehaviour
 f35860350df72508419d9f9fcd288594 Vuforia.UnityExtensions.dll:Vuforia.AnchorInputListenerBehaviour
 182e416670915c50a548c38c642db0d8 Vuforia.UnityExtensions.dll:Vuforia.AnchorStageBehaviour

+ 51 - 102
SARDINC/Library/ProjectSettings.asset

@@ -4,7 +4,7 @@
 PlayerSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 15
-  productGUID: a0ee0e81a0b6f4363b9389cd71e5626f
+  productGUID: 96d47d3d5663547f198879b5da225d41
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
   AndroidEnableSustainedPerformanceMode: 0
@@ -46,14 +46,14 @@ PlayerSettings:
   defaultScreenHeight: 768
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
-  m_StereoRenderingPath: 1
+  m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   m_MTRendering: 1
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
   iosAppInBackgroundBehavior: 0
-  displayResolutionDialog: 2
+  displayResolutionDialog: 1
   iosAllowHTTPDownload: 1
   allowedAutorotateToPortrait: 1
   allowedAutorotateToPortraitUpsideDown: 1
@@ -66,7 +66,7 @@ PlayerSettings:
   androidBlitType: 0
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
-  runInBackground: 0
+  runInBackground: 1
   captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0
@@ -80,14 +80,14 @@ PlayerSettings:
   resizableWindow: 0
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
-  gpuSkinning: 0
+  gpuSkinning: 1
   graphicsJobs: 0
   xboxPIXTextureCapture: 0
   xboxEnableAvatar: 0
   xboxEnableKinect: 0
   xboxEnableKinectAutoTracking: 0
   xboxEnableFitness: 0
-  visibleInBackground: 1
+  visibleInBackground: 0
   allowFullscreenSwitch: 1
   graphicsJobMode: 0
   fullscreenMode: 2
@@ -118,11 +118,8 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.26.0
-  preloadedAssets:
-  - {fileID: 4800000, guid: d0f6e1942d3d1f946a96fd8a00175474, type: 3}
-  - {fileID: 4800000, guid: d7662dbac0646464a9b4a48e93989adb, type: 3}
-  - {fileID: 4800000, guid: 10513ef587704324487f3061a7e6699d, type: 3}
+  bundleVersion: 1.0
+  preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -144,7 +141,7 @@ PlayerSettings:
       depthBufferSharingEnabled: 0
     oculus:
       sharedDepthBuffer: 0
-      dashSupport: 1
+      dashSupport: 0
     enable360StereoCapture: 0
   protectGraphicsMemory: 0
   useHDRDisplay: 0
@@ -154,15 +151,15 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.oculus.SampleFramework
-    Standalone: unity.Oculus.Oculus Sample Framework
-    Tizen: com.oculus.SampleFramework
-    iOS: com.oculus.SampleFramework
-    tvOS: com.oculus.SampleFramework
+    Android: com.unity3d.vrstandardassets
+    Standalone: unity.Unity.VRSamples
+    Tizen: com.unity3d.vrstandardassets
+    iOS: com.unity3d.vrstandardassets
+    tvOS: com.unity3d.vrstandardassets
   buildNumber:
     iOS: 0
-  AndroidBundleVersionCode: 1260
-  AndroidMinSdkVersion: 22
+  AndroidBundleVersionCode: 1
+  AndroidMinSdkVersion: 21
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 0
   aotOptions: 
@@ -187,7 +184,7 @@ PlayerSettings:
   uIStatusBarHidden: 1
   uIExitOnSuspend: 0
   uIStatusBarStyle: 0
-  iPhoneSplashScreen: {fileID: 2800000, guid: 26dc65579eeccb5459aba31059963385, type: 3}
+  iPhoneSplashScreen: {fileID: 0}
   iPhoneHighResSplashScreen: {fileID: 0}
   iPhoneTallHighResSplashScreen: {fileID: 0}
   iPhone47inSplashScreen: {fileID: 0}
@@ -214,7 +211,7 @@ PlayerSettings:
   iOSLaunchScreenLandscape: {fileID: 0}
   iOSLaunchScreenBackgroundColor:
     serializedVersion: 2
-    rgba: 4280889894
+    rgba: 0
   iOSLaunchScreenFillPct: 100
   iOSLaunchScreenSize: 100
   iOSLaunchScreenCustomXibPath: 
@@ -244,10 +241,10 @@ PlayerSettings:
   iOSRequireARKit: 0
   appleEnableProMotion: 0
   vulkanEditorSupport: 0
-  clonedFromGUID: 12065089a9f5ec34e87ba8be4a876998
+  clonedFromGUID: 5a86b210c1fdd0a47944fb1e9e3bc5bd
   templatePackageId: 
   templateDefaultScene: 
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 5
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: 
@@ -268,7 +265,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: 3e23487af1607f7488030f4c790bde92, type: 3}
+      m_Icon: {fileID: 2800000, guid: 8de506d4489bff74488535c40e1f6f59, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0
@@ -336,76 +333,27 @@ PlayerSettings:
       m_Kind: 1
       m_SubKind: 
   m_BuildTargetBatching:
-  - m_BuildTarget: Android
-    m_StaticBatching: 1
-    m_DynamicBatching: 1
   - m_BuildTarget: Standalone
+    m_StaticBatching: 0
+    m_DynamicBatching: 0
+  - m_BuildTarget: Android
     m_StaticBatching: 1
-    m_DynamicBatching: 1
+    m_DynamicBatching: 0
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: WindowsStandaloneSupport
     m_APIs: 02000000
-    m_Automatic: 0
-  - m_BuildTarget: AndroidPlayer
-    m_APIs: 0b000000
-    m_Automatic: 0
+    m_Automatic: 1
   m_BuildTargetVRSettings:
-  - m_BuildTarget: Android
+  - m_BuildTarget: Standalone
     m_Enabled: 1
     m_Devices:
     - Oculus
-  - m_BuildTarget: Metro
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: N3DS
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: PS3
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: PS4
-    m_Enabled: 0
-    m_Devices:
-    - PlayStationVR
-  - m_BuildTarget: PSM
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: PSP2
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: SamsungTV
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: Standalone
+  - m_BuildTarget: Android
     m_Enabled: 1
     m_Devices:
     - Oculus
-  - m_BuildTarget: Tizen
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: WebGL
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: WebPlayer
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: WiiU
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: Xbox360
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: XboxOne
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: iOS
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: tvOS
-    m_Enabled: 0
-    m_Devices: []
   m_BuildTargetEnableVuforiaSettings: []
-  openGLRequireES31: 1
+  openGLRequireES31: 0
   openGLRequireES31AEP: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
@@ -435,7 +383,7 @@ PlayerSettings:
   switchSocketConcurrencyLimit: 14
   switchScreenResolutionBehavior: 2
   switchUseCPUProfiler: 0
-  switchApplicationID: 0x01004b9000490000
+  switchApplicationID: 0x0005000C10000001
   switchNSODependencies: 
   switchTitleNames_0: 
   switchTitleNames_1: 
@@ -501,7 +449,7 @@ PlayerSettings:
   switchAccessibleURLs: 
   switchLegalInformation: 
   switchMainThreadStackSize: 1048576
-  switchPresenceGroupId: 
+  switchPresenceGroupId: 0x0005000C10000001
   switchLogoHandling: 0
   switchReleaseVersion: 0
   switchDisplayVersion: 1.0.0
@@ -513,8 +461,8 @@ PlayerSettings:
   switchUserAccountSaveDataSize: 0
   switchUserAccountSaveDataJournalSize: 0
   switchApplicationAttribute: 0
-  switchCardSpecSize: -1
-  switchCardSpecClock: -1
+  switchCardSpecSize: 4
+  switchCardSpecClock: 25
   switchRatingsMask: 0
   switchRatingsInt_0: 0
   switchRatingsInt_1: 0
@@ -528,7 +476,7 @@ PlayerSettings:
   switchRatingsInt_9: 0
   switchRatingsInt_10: 0
   switchRatingsInt_11: 0
-  switchLocalCommunicationIds_0: 
+  switchLocalCommunicationIds_0: 0x0005000C10000001
   switchLocalCommunicationIds_1: 
   switchLocalCommunicationIds_2: 
   switchLocalCommunicationIds_3: 
@@ -594,7 +542,7 @@ PlayerSettings:
   ps4DownloadDataSize: 0
   ps4GarlicHeapSize: 2048
   ps4ProGarlicHeapSize: 2560
-  ps4Passcode: eaoEiIgxIX4a2dREbbSqWy6yhKIDCdJO
+  ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
   ps4pnSessions: 1
   ps4pnPresence: 1
   ps4pnFriends: 1
@@ -641,7 +589,7 @@ PlayerSettings:
   psp2LiveAreaTrialPath: 
   psp2PatchChangeInfoPath: 
   psp2PatchOriginalPackage: 
-  psp2PackagePassword: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
+  psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui
   psp2KeystoneFile: 
   psp2MemoryExpansionMode: 0
   psp2DRMType: 0
@@ -691,28 +639,38 @@ PlayerSettings:
     2: CROSS_PLATFORM_INPUT
     4: CROSS_PLATFORM_INPUT;MOBILE_INPUT
     7: CROSS_PLATFORM_INPUT;MOBILE_INPUT
+    14: MOBILE_INPUT
     15: CROSS_PLATFORM_INPUT;MOBILE_INPUT
     16: CROSS_PLATFORM_INPUT;MOBILE_INPUT
-  platformArchitecture: {}
+    17: MOBILE_INPUT
+    20: MOBILE_INPUT
+  platformArchitecture:
+    iOS: 2
   scriptingBackend:
     Android: 0
+    Metro: 2
+    PS4: 0
     Standalone: 0
+    WP8: 2
+    WebGL: 1
+    iOS: 1
   il2cppCompilerConfiguration: {}
-  incrementalIl2cppBuild: {}
+  incrementalIl2cppBuild:
+    iOS: 0
   allowUnsafeCode: 0
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 0
   apiCompatibilityLevelPerPlatform: {}
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
-  metroPackageName: test3
+  metroPackageName: VRStandardAssets
   metroPackageVersion: 
   metroCertificatePath: 
   metroCertificatePassword: 
   metroCertificateSubject: 
   metroCertificateIssuer: 
   metroCertificateNotAfter: 0000000000000000
-  metroApplicationDescription: test3
+  metroApplicationDescription: VRStandardAssets
   wsaImages: {}
   metroTileShortName: 
   metroTileShowName: 0
@@ -769,16 +727,7 @@ PlayerSettings:
     daydream:
       daydreamIconForeground: {fileID: 0}
       daydreamIconBackground: {fileID: 0}
-  cloudServicesEnabled:
-    Analytics: 0
-    Build: 0
-    Collab: 0
-    ErrorHub: 0
-    Game_Performance: 0
-    Hub: 0
-    Purchasing: 0
-    UNet: 0
-    Unity_Ads: 0
+  cloudServicesEnabled: {}
   facebookSdkVersion: 7.9.1
   apiCompatibilityLevel: 2
   cloudProjectId: 

BIN
SARDINC/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll


BIN
SARDINC/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb


BIN
SARDINC/Library/ScriptAssemblies/Assembly-CSharp.dll


BIN
SARDINC/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb


BIN
SARDINC/Library/ScriptMapper


BIN
SARDINC/Library/assetDatabase3


BIN
SARDINC/Library/expandedItems


BIN
SARDINC/Library/metadata/1f/1fc53ff90e6a94bf3b371b26dc5d82b6


BIN
SARDINC/Library/metadata/1f/1fc53ff90e6a94bf3b371b26dc5d82b6.info


BIN
SARDINC/Library/metadata/7a/7acc4619d4cb5e64e9ed05e5a7a8099f


BIN
SARDINC/Library/metadata/99/99c9720ab356a0642a771bea13969a05


BIN
SARDINC/Library/metadata/99/99c9720ab356a0642a771bea13969a05.info


+ 0 - 30
SARDINC/Library/shadercompiler-UnityShaderCompiler0.log

@@ -1,34 +1,4 @@
 Base path: /Applications/Unity/Unity.app/Contents
 Cmd: initializeCompiler
-Cmd: compileSnippet
-  api=9 type=0 insize=1878 outsize=3825 kw=STEREO_MULTIVIEW_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER2 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=0 insize=1878 outsize=3908 kw=STEREO_INSTANCING_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=1 insize=1878 outsize=0 kw= pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER SHADER_API_MOBILE UNITY_HARDWARE_TIER1 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=1 insize=1878 outsize=0 kw=STEREO_INSTANCING_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER2 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
 Cmd: initializeCompiler
-Cmd: compileSnippet
-  api=9 type=0 insize=1878 outsize=2915 kw= pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER SHADER_API_MOBILE UNITY_HARDWARE_TIER1 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
 Cmd: initializeCompiler
-Cmd: compileSnippet
-  api=14 type=0 insize=1564 outsize=3914 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL SHADOWS_SCREEN LIGHTPROBE_SH _EMISSION pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=14 type=1 insize=1564 outsize=8362 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL SHADOWS_SCREEN LIGHTPROBE_SH _EMISSION pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=14 type=0 insize=1564 outsize=3441 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL _EMISSION pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=14 type=1 insize=1564 outsize=5334 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL _EMISSION pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=14 type=0 insize=17531 outsize=2351 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=14 type=1 insize=17531 outsize=1336 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=14 type=0 insize=17531 outsize=3628 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=14 type=1 insize=17531 outsize=1471 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=14 type=0 insize=4349 outsize=2351 kw=UNITY_PASS_FORWARDADD DIRECTIONAL pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=14 type=1 insize=4349 outsize=1336 kw=UNITY_PASS_FORWARDADD DIRECTIONAL pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1

+ 0 - 12
SARDINC/Library/shadercompiler-UnityShaderCompiler1.log

@@ -1,16 +1,4 @@
 Base path: /Applications/Unity/Unity.app/Contents
 Cmd: initializeCompiler
-Cmd: compileSnippet
-  api=9 type=0 insize=1878 outsize=2915 kw= pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=0 insize=1878 outsize=3825 kw=STEREO_MULTIVIEW_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=1 insize=1878 outsize=0 kw= pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=1 insize=1878 outsize=0 kw=STEREO_MULTIVIEW_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER2 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=1 insize=1878 outsize=0 kw=STEREO_INSTANCING_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
 Cmd: initializeCompiler
 Cmd: initializeCompiler
-
-Quitting shader compiler process

+ 0 - 10
SARDINC/Library/shadercompiler-UnityShaderCompiler2.log

@@ -1,14 +1,4 @@
 Base path: /Applications/Unity/Unity.app/Contents
 Cmd: initializeCompiler
-Cmd: compileSnippet
-  api=9 type=0 insize=1878 outsize=3825 kw=STEREO_MULTIVIEW_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER SHADER_API_MOBILE UNITY_HARDWARE_TIER1 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=0 insize=1878 outsize=3908 kw=STEREO_INSTANCING_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER2 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=1 insize=1878 outsize=0 kw=STEREO_MULTIVIEW_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER SHADER_API_MOBILE UNITY_HARDWARE_TIER1 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=1 insize=1878 outsize=0 kw=STEREO_INSTANCING_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER SHADER_API_MOBILE UNITY_HARDWARE_TIER1 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
 Cmd: initializeCompiler
 Cmd: initializeCompiler
-
-Quitting shader compiler process

+ 0 - 12
SARDINC/Library/shadercompiler-UnityShaderCompiler3.log

@@ -1,16 +1,4 @@
 Base path: /Applications/Unity/Unity.app/Contents
 Cmd: initializeCompiler
-Cmd: compileSnippet
-  api=9 type=0 insize=1878 outsize=2915 kw= pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER2 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=0 insize=1878 outsize=3908 kw=STEREO_INSTANCING_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER SHADER_API_MOBILE UNITY_HARDWARE_TIER1 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=1 insize=1878 outsize=0 kw= pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER2 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
-Cmd: compileSnippet
-  api=9 type=1 insize=1878 outsize=0 kw=STEREO_MULTIVIEW_ON pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
 Cmd: initializeCompiler
-Cmd: compileSnippet
-  api=9 type=0 insize=1476 outsize=1442 kw= pd=UNITY_NO_DXT5nm UNITY_NO_RGBM UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_MOBILE UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
 Cmd: initializeCompiler
-
-Quitting shader compiler process

+ 15 - 12
SARDINC/ProjectSettings/AudioManager.asset

@@ -1,12 +1,15 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!11 &1
-AudioManager:
-  m_ObjectHideFlags: 0
-  m_Volume: 1
-  Rolloff Scale: 1
-  m_SpeedOfSound: 347
-  Doppler Factor: 1
-  Default Speaker Mode: 2
-  m_DSPBufferSize: 0
-  m_DisableAudio: 0
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!11 &1
+AudioManager:
+  m_ObjectHideFlags: 0
+  m_Volume: 1
+  Rolloff Scale: 1
+  Doppler Factor: 1
+  Default Speaker Mode: 2
+  m_SampleRate: 0
+  m_DSPBufferSize: 0
+  m_VirtualVoiceCount: 512
+  m_RealVoiceCount: 32
+  m_SpatializerPlugin: 
+  m_DisableAudio: 0

+ 20 - 16
SARDINC/ProjectSettings/DynamicsManager.asset

@@ -1,16 +1,20 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!55 &1
-PhysicsManager:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Gravity: {x: 0, y: -9.81, z: 0}
-  m_DefaultMaterial: {fileID: 0}
-  m_BounceThreshold: 2
-  m_SleepThreshold: 0.005
-  m_DefaultContactOffset: 0.01
-  m_SolverIterationCount: 6
-  m_SolverVelocityIterations: 1
-  m_QueriesHitTriggers: 1
-  m_EnableAdaptiveForce: 0
-  m_LayerCollisionMatrix: fb7ffffffb7fffffd87effffffffffffff7ffffffb7ffffffffffffffffffffffb7dffffff74ffffff7fffffff7dfdffff7fffffff7fffffff7fffffc800fffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!55 &1
+PhysicsManager:
+  m_ObjectHideFlags: 0
+  serializedVersion: 3
+  m_Gravity: {x: 0, y: -9.81, z: 0}
+  m_DefaultMaterial: {fileID: 0}
+  m_BounceThreshold: 2
+  m_SleepThreshold: 0.005
+  m_DefaultContactOffset: 0.01
+  m_DefaultSolverIterations: 6
+  m_DefaultSolverVelocityIterations: 1
+  m_QueriesHitBackfaces: 0
+  m_QueriesHitTriggers: 1
+  m_EnableAdaptiveForce: 0
+  m_EnablePCM: 1
+  m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffff7ffffdffbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_AutoSimulation: 1
+  m_AutoSyncTransforms: 1

+ 16 - 4
SARDINC/ProjectSettings/EditorBuildSettings.asset

@@ -6,11 +6,23 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 0
-    path: 
-    guid: 00000000000000000000000000000000
+    path: Assets/VRSampleScenes/Scenes/Intro.unity
+    guid: 1c5fe2bf037ade84ca9ed9d97b0e1b97
   - enabled: 0
-    path: Assets/Oculus/VR/Scenes/GearVrControllerTest.unity
-    guid: d56af3aeb2176e7459f753c1c2e2dd97
+    path: Assets/VRSampleScenes/Scenes/MainMenu.unity
+    guid: 3959fdef1e02d4d4fb01414c7de44414
+  - enabled: 0
+    path: Assets/VRSampleScenes/Scenes/Maze.unity
+    guid: 00d8d8904282de34ca5c4e676602d75f
+  - enabled: 0
+    path: Assets/VRSampleScenes/Scenes/Flyer.unity
+    guid: 105cf9eb7fcb45844a1354966d06fcf1
+  - enabled: 0
+    path: Assets/VRSampleScenes/Scenes/Shooter360.unity
+    guid: 77d89b9deefb6a5438a228683e280537
+  - enabled: 0
+    path: Assets/VRSampleScenes/Scenes/Shooter180.unity
+    guid: b62ef4a8c87fa764bbfdb7d250ce1c08
   - enabled: 1
     path: Assets/Scenes/Movement.unity
     guid: e9e2f37be19e14adfadf7fe6b4172527

+ 15 - 15
SARDINC/ProjectSettings/EditorSettings.asset

@@ -1,15 +1,15 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!159 &1
-EditorSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 3
-  m_ExternalVersionControlSupport: Visible Meta Files
-  m_SerializationMode: 2
-  m_WebSecurityEmulationEnabled: 0
-  m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d
-  m_DefaultBehaviorMode: 0
-  m_SpritePackerMode: 2
-  m_SpritePackerPaddingPower: 1
-  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
-  m_ProjectGenerationRootNamespace: 
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!159 &1
+EditorSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 3
+  m_ExternalVersionControlSupport: Visible Meta Files
+  m_SerializationMode: 2
+  m_WebSecurityEmulationEnabled: 0
+  m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d
+  m_DefaultBehaviorMode: 0
+  m_SpritePackerMode: 2
+  m_SpritePackerPaddingPower: 1
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
+  m_ProjectGenerationRootNamespace: 

+ 1 - 1
SARDINC/ProjectSettings/GraphicsSettings.asset

@@ -35,9 +35,9 @@ GraphicsSettings:
   - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

+ 32 - 736
SARDINC/ProjectSettings/InputManager.asset

@@ -13,9 +13,9 @@ InputManager:
     positiveButton: right
     altNegativeButton: a
     altPositiveButton: d
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
+    gravity: 10
+    dead: 0.001
+    sensitivity: 10
     snap: 1
     invert: 0
     type: 0
@@ -29,9 +29,9 @@ InputManager:
     positiveButton: up
     altNegativeButton: s
     altPositiveButton: w
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
+    gravity: 10
+    dead: 0.001
+    sensitivity: 10
     snap: 1
     invert: 0
     type: 0
@@ -46,7 +46,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: mouse 0
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -62,7 +62,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: mouse 1
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -74,11 +74,11 @@ InputManager:
     descriptiveName: 
     descriptiveNegativeName: 
     negativeButton: 
-    positiveButton: left cmd
+    positiveButton: left shift
     altNegativeButton: 
     altPositiveButton: mouse 2
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -94,7 +94,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -111,7 +111,7 @@ InputManager:
     altPositiveButton: 
     gravity: 0
     dead: 0
-    sensitivity: .100000001
+    sensitivity: 0.1
     snap: 0
     invert: 0
     type: 1
@@ -127,7 +127,7 @@ InputManager:
     altPositiveButton: 
     gravity: 0
     dead: 0
-    sensitivity: .100000001
+    sensitivity: 0.1
     snap: 0
     invert: 0
     type: 1
@@ -143,7 +143,7 @@ InputManager:
     altPositiveButton: 
     gravity: 0
     dead: 0
-    sensitivity: .100000001
+    sensitivity: 0.1
     snap: 0
     invert: 0
     type: 1
@@ -158,7 +158,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .189999998
+    dead: 0.19
     sensitivity: 1
     snap: 0
     invert: 0
@@ -174,7 +174,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .189999998
+    dead: 0.19
     sensitivity: 1
     snap: 0
     invert: 1
@@ -190,7 +190,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -206,7 +206,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -222,7 +222,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -238,7 +238,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -254,7 +254,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: joystick button 0
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -270,7 +270,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: space
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
@@ -284,719 +284,15 @@ InputManager:
     negativeButton: 
     positiveButton: escape
     altNegativeButton: 
-    altPositiveButton: joystick button 1
+    altPositiveButton: joystick button 7
     gravity: 1000
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1000
     snap: 0
     invert: 0
     type: 0
     axis: 0
     joyNum: 0
-  - serializedVersion: 3
-    m_Name: Left_X_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 2
-    axis: 0
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Left_Y_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 1
-    type: 2
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Button A
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 0
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Button B
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 1
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Button X
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 2
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Button Y
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 3
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Start
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 10
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Back
-    descriptiveName: Also called Select
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 11
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: LeftShoulder
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 4
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: RightShoulder
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 5
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Right_X_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 2
-    axis: 2
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Right_Y_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 1
-    type: 2
-    axis: 3
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: DPad_X_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 2
-    axis: 4
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: DPad_Y_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 1
-    type: 2
-    axis: 5
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Up
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Down
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Left
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Right
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: LeftTrigger
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: RightTrigger
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: LStick
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: RStick
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Left_X_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: a
-    positiveButton: d
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Left_Y_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: s
-    positiveButton: w
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Button A
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Button B
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: mouse 1
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Button X
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: left shift
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Button Y
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: space
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Start
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: return
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Back
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: right shift
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_LeftShoulder
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: q
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_RightShoulder
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: e
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Right_X_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Right_Y_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_DPad_X_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: left
-    positiveButton: right
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 4
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_DPad_Y_Axis
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: down
-    positiveButton: up
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 5
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Up
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: up
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Down
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Left
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_Right
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_LeftTrigger
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_RightTrigger
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_LStick
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
-  - serializedVersion: 3
-    m_Name: Desktop_RStick
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 3
-    dead: .00100000005
-    sensitivity: 3
-    snap: 0
-    invert: 0
-    type: 1
-    axis: 1
-    joyNum: 1
   - serializedVersion: 3
     m_Name: Oculus_GearVR_LThumbstickX
     descriptiveName: 
@@ -1006,7 +302,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1
     snap: 0
     invert: 0
@@ -1022,7 +318,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1
     snap: 0
     invert: 1
@@ -1038,7 +334,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1
     snap: 0
     invert: 0
@@ -1054,7 +350,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1
     snap: 0
     invert: 1
@@ -1070,7 +366,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1
     snap: 0
     invert: 0
@@ -1086,7 +382,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1
     snap: 0
     invert: 1
@@ -1102,7 +398,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1
     snap: 0
     invert: 0
@@ -1118,7 +414,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: .00100000005
+    dead: 0.001
     sensitivity: 1
     snap: 0
     invert: 0

+ 2 - 2
SARDINC/ProjectSettings/NavMeshAreas.asset

@@ -16,8 +16,8 @@ NavMeshLayers:
     cost: 2
     editType: 2
   User Layer 0:
-    name: 
-    cost: 1
+    name: Terrain
+    cost: 50
     editType: 3
   User Layer 1:
     name: 

+ 37 - 24
SARDINC/ProjectSettings/Physics2DSettings.asset

@@ -1,24 +1,37 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!19 &1
-Physics2DSettings:
-  m_ObjectHideFlags: 0
-  m_Gravity: {x: 0, y: -9.81000042}
-  m_DefaultMaterial: {fileID: 0}
-  m_VelocityIterations: 8
-  m_PositionIterations: 3
-  m_VelocityThreshold: 1
-  m_MaxLinearCorrection: .200000003
-  m_MaxAngularCorrection: 8
-  m_MaxTranslationSpeed: 100
-  m_MaxRotationSpeed: 360
-  m_MinPenetrationForPenalty: .00999999978
-  m_BaumgarteScale: .200000003
-  m_BaumgarteTimeOfImpactScale: .75
-  m_TimeToSleep: .5
-  m_LinearSleepTolerance: .00999999978
-  m_AngularSleepTolerance: 2
-  m_RaycastsHitTriggers: 1
-  m_RaycastsStartInColliders: 1
-  m_ChangeStopsCallbacks: 1
-  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!19 &1
+Physics2DSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 3
+  m_Gravity: {x: 0, y: -9.81}
+  m_DefaultMaterial: {fileID: 0}
+  m_VelocityIterations: 8
+  m_PositionIterations: 3
+  m_VelocityThreshold: 1
+  m_MaxLinearCorrection: 0.2
+  m_MaxAngularCorrection: 8
+  m_MaxTranslationSpeed: 100
+  m_MaxRotationSpeed: 360
+  m_BaumgarteScale: 0.2
+  m_BaumgarteTimeOfImpactScale: 0.75
+  m_TimeToSleep: 0.5
+  m_LinearSleepTolerance: 0.01
+  m_AngularSleepTolerance: 2
+  m_DefaultContactOffset: 0.01
+  m_AutoSimulation: 1
+  m_QueriesHitTriggers: 1
+  m_QueriesStartInColliders: 1
+  m_ChangeStopsCallbacks: 0
+  m_CallbacksOnDisable: 1
+  m_AutoSyncTransforms: 1
+  m_AlwaysShowColliders: 0
+  m_ShowColliderSleep: 1
+  m_ShowColliderContacts: 0
+  m_ShowColliderAABB: 0
+  m_ContactArrowScale: 0.2
+  m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412}
+  m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
+  m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
+  m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
+  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

+ 1 - 22
SARDINC/ProjectSettings/PresetManager.asset

@@ -3,25 +3,4 @@
 --- !u!1386491679 &1
 PresetManager:
   m_ObjectHideFlags: 0
-  m_DefaultList:
-  - type:
-      m_NativeTypeID: 108
-      m_ManagedTypePPtr: {fileID: 0}
-      m_ManagedTypeFallback: 
-    defaultPresets:
-    - m_Preset: {fileID: 2655988077585873504, guid: c1cf8506f04ef2c4a88b64b6c4202eea,
-        type: 2}
-  - type:
-      m_NativeTypeID: 1020
-      m_ManagedTypePPtr: {fileID: 0}
-      m_ManagedTypeFallback: 
-    defaultPresets:
-    - m_Preset: {fileID: 2655988077585873504, guid: 0cd792cc87e492d43b4e95b205fc5cc6,
-        type: 2}
-  - type:
-      m_NativeTypeID: 1006
-      m_ManagedTypePPtr: {fileID: 0}
-      m_ManagedTypeFallback: 
-    defaultPresets:
-    - m_Preset: {fileID: 2655988077585873504, guid: 7a99f8aa944efe94cb9bd74562b7d5f9,
-        type: 2}
+  m_DefaultList: []

+ 51 - 102
SARDINC/ProjectSettings/ProjectSettings.asset

@@ -4,7 +4,7 @@
 PlayerSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 15
-  productGUID: a0ee0e81a0b6f4363b9389cd71e5626f
+  productGUID: 96d47d3d5663547f198879b5da225d41
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
   AndroidEnableSustainedPerformanceMode: 0
@@ -46,14 +46,14 @@ PlayerSettings:
   defaultScreenHeight: 768
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
-  m_StereoRenderingPath: 1
+  m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   m_MTRendering: 1
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
   iosAppInBackgroundBehavior: 0
-  displayResolutionDialog: 2
+  displayResolutionDialog: 1
   iosAllowHTTPDownload: 1
   allowedAutorotateToPortrait: 1
   allowedAutorotateToPortraitUpsideDown: 1
@@ -66,7 +66,7 @@ PlayerSettings:
   androidBlitType: 0
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
-  runInBackground: 0
+  runInBackground: 1
   captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0
@@ -80,14 +80,14 @@ PlayerSettings:
   resizableWindow: 0
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
-  gpuSkinning: 0
+  gpuSkinning: 1
   graphicsJobs: 0
   xboxPIXTextureCapture: 0
   xboxEnableAvatar: 0
   xboxEnableKinect: 0
   xboxEnableKinectAutoTracking: 0
   xboxEnableFitness: 0
-  visibleInBackground: 1
+  visibleInBackground: 0
   allowFullscreenSwitch: 1
   graphicsJobMode: 0
   fullscreenMode: 2
@@ -118,11 +118,8 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.26.0
-  preloadedAssets:
-  - {fileID: 4800000, guid: d0f6e1942d3d1f946a96fd8a00175474, type: 3}
-  - {fileID: 4800000, guid: d7662dbac0646464a9b4a48e93989adb, type: 3}
-  - {fileID: 4800000, guid: 10513ef587704324487f3061a7e6699d, type: 3}
+  bundleVersion: 1.0
+  preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -144,7 +141,7 @@ PlayerSettings:
       depthBufferSharingEnabled: 0
     oculus:
       sharedDepthBuffer: 0
-      dashSupport: 1
+      dashSupport: 0
     enable360StereoCapture: 0
   protectGraphicsMemory: 0
   useHDRDisplay: 0
@@ -154,15 +151,15 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.oculus.SampleFramework
-    Standalone: unity.Oculus.Oculus Sample Framework
-    Tizen: com.oculus.SampleFramework
-    iOS: com.oculus.SampleFramework
-    tvOS: com.oculus.SampleFramework
+    Android: com.unity3d.vrstandardassets
+    Standalone: unity.Unity.VRSamples
+    Tizen: com.unity3d.vrstandardassets
+    iOS: com.unity3d.vrstandardassets
+    tvOS: com.unity3d.vrstandardassets
   buildNumber:
     iOS: 0
-  AndroidBundleVersionCode: 1260
-  AndroidMinSdkVersion: 22
+  AndroidBundleVersionCode: 1
+  AndroidMinSdkVersion: 21
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 0
   aotOptions: 
@@ -187,7 +184,7 @@ PlayerSettings:
   uIStatusBarHidden: 1
   uIExitOnSuspend: 0
   uIStatusBarStyle: 0
-  iPhoneSplashScreen: {fileID: 2800000, guid: 26dc65579eeccb5459aba31059963385, type: 3}
+  iPhoneSplashScreen: {fileID: 0}
   iPhoneHighResSplashScreen: {fileID: 0}
   iPhoneTallHighResSplashScreen: {fileID: 0}
   iPhone47inSplashScreen: {fileID: 0}
@@ -214,7 +211,7 @@ PlayerSettings:
   iOSLaunchScreenLandscape: {fileID: 0}
   iOSLaunchScreenBackgroundColor:
     serializedVersion: 2
-    rgba: 4280889894
+    rgba: 0
   iOSLaunchScreenFillPct: 100
   iOSLaunchScreenSize: 100
   iOSLaunchScreenCustomXibPath: 
@@ -244,10 +241,10 @@ PlayerSettings:
   iOSRequireARKit: 0
   appleEnableProMotion: 0
   vulkanEditorSupport: 0
-  clonedFromGUID: 12065089a9f5ec34e87ba8be4a876998
+  clonedFromGUID: 5a86b210c1fdd0a47944fb1e9e3bc5bd
   templatePackageId: 
   templateDefaultScene: 
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 5
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: 
@@ -268,7 +265,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: 3e23487af1607f7488030f4c790bde92, type: 3}
+      m_Icon: {fileID: 2800000, guid: 8de506d4489bff74488535c40e1f6f59, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0
@@ -336,76 +333,27 @@ PlayerSettings:
       m_Kind: 1
       m_SubKind: 
   m_BuildTargetBatching:
-  - m_BuildTarget: Android
-    m_StaticBatching: 1
-    m_DynamicBatching: 1
   - m_BuildTarget: Standalone
+    m_StaticBatching: 0
+    m_DynamicBatching: 0
+  - m_BuildTarget: Android
     m_StaticBatching: 1
-    m_DynamicBatching: 1
+    m_DynamicBatching: 0
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: WindowsStandaloneSupport
     m_APIs: 02000000
-    m_Automatic: 0
-  - m_BuildTarget: AndroidPlayer
-    m_APIs: 0b000000
-    m_Automatic: 0
+    m_Automatic: 1
   m_BuildTargetVRSettings:
-  - m_BuildTarget: Android
+  - m_BuildTarget: Standalone
     m_Enabled: 1
     m_Devices:
     - Oculus
-  - m_BuildTarget: Metro
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: N3DS
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: PS3
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: PS4
-    m_Enabled: 0
-    m_Devices:
-    - PlayStationVR
-  - m_BuildTarget: PSM
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: PSP2
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: SamsungTV
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: Standalone
+  - m_BuildTarget: Android
     m_Enabled: 1
     m_Devices:
     - Oculus
-  - m_BuildTarget: Tizen
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: WebGL
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: WebPlayer
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: WiiU
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: Xbox360
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: XboxOne
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: iOS
-    m_Enabled: 0
-    m_Devices: []
-  - m_BuildTarget: tvOS
-    m_Enabled: 0
-    m_Devices: []
   m_BuildTargetEnableVuforiaSettings: []
-  openGLRequireES31: 1
+  openGLRequireES31: 0
   openGLRequireES31AEP: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
@@ -435,7 +383,7 @@ PlayerSettings:
   switchSocketConcurrencyLimit: 14
   switchScreenResolutionBehavior: 2
   switchUseCPUProfiler: 0
-  switchApplicationID: 0x01004b9000490000
+  switchApplicationID: 0x0005000C10000001
   switchNSODependencies: 
   switchTitleNames_0: 
   switchTitleNames_1: 
@@ -501,7 +449,7 @@ PlayerSettings:
   switchAccessibleURLs: 
   switchLegalInformation: 
   switchMainThreadStackSize: 1048576
-  switchPresenceGroupId: 
+  switchPresenceGroupId: 0x0005000C10000001
   switchLogoHandling: 0
   switchReleaseVersion: 0
   switchDisplayVersion: 1.0.0
@@ -513,8 +461,8 @@ PlayerSettings:
   switchUserAccountSaveDataSize: 0
   switchUserAccountSaveDataJournalSize: 0
   switchApplicationAttribute: 0
-  switchCardSpecSize: -1
-  switchCardSpecClock: -1
+  switchCardSpecSize: 4
+  switchCardSpecClock: 25
   switchRatingsMask: 0
   switchRatingsInt_0: 0
   switchRatingsInt_1: 0
@@ -528,7 +476,7 @@ PlayerSettings:
   switchRatingsInt_9: 0
   switchRatingsInt_10: 0
   switchRatingsInt_11: 0
-  switchLocalCommunicationIds_0: 
+  switchLocalCommunicationIds_0: 0x0005000C10000001
   switchLocalCommunicationIds_1: 
   switchLocalCommunicationIds_2: 
   switchLocalCommunicationIds_3: 
@@ -594,7 +542,7 @@ PlayerSettings:
   ps4DownloadDataSize: 0
   ps4GarlicHeapSize: 2048
   ps4ProGarlicHeapSize: 2560
-  ps4Passcode: eaoEiIgxIX4a2dREbbSqWy6yhKIDCdJO
+  ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
   ps4pnSessions: 1
   ps4pnPresence: 1
   ps4pnFriends: 1
@@ -641,7 +589,7 @@ PlayerSettings:
   psp2LiveAreaTrialPath: 
   psp2PatchChangeInfoPath: 
   psp2PatchOriginalPackage: 
-  psp2PackagePassword: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
+  psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui
   psp2KeystoneFile: 
   psp2MemoryExpansionMode: 0
   psp2DRMType: 0
@@ -691,28 +639,38 @@ PlayerSettings:
     2: CROSS_PLATFORM_INPUT
     4: CROSS_PLATFORM_INPUT;MOBILE_INPUT
     7: CROSS_PLATFORM_INPUT;MOBILE_INPUT
+    14: MOBILE_INPUT
     15: CROSS_PLATFORM_INPUT;MOBILE_INPUT
     16: CROSS_PLATFORM_INPUT;MOBILE_INPUT
-  platformArchitecture: {}
+    17: MOBILE_INPUT
+    20: MOBILE_INPUT
+  platformArchitecture:
+    iOS: 2
   scriptingBackend:
     Android: 0
+    Metro: 2
+    PS4: 0
     Standalone: 0
+    WP8: 2
+    WebGL: 1
+    iOS: 1
   il2cppCompilerConfiguration: {}
-  incrementalIl2cppBuild: {}
+  incrementalIl2cppBuild:
+    iOS: 0
   allowUnsafeCode: 0
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 0
   apiCompatibilityLevelPerPlatform: {}
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
-  metroPackageName: test3
+  metroPackageName: VRStandardAssets
   metroPackageVersion: 
   metroCertificatePath: 
   metroCertificatePassword: 
   metroCertificateSubject: 
   metroCertificateIssuer: 
   metroCertificateNotAfter: 0000000000000000
-  metroApplicationDescription: test3
+  metroApplicationDescription: VRStandardAssets
   wsaImages: {}
   metroTileShortName: 
   metroTileShowName: 0
@@ -769,16 +727,7 @@ PlayerSettings:
     daydream:
       daydreamIconForeground: {fileID: 0}
       daydreamIconBackground: {fileID: 0}
-  cloudServicesEnabled:
-    Analytics: 0
-    Build: 0
-    Collab: 0
-    ErrorHub: 0
-    Game_Performance: 0
-    Hub: 0
-    Purchasing: 0
-    UNet: 0
-    Unity_Ads: 0
+  cloudServicesEnabled: {}
   facebookSdkVersion: 7.9.1
   apiCompatibilityLevel: 2
   cloudProjectId: 

+ 175 - 99
SARDINC/ProjectSettings/QualitySettings.asset

@@ -1,99 +1,175 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!47 &1
-QualitySettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 5
-  m_CurrentQuality: 1
-  m_QualitySettings:
-  - serializedVersion: 2
-    name: Rift
-    pixelLightCount: 5
-    shadows: 2
-    shadowResolution: 2
-    shadowProjection: 1
-    shadowCascades: 4
-    shadowDistance: 150
-    shadowNearPlaneOffset: 2
-    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.19999999, z: 0.46666664}
-    shadowmaskMode: 0
-    blendWeights: 4
-    textureQuality: 0
-    anisotropicTextures: 2
-    antiAliasing: 8
-    softParticles: 0
-    softVegetation: 1
-    realtimeReflectionProbes: 0
-    billboardsFaceCameraPosition: 0
-    vSyncCount: 0
-    lodBias: 2
-    maximumLODLevel: 0
-    streamingMipmapsActive: 0
-    streamingMipmapsAddAllCameras: 1
-    streamingMipmapsMemoryBudget: 512
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
-    streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 4096
-    asyncUploadTimeSlice: 2
-    asyncUploadBufferSize: 4
-    resolutionScalingFixedDPIFactor: 1
-    excludedTargetPlatforms:
-    - Android
-    - iPhone
-    - Web
-    - BlackBerry
-    - WP8
-    - Windows Store Apps
-  - serializedVersion: 2
-    name: GearVR
-    pixelLightCount: 1
-    shadows: 1
-    shadowResolution: 1
-    shadowProjection: 1
-    shadowCascades: 2
-    shadowDistance: 150
-    shadowNearPlaneOffset: 2
-    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 0
-    blendWeights: 4
-    textureQuality: 0
-    anisotropicTextures: 1
-    antiAliasing: 4
-    softParticles: 0
-    softVegetation: 1
-    realtimeReflectionProbes: 1
-    billboardsFaceCameraPosition: 1
-    vSyncCount: 0
-    lodBias: 2
-    maximumLODLevel: 0
-    streamingMipmapsActive: 0
-    streamingMipmapsAddAllCameras: 1
-    streamingMipmapsMemoryBudget: 512
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
-    streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 4096
-    asyncUploadTimeSlice: 2
-    asyncUploadBufferSize: 4
-    resolutionScalingFixedDPIFactor: 1
-    excludedTargetPlatforms:
-    - Web
-    - Standalone
-    - iPhone
-    - BlackBerry
-    - Windows Store Apps
-    - WP8
-  m_PerPlatformDefaultQuality:
-    Android: 0
-    BlackBerry: 0
-    Samsung TV: 0
-    Standalone: 0
-    Tizen: 0
-    WP8: 0
-    Web: 0
-    WebGL: 0
-    Windows Store Apps: 0
-    iPhone: 0
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!47 &1
+QualitySettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 5
+  m_CurrentQuality: 2
+  m_QualitySettings:
+  - serializedVersion: 2
+    name: Fast
+    pixelLightCount: 0
+    shadows: 0
+    shadowResolution: 0
+    shadowProjection: 1
+    shadowCascades: 1
+    shadowDistance: 20
+    shadowNearPlaneOffset: 2
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    blendWeights: 2
+    textureQuality: 0
+    anisotropicTextures: 0
+    antiAliasing: 0
+    softParticles: 0
+    softVegetation: 0
+    realtimeReflectionProbes: 0
+    billboardsFaceCameraPosition: 0
+    vSyncCount: 0
+    lodBias: 0.4
+    maximumLODLevel: 0
+    particleRaycastBudget: 16
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 4
+    excludedTargetPlatforms: []
+  - serializedVersion: 2
+    name: Fastest
+    pixelLightCount: 0
+    shadows: 0
+    shadowResolution: 0
+    shadowProjection: 1
+    shadowCascades: 1
+    shadowDistance: 15
+    shadowNearPlaneOffset: 2
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    blendWeights: 1
+    textureQuality: 1
+    anisotropicTextures: 0
+    antiAliasing: 0
+    softParticles: 0
+    softVegetation: 0
+    realtimeReflectionProbes: 0
+    billboardsFaceCameraPosition: 0
+    vSyncCount: 0
+    lodBias: 0.3
+    maximumLODLevel: 0
+    particleRaycastBudget: 4
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 4
+    excludedTargetPlatforms: []
+  - serializedVersion: 2
+    name: Simple
+    pixelLightCount: 1
+    shadows: 1
+    shadowResolution: 0
+    shadowProjection: 1
+    shadowCascades: 1
+    shadowDistance: 20
+    shadowNearPlaneOffset: 2
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    blendWeights: 2
+    textureQuality: 0
+    anisotropicTextures: 1
+    antiAliasing: 4
+    softParticles: 0
+    softVegetation: 0
+    realtimeReflectionProbes: 0
+    billboardsFaceCameraPosition: 0
+    vSyncCount: 0
+    lodBias: 0.7
+    maximumLODLevel: 0
+    particleRaycastBudget: 64
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 4
+    excludedTargetPlatforms: []
+  - serializedVersion: 2
+    name: Good
+    pixelLightCount: 2
+    shadows: 2
+    shadowResolution: 1
+    shadowProjection: 1
+    shadowCascades: 2
+    shadowDistance: 40
+    shadowNearPlaneOffset: 2
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    blendWeights: 2
+    textureQuality: 0
+    anisotropicTextures: 1
+    antiAliasing: 4
+    softParticles: 0
+    softVegetation: 1
+    realtimeReflectionProbes: 0
+    billboardsFaceCameraPosition: 1
+    vSyncCount: 0
+    lodBias: 1
+    maximumLODLevel: 0
+    particleRaycastBudget: 256
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 4
+    excludedTargetPlatforms: []
+  - serializedVersion: 2
+    name: Beautiful
+    pixelLightCount: 3
+    shadows: 2
+    shadowResolution: 2
+    shadowProjection: 1
+    shadowCascades: 2
+    shadowDistance: 70
+    shadowNearPlaneOffset: 2
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    blendWeights: 4
+    textureQuality: 0
+    anisotropicTextures: 2
+    antiAliasing: 2
+    softParticles: 1
+    softVegetation: 1
+    realtimeReflectionProbes: 1
+    billboardsFaceCameraPosition: 1
+    vSyncCount: 0
+    lodBias: 1.5
+    maximumLODLevel: 0
+    particleRaycastBudget: 1024
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 4
+    excludedTargetPlatforms: []
+  - serializedVersion: 2
+    name: Fantastic
+    pixelLightCount: 4
+    shadows: 2
+    shadowResolution: 2
+    shadowProjection: 1
+    shadowCascades: 4
+    shadowDistance: 150
+    shadowNearPlaneOffset: 2
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.19999999, z: 0.46666664}
+    blendWeights: 4
+    textureQuality: 0
+    anisotropicTextures: 2
+    antiAliasing: 8
+    softParticles: 1
+    softVegetation: 1
+    realtimeReflectionProbes: 1
+    billboardsFaceCameraPosition: 1
+    vSyncCount: 0
+    lodBias: 2
+    maximumLODLevel: 0
+    particleRaycastBudget: 4096
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 4
+    excludedTargetPlatforms: []
+  m_PerPlatformDefaultQuality:
+    Android: 2
+    BlackBerry: 2
+    Samsung TV: 3
+    Standalone: 5
+    Tizen: 2
+    WP8: 2
+    Web: 5
+    WebGL: 2
+    Windows Store Apps: 3
+    iPhone: 2

+ 46 - 50
SARDINC/ProjectSettings/TagManager.asset

@@ -1,50 +1,46 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!78 &1
-TagManager:
-  serializedVersion: 2
-  tags:
-  - pickupAble
-  - bullet
-  - floor
-  - wall
-  - Fader
-  - dontmove
-  - listlast
-  layers:
-  - Default
-  - TransparentFX
-  - Ignore Raycast
-  - 
-  - Water
-  - UI
-  - 
-  - 
-  - NoFadeOut
-  - ColliderGrid
-  - Gazable
-  - Player
-  - LitStairs1
-  - LitStairs2
-  - Wall
-  - TeleportPoints
-  - DemoUI
-  - Toys
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  m_SortingLayers:
-  - name: Default
-    uniqueID: 0
-    locked: 0
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!78 &1
+TagManager:
+  serializedVersion: 2
+  tags: []
+  layers:
+  - Default
+  - TransparentFX
+  - Ignore Raycast
+  - 
+  - Water
+  - UI
+  - 
+  - 
+  - Ethan
+  - MazeWalls
+  - MazeTurret
+  - MazeTurretBullet
+  - Bg
+  - FPSWeapon
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  m_SortingLayers:
+  - name: Default
+    uniqueID: 0
+    locked: 0
+  - name: GUI
+    uniqueID: 2379361113
+    locked: 0

+ 8 - 8
SARDINC/ProjectSettings/TimeManager.asset

@@ -1,8 +1,8 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!5 &1
-TimeManager:
-  m_ObjectHideFlags: 0
-  Fixed Timestep: 0.011111111
-  Maximum Allowed Timestep: 0.02
-  m_TimeScale: 1
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!5 &1
+TimeManager:
+  m_ObjectHideFlags: 0
+  Fixed Timestep: .0199999996
+  Maximum Allowed Timestep: .333333343
+  m_TimeScale: 1

+ 1 - 1
SARDINC/obj/Debug/Assembly-CSharp-Editor.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e78177fb3059a6920c64aad7f73f1ff09cca0fd2
+0cb04026d809093860aa7116afc1a86b07af345e

+ 1 - 1
SARDINC/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-86366561faa4f47ade35a98bbcae48ebc765d0aa
+e5f2822ab94b04a92abb1119642b14fb76f43ee4

BIN
SARDINC/obj/Debug/Assembly-CSharp.csprojResolveAssemblyReference.cache