修复场景

Assets/Resources/UI/LoginPanel.prefab

@@ -249,7 +249,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &324766431993203869
 RectTransform:
   m_ObjectHideFlags: 0
@@ -733,7 +733,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &251745105086036184
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3516,12 +3516,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 5
   m_CharacterLimit: 100
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 1, g: 1, b: 1, a: 0.7529412}
@@ -3534,6 +3537,7 @@ MonoBehaviour:
   m_CustomPosition: {x: 0, y: 0, z: 0}
   m_CustomRotation: {x: 0, y: 0, z: 0}
   m_CustomLocalScale: {x: 200, y: 200, z: 200}
+  m_ShouldActivateOnSelect: 0
 --- !u!82 &6874961733583508626
 AudioSource:
   m_ObjectHideFlags: 0
@@ -3818,12 +3822,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 16
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 1, g: 1, b: 1, a: 0.7529412}
@@ -3836,6 +3843,7 @@ MonoBehaviour:
   m_CustomPosition: {x: 0, y: 0, z: 0}
   m_CustomRotation: {x: 0, y: 0, z: 0}
   m_CustomLocalScale: {x: 200, y: 200, z: 200}
+  m_ShouldActivateOnSelect: 0
 --- !u!82 &1593490155698249785
 AudioSource:
   m_ObjectHideFlags: 0

Assets/Resources/VuforiaConfiguration.asset

@@ -9,12 +9,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: -2067402452, guid: 8a9a760f95896c34689febc965510927, type: 3}
   m_Name: VuforiaConfiguration
-  m_EditorClassIdentifier: Vuforia.Unity.Engine:Vuforia:VuforiaConfiguration
+  m_EditorClassIdentifier: 
   vuforia:
     vuforiaLicenseKey: 
-    ufoLicenseKey: QWJKUmlWYi8vLy8vQUFBQUtGSHQya2E1bVVTaHRhUGxKS2dSM3RvSFRaQ0pwSjhSVG5CbEs1MnBTSTFWTzZaTEU5WU0rZ1M5aXRBWkxZTW1lZTAwekxxcjBJQTc4TjRaK0V1STFXWHJSK3BFcHFXSC9rZWVONTRvaTcyL2ZFenhtRE1oZHpyQnF3NXhaZVdVaHdNdkNVTUxFUFpNRUkveDRtaVk0aHQ5UXFtcTd1YUNhTllKKy9vTjVmMXV0SFNiN0I5Wjl3SXBLL21ERkQ2cityOVZkWUZIVi9GSkRJRXc3T3R3RXdpRjY5ZmFaU2dBOXo5RmcrbSthb0RBVEYvSHRMY2NjLysrcTg1WjhDS0JMT0NaV3dsQURvVjJCRnlsaURMd1Z0aWs4NGRySGNaT3FQUUJlWWlrQTVGNEkzMU81QTh2NHlWeHRWbm1mb0VkTDZuc1Jxd3k2am4yTG9kV2h1cW5zRUw3OFg3a0U3NGhZaXZWUS9mYWVuT08=
+    ufoLicenseKey: QWRvTlZRYi8vLy8vQUFBQUtFUlVmMFlNSUUyWG5CbzJUQ2JlazFZSXptZnlBb29UdzVkdGg2bmdRWjQyWjM4eEphZjZPa2VFcDlSb2xoekRPeXZCcVlKbXQvZjduby9xbjVjNVMxVnlxZ2VhNVBiVzlBTVpJRVU5TmJCaVNxcGc4QzVXdWpySEJWOVcvT1JJZGdxbmowUVp2OHR5UytzQk9CWWlMbVJaZXErTE5MWXJSUEhlNjMzWWh0NnR3Q2RxTFRVVzFtSjNacUIwYW5pYnk3S2FhK241UDVtTXZoRzUyWkZKM2VKZk9JTXZEV05WU05wOFVOY0tyalZwRDRkeEw2Y3d5cFpDWjJub09IOUxUNVNEV2xqMDRYUnZRYXZ2UTJjVlFqUkdvc2E1NjY3TFNjQ0JqTUJFaXlFRTFtbDNhbERnQUtldllOalpoVkpadVkydnl3NzU5eVhYUXl3STZIZXFsYUh2aWxwV05EaTcrZCtFZE04bTlVanI=
     delayedInitialization: 0
     cameraFocusModeSetting: 2
     cameraDeviceModeSetting: -1
@@ -23,7 +23,7 @@ MonoBehaviour:
     modelTargetRecoWhileExtendedTracked: 1
     shareRecordingsInITunes: 0
     logLevel: 0
