Fix Editor Debugging

QuestCraftPlusPlus · Aug 9, 2024 · bec4914 · bec4914
1 parent 3ebc09a
commit bec4914
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/Assets/Scripts/DesktopCam.cs b/Assets/Scripts/DesktopCam.cs
@@ -8,7 +8,7 @@ public class DesktopCam : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        if (Application.platform != RuntimePlatform.WindowsEditor)
+        if (Application.platform == RuntimePlatform.Android)
             return;
 
         VrCam.SetActive(false);

diff --git a/Assets/Scripts/DownloadTextManager.cs b/Assets/Scripts/DownloadTextManager.cs
@@ -9,7 +9,7 @@ public class DownloadTextManager : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        if (Application.platform == RuntimePlatform.WindowsEditor)
+        if (Application.platform != RuntimePlatform.Android)
             return;
         string currentFile = JNIStorage.apiClass.GetStatic<string>("currentDownload");
         double mbDownloaded = TruncateDouble(JNIStorage.apiClass.GetStatic<double>("downloadStatus"), 3);

diff --git a/Assets/Scripts/InstanceButton.cs b/Assets/Scripts/InstanceButton.cs
@@ -11,7 +11,7 @@ public class InstanceButton : MonoBehaviour
 
     private void Update()
     {
-        if (Application.platform == RuntimePlatform.WindowsEditor)
+        if (Application.platform != RuntimePlatform.Android)
             return;
         currInstName = JNIStorage.instance.instancesDropdown.options[JNIStorage.instance.instancesDropdown.value].text;
     }

diff --git a/Assets/Scripts/JNIStorage.cs b/Assets/Scripts/JNIStorage.cs
@@ -14,7 +14,7 @@ public class JNIStorage : MonoBehaviour
     public List<string> supportedVersions;
     public UIHandler uiHandler;
     public TMP_Dropdown instancesDropdown;
-    private ConfigHandler configHandler;
+    public ConfigHandler configHandler;
 
     private void Start()
     {
@@ -30,7 +30,7 @@ private void Start()
         instancesObj = apiClass.CallStatic<AndroidJavaObject>("loadAll");
         configHandler.LoadConfig();
         UpdateInstances();
-		apiClass.SetStatic("model", OpenXRFeatureSystemInfo.GetHeadsetName());
+		//apiClass.SetStatic("model", OpenXRFeatureSystemInfo.GetHeadsetName());
     }
 
     private static void FillSupportedVersions(List<string> supportedVersions, string[] supportedVersionsArray)
@@ -65,6 +65,7 @@ public static PojlibInstance GetInstance(string name)
 
     public void UpdateInstances()
     {
+        if (Application.platform != RuntimePlatform.Android) return;
         AndroidJavaClass jc = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
         activity = jc.GetStatic<AndroidJavaObject>("currentActivity");
 

diff --git a/Assets/Scripts/LoginHandler.cs b/Assets/Scripts/LoginHandler.cs
@@ -33,7 +33,7 @@ async Task LoadingButtonText()
 	    }
 	    LoadingButtonText();
 
-	    if (Application.platform == RuntimePlatform.WindowsEditor) return;
+	    if (Application.platform != RuntimePlatform.Android) return;
 	    if (hasAttemptedLogin) return;
 	    javaClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
 	    javaObject = javaClass.GetStatic<AndroidJavaObject>("currentActivity");
@@ -43,7 +43,7 @@ async Task LoadingButtonText()
     }
 
     private async void CheckVerification() {
-	    if (Application.platform == RuntimePlatform.WindowsEditor)
+	    if (Application.platform != RuntimePlatform.Android)
 		    return;
 	    while (isMainScreen == false)
 	    {

diff --git a/Assets/Scripts/LoginText.cs b/Assets/Scripts/LoginText.cs
@@ -18,7 +18,7 @@ private void Start()
     void Update()
     {
         string buffer;
-        if (Application.platform == RuntimePlatform.WindowsEditor)
+        if (Application.platform != RuntimePlatform.Android)
             buffer = debugText;
         else
             buffer = JNIStorage.apiClass.GetStatic<string>("msaMessage");

diff --git a/Assets/Scripts/UiRedocker.cs b/Assets/Scripts/UiRedocker.cs
@@ -13,6 +13,8 @@ public class UiRedocker : MonoBehaviour
     private bool main = true;
     private void Start()
     {
+        if (Application.platform != RuntimePlatform.Android) return;        
+
         redockButton.onClick.AddListener(() =>
         {
             if (main)
@@ -22,12 +24,6 @@ private void Start()
 
             main = !main;
         });
-
-        return;
-
-        GameObject gender;
-
-        Transition(gender);
     }
 
     void Transition(GameObject transitionObject)