Browse Source

修改SDK的报错

胡佳骏 1 year ago
parent
commit
f6ee4823b5

+ 2 - 2
Assets/FrameWork/AR.prefab

@@ -329,12 +329,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dca8017ddc105e5488bf7ba9b4a177cd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  arCamera: {fileID: 0}
+  arCamera: {fileID: 2351110680174526695}
   FocusMode: 2
   CameraSize: {x: 1280, y: 960}
   CameraOpenMethod: 1
   CameraType: 1
-  CameraIndex: 0
+  CameraIndex: 2
   cameraPreference: 0
 --- !u!1 &2351110680108509795
 GameObject:

+ 1 - 1
Assets/FrameWork/Error.prefab

@@ -1579,7 +1579,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -2.3, y: -37.3}
+  m_AnchoredPosition: {x: 5.5, y: -37.3}
   m_SizeDelta: {x: 160, y: 60.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3984762384900363294

+ 1 - 1
Assets/FrameWork/Login/Scripts/LoginDataManager.cs

@@ -13,7 +13,7 @@ public class LoginDataManager:Singleton<LoginDataManager>
     string[] testAclist =new string[] { "罗江", "戴广军", "程裕翔", "王玉洁", "伊鹏飞", "戈晓芬","胡佳骏" };
     List<AccountData> ldata;
 
-    //获取 账号登录的列表
+    //接口-----获取 账号登录的列表
     public void GetLoginData(Action<List<AccountData>> callback)
     {
         ldata = new List<AccountData>();

+ 3 - 3
Assets/FrameWork/ProjectManager/Scripts/ShowInfoTipManager.cs

@@ -12,16 +12,16 @@ public class ShowInfoTipManager : MonoSingleton<ShowInfoTipManager>
     {
         if(!isHead)
         {
-            if (WindowsManager.Instance.tipInfoGameObject != null && API_GSXR_Module_InputSystem.GSXR_Position != null)
+            if (WindowsManager.Instance.tipInfoGameObject != null && GSXR_Transform.position != null)
             {
                 WindowsManager.Instance.tipInfoGameObject.transform.parent = GSXR_Transform;
-                WindowsManager.Instance.tipInfoGameObject.transform.position = API_GSXR_Module_InputSystem.GSXR_Position;
+                WindowsManager.Instance.tipInfoGameObject.transform.position = GSXR_Transform.position;
                 WindowsManager.Instance.tipInfoGameObject.transform.LookAt(OpenXRCamera.Instance.head);
             }
         }
         else
         {
-            if (WindowsManager.Instance.tipInfoGameObject != null && API_GSXR_Module_InputSystem.GSXR_Position != null)
+            if (WindowsManager.Instance.tipInfoGameObject != null && GSXR_Transform.position != null)
             {
                 WindowsManager.Instance.tipInfoGameObject.transform.parent = OpenXRCamera.Instance.head;
                 WindowsManager.Instance.tipInfoGameObject.transform.localPosition = new Vector3(0, 0, 1.5f);

+ 1 - 1
Assets/FrameWork/SaoMiao.prefab

@@ -85,7 +85,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &1620164308813382644
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 9 - 0
Assets/FrameWork/Scenes/Edustry.unity

@@ -161,6 +161,7 @@ MonoBehaviour:
   windowsConfig: {fileID: 11400000, guid: b605ed4a23ccd7144abbae608329d926, type: 2}
   isStart: 0
   tipInfoGameObject: {fileID: 0}
+  preJDInt: 0
 --- !u!114 &549249284
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -373,6 +374,14 @@ PrefabInstance:
       propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4181028404793140007, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 2147483647
+      objectReference: {fileID: 0}
+    - target: {fileID: 4181028404793140011, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_TagString
+      value: MainCamera
+      objectReference: {fileID: 0}
     - target: {fileID: 7361397498185573409, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
       propertyPath: m_RootOrder
       value: 3

+ 4 - 7
Assets/FrameWork/Scripts/Window/WindowsManager.cs

@@ -96,9 +96,11 @@ public class WindowsManager : MonoSingleton<WindowsManager>
         Application.targetFrameRate = 300;
 
         GameObject jt =  GameObject.Instantiate( GetPrefab(windowType.XunJian, "JianTou"),OpenXRCamera.Instance.head.transform);
-        jt.transform.localPosition = new Vector3(0, 0, 1);
+        jt.transform.localPosition = Vector3.zero;
         jt.transform.localEulerAngles = Vector3.zero;
-        GameObject.Instantiate(GetPrefab(windowType.XunJian, "SaoMiao"), OpenXRCamera.Instance.head.transform);
+        GameObject obj= GameObject.Instantiate(GetPrefab(windowType.XunJian, "SaoMiao"), OpenXRCamera.Instance.head.transform);
+        obj.transform.localPosition = new Vector3(0,0,1.7f);
+        obj.transform.localEulerAngles = Vector3.zero;
         GameObject.Instantiate(GetPrefab(windowType.XunJian, "ARSaoTu"));
         GameObject.Instantiate(GetPrefab(windowType.ProjectMain, "PlayerToImage"));
         GameObject.Instantiate(GetPrefab(windowType.RTC, "GHZRtcNew"));
@@ -364,11 +366,6 @@ public class WindowsManager : MonoSingleton<WindowsManager>
 
     void updatePart()
     {
-        if (tipInfoGameObject!=null&&API_GSXR_Module_InputSystem.GSXR_Position!=null)
-        {
-            tipInfoGameObject.transform.position = API_GSXR_Module_InputSystem.GSXR_Position;
-            tipInfoGameObject.transform.LookAt(OpenXRCamera.Instance.head);
-        }
     }
 
     private void Update()

+ 3 - 2
Assets/XR/XRGeneralSettings.asset

@@ -15,7 +15,8 @@ MonoBehaviour:
   m_RequiresSettingsUpdate: 0
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
-  m_Loaders: []
+  m_Loaders:
+  - {fileID: 11400000, guid: 794a80444e9eb884da8e3b0d26b1637b, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -44,4 +45,4 @@ MonoBehaviour:
   m_Name: Android Settings
   m_EditorClassIdentifier: 
   m_LoaderManagerInstance: {fileID: -1851306820234083736}
-  m_InitManagerOnStart: 0
+  m_InitManagerOnStart: 1