-    version: 1.0.0
+    version: 10.15.4
     eulaAcceptedVersions: '{"Values":["8.5","7.5","8.3","7.2","7.1","8.0","7.7","8.1","0.0","9.2","9.4","10.10","10.11","10.12","10.13","9.8","10.3","10.2","9.1","10.15","9.7"]}'
   database:
     disableModelExtraction: 0

Assets/Scripts/BaseManager/UIManager.cs

@@ -135,18 +135,18 @@ public class UIManager : Singleton<UIManager>
 
     public void ChangeCanvasPos()
     {
-        if (API_GSXR_Slam.GSXR_Get_Head() != null)
+        if (OpenXRCamera.Instance.head != null)
         {
-            m_UIRoot.transform.eulerAngles = new Vector3(0, API_GSXR_Slam.GSXR_Get_Head().eulerAngles.y, 0);
-            m_UIRoot.transform.position = API_GSXR_Slam.GSXR_Get_Head().position + GameManager.Instance.Player.transform.forward + new Vector3(0, 0.3f, 0);
+            m_UIRoot.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
+            m_UIRoot.transform.position = OpenXRCamera.Instance.head.position + GameManager.Instance.Player.transform.forward + new Vector3(0, 0.3f, 0);
         }
     }
 
     public void ChangePos()
     {
-        if (API_GSXR_Slam.GSXR_Get_Head() != null&&GameManager.Instance.Player.transform.position == API_GSXR_Slam.GSXR_Get_Head().position)
+        if (OpenXRCamera.Instance.head != null&&GameManager.Instance.Player.transform.position == OpenXRCamera.Instance.head.position)
         {
-            m_UIRoot.transform.eulerAngles = new Vector3(0, API_GSXR_Slam.GSXR_Get_Head().eulerAngles.y, 0);
+            m_UIRoot.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
            // Debug.Log(GameManager.Instance.Player.transform.position+" ##########  "+ API_GSXR_Slam.GSXR_Get_Head().transform.forward);
             m_UIRoot.transform.position = GameManager.Instance.Player.transform.forward + new Vector3(0, -0.2f, 0.2f);
         }

Assets/Scripts/UI/LoginPanel.cs

@@ -262,6 +262,7 @@ public class LoginPanel : BaseUI
 #if UNITY_EDITOR
         m_AccountStr = "jiajun.hu@ghz-tech.com";
         m_AccountStr = "Blue@163.com";
+        m_AccountStr = "1768147286@qq.com";
         m_PasswordStr = "123456Aa";
 #endif
         if (string.IsNullOrWhiteSpace(m_AccountStr))
@@ -381,13 +382,17 @@ public class LoginPanel : BaseUI
          
             if (int.Parse(jobect["data"]["type"].ToString()) == 0)
             {
+                Debug.Log("GetUserInfoCallBack 登录为2.0");
+                UserInfo.Instance.is20 = true; 
                 Debug.Log(jobect["data"]["type"].ToString());
-               StartCoroutine( LoginCallBack2YS(2));
+                StartCoroutine( LoginCallBack2YS(2));
             }
             else if (int.Parse(jobect["data"]["type"].ToString()) == 1)
             {
+                Debug.Log("GetUserInfoCallBack 登录为2.1");
+                UserInfo.Instance.is20 = false;
                 Debug.Log(jobect["data"]["type"].ToString());
-               StartCoroutine( LoginCallBackYS(2));
+                StartCoroutine( LoginCallBackYS(2));
             }
             else
                 return;
@@ -673,11 +678,10 @@ public class LoginPanel : BaseUI
 #if UNITY_EDITOR
         // m_AccountStr = "ghztest2@ghz-tech.com";
         // m_PasswordStr = "123456Aa";
+#endif
         m_AccountStr = "1768147286@qq.com";
-        m_AccountStr = "jiajun.hu@ghz-tech.com";
-        // m_AccountStr = "yhb_adv10@1.com";
+        //m_AccountStr = "jiajun.hu@ghz-tech.com";
         m_PasswordStr = "123456Aa";
-#endif
         if (!string.IsNullOrWhiteSpace(m_AccountStr) && !string.IsNullOrWhiteSpace(m_PasswordStr))
         {
             m_Account.text = m_AccountStr;

Assets/Scripts/UI/SceneChoose.cs

@@ -94,6 +94,8 @@ public class SceneChoose : BaseUI
                 {
                     mes = jObject["data"].ToString();
                     SceneValue scene = JsonConvert.DeserializeObject<SceneValue>(mes);
+                    Debug.Log("scene.backgroundImages===>" );
+                    Debug.Log("scene.backgroundImages===>"+ scene.backgroundImages.Count);
                     GameManager.Instance.MapPicUrl = scene.backgroundImages[0].base64;
                     GameManager.Instance.GetMinMap(scene);
                     GetSNInit();