jiajun.hu.x 2 years ago
parent
commit
54838d6466

+ 3 - 3
Assets/SDK/Modules/Module_SDKSystem/Scripts/Module_SDKSystem.cs

@@ -201,9 +201,9 @@ namespace SC.XR.Unity.Module_SDKSystem {
 
             if (IsUseSafetyAreaHeight) {
                 if (API_SDKGlobalConfiguration.HasKey("Module_SafetyArea", "Height")) {
-                    float getHeight = API_SDKGlobalConfiguration.GetFloat("Module_SafetyArea", "Height", 1.6f);
-                    DebugMy.Log("SDKSystem Module SetSafetyAreaHeight:" + getHeight, this, true);
-                    API_Module_SDKSystem.SetSDKSystemHeight(getHeight);
+            //        float getHeight = API_SDKGlobalConfiguration.GetFloat("Module_SafetyArea", "Height", 1.6f);
+                   // DebugMy.Log("SDKSystem Module SetSafetyAreaHeight:" + getHeight, this, true);
+           //         API_Module_SDKSystem.SetSDKSystemHeight(getHeight);
                 }
             }
         }

File diff suppressed because it is too large
+ 58 - 527
Assets/Scenes/SampleScene.unity


+ 1 - 1
Assets/Scripts/UI/LoginPanel.cs

@@ -369,7 +369,7 @@ public class LoginPanel : BaseUI
         for (int i = 0; i < scenes.Count; i++)
         {
             SendSnInfo sendNet = new SendSnInfo();
-            sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+            sendNet.sn = "Nreal-SN";//API_GSXR_Slam.SlamManager.plugin.SN;
             sendNet.projectId = scenes[i].id;
             string jsonData = JsonMapper.ToJson(sendNet);
 

+ 8 - 1
Assets/XRInputManager.cs

@@ -75,6 +75,10 @@ public class XRInputManager : MonoBehaviour
             Debug.Log("ControllerButton.HOME===>TOUCHPAD_BUTTON");
             API_GSXR_Module_InputSystem_KS.GSXR_KSRight.inputDataKS.inputKeys.InputDataAddKey(InputKeyCode.Enter, InputKeyState.UP);
         });
+#if UNITY_EDITOR
+        Invoke("startXR", 1f);
+#endif
+
         return;
         for (int i = 0; i < 15; i++)
         {
@@ -101,6 +105,9 @@ public class XRInputManager : MonoBehaviour
     List<Vector3> rightInfo = new List<Vector3>();
     void startXR()
     {
+        Module_InputSystem.instance.SetActiveInputDevice(InputDeviceType.KS, false);
+        Module_InputSystem.instance.SetActiveInputDevice(InputDeviceType.Head, true);
+        /*
         left.gameObject.SetActive(false);
         right.gameObject.SetActive(false);
         List<UnityEngine.XR.InputDevice> inputDevices = new List<UnityEngine.XR.InputDevice>();
@@ -108,7 +115,7 @@ public class XRInputManager : MonoBehaviour
         for (int i = 0; i < inputDevices.Count; i++)
         {
             onDeviceConnected(inputDevices[i]);
-        }
+        }*/
     }
     private void Update()
     {

Some files were not shown because too many files changed in this diff