diff --git a/Assets/GraphX Data.asset b/Assets/GraphX Data.asset index 198b943..676b42c 100644 --- a/Assets/GraphX Data.asset +++ b/Assets/GraphX Data.asset @@ -23,12 +23,13 @@ MonoBehaviour: controllerMesh: {fileID: 4300000, guid: cb69a79fa4024c943846e5fefb4d90b4, type: 3} joystickMesh: {fileID: 4300000, guid: c1e013bed503e8f409f9c0ccc42890d4, type: 3} conArrowMesh: {fileID: 4300000, guid: 825a62388b1ce1040bc1eddefbc5ad23, type: 3} - faceMesh: {fileID: 4300036, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} + faceMesh: {fileID: 4300010, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} faceDefault: {fileID: 4300030, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} faceEat: {fileID: 4300010, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} faceEaten: {fileID: 4300036, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} faceBump: {fileID: 4300038, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} faceBoxGameover: {fileID: 4300032, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} faceSelfGameover: {fileID: 4300040, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} + faceHyper: {fileID: 4300094, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} poofMesh: {fileID: 4300078, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} dripMesh: {fileID: 4300076, guid: 1cc1b125262248c4ba967763bf40c861, type: 3} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 0f444b7..82ed73e 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1330,7 +1330,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &343354975 AudioSource: @@ -1671,7 +1671,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &408032442 MonoBehaviour: @@ -3125,7 +3125,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &850212508 Transform: m_ObjectHideFlags: 0 @@ -3824,7 +3824,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &950738597 GameObject: @@ -7075,7 +7075,7 @@ Transform: - {fileID: 950738598} - {fileID: 662602231} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1643476466 GameObject: @@ -7388,7 +7388,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bd2ade5f012df4e4896599b9558c1601, type: 3} m_Name: m_EditorClassIdentifier: - sideQuest: 1 + DRM: 1 design: {fileID: 11400000, guid: e32077fc3027a1b48909bb54527a2ad4, type: 2} metro: {fileID: 408032442} rig: {fileID: 416451007} @@ -7583,12 +7583,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1821719418} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1825209466 GameObject: @@ -8311,7 +8311,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &2081994160 AudioSource: diff --git a/Assets/Scripts/BoxUI.cs b/Assets/Scripts/BoxUI.cs index e5f3110..19d0673 100644 --- a/Assets/Scripts/BoxUI.cs +++ b/Assets/Scripts/BoxUI.cs @@ -36,7 +36,7 @@ public class BoxUI : MonoBehaviour void Awake() { - if (main.sideQuest) + if (main.DRM) { leaderboardText.transform.parent.gameObject.SetActive(false); usernameText.transform.parent.gameObject.SetActive(false); @@ -79,7 +79,7 @@ public class BoxUI : MonoBehaviour if (username != "anon") { - if (!main.sideQuest) + if (!main.DRM) { Leaderboards.WriteEntry("AnyBPM", (uint)highscore); diff --git a/Assets/Scripts/GraphX.cs b/Assets/Scripts/GraphX.cs index 31ecc4b..8be5118 100644 --- a/Assets/Scripts/GraphX.cs +++ b/Assets/Scripts/GraphX.cs @@ -155,10 +155,10 @@ public class GraphX rollTime = Mathf.Clamp01((60 / (float)main.bpm) / 27); } - if (!main.sideQuest) - { - return; - } + // if (!main.sideQuest) + // { + // return; + // } controllerMatrix.SetTRS( main.rig.controllerPos, diff --git a/Assets/Scripts/Main.cs b/Assets/Scripts/Main.cs index 2f23aa5..d33ac55 100644 --- a/Assets/Scripts/Main.cs +++ b/Assets/Scripts/Main.cs @@ -15,7 +15,10 @@ public class Main : MonoBehaviour public delegate void Reset(); public static event Reset OnReset; - public bool sideQuest; + // public bool sideQuest; + public bool DRM; + // pulic bool mobile; + // public bool 3dof; // DEPRECATED [Header("References")] public Design design; diff --git a/Assets/entezoa.blend b/Assets/entezoa.blend index 10e9a19..dfcfc17 100644 Binary files a/Assets/entezoa.blend and b/Assets/entezoa.blend differ diff --git a/Assets/entezoa.blend1 b/Assets/entezoa.blend1 index 046334f..5d5dc5a 100644 Binary files a/Assets/entezoa.blend1 and b/Assets/entezoa.blend1 differ diff --git a/Packages/manifest.json b/Packages/manifest.json index 8e29abd..276f1d0 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,7 +5,6 @@ "com.unity.recorder": "2.1.0-preview.1", "com.unity.xr.oculus.android": "1.38.6", "com.unity.xr.oculus.standalone": "1.38.4", - "com.unity.xr.openvr.standalone": "1.0.5", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 283d5a6..7997460 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,7 +38,6 @@ GraphicsSettings: - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}