Merge branch 'F/0710_2.1+2.0' of https://gogs.ghz-tech.com:8843/GHzGlass/GHZMRNavigatorProXR into F/0710_2.1+2.0

Assets/Scripts/PlayerTrigger.cs

@@ -75,6 +75,7 @@ public class PlayerTrigger : MonoBehaviour
                 float y = transform.localPosition.z / GameManager.Instance.MapSize.y * GameManager.Instance.WebMapSize.y;
                 var pos = new Vector3(x, -y, 0);
 
+                if(!UserInfo.Instance.is20)
                 HttpSocket.Instance.SendIpToPointPos(pos, (message) =>
                 {
                     //Debug.Log(message);

Assets/Scripts/UI/LoginPanel.cs

@@ -34,6 +34,7 @@ public class LoginPanel : BaseUI
     private Button m_SNBtn;
 
     private Text m_SN;
+    private Text m_Versaion;
 
     Toggle Choose21;
     Toggle Choose20;
@@ -72,7 +73,7 @@ public class LoginPanel : BaseUI
         //m_SNBtn = CacheTransform.Find("SNLoginBtn").GetComponent<Button>();
 
         m_SN = CacheTransform.Find("SNAndVersion/SN/Text").GetComponent<Text>();
-
+        m_Versaion = CacheTransform.Find("SNAndVersion/Versaion/Text").GetComponent<Text>();
         AddUIListenEvent();
     }
 
@@ -91,11 +92,11 @@ public class LoginPanel : BaseUI
 
         m_Logn.onClick.AddListener(OnClickLogin);
         m_RemenberPwd.onValueChanged.AddListener(OnRemPwdValueChange);
-
+        m_Versaion.text = Application.version;
         //m_SNBtn.onClick.AddListener(OnClickSnBtn);
 
         // OnClickLogin();
-        if(PlayerPrefs.HasKey("Account") && PlayerPrefs.HasKey("Password"))
+        if (PlayerPrefs.HasKey("Account") && PlayerPrefs.HasKey("Password"))
         {
             m_AccountStr = PlayerPrefs.GetString("Account", "");
             m_PasswordStr = PlayerPrefs.GetString("Password", "");

ProjectSettings/ProjectSettings.asset

@@ -147,10 +147,7 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 2.2.0
-  preloadedAssets:
-  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
-  - {fileID: -6682207197718421661, guid: 8f422df2931cba0478c1fe8ab232b9a3, type: 2}
-  - {fileID: 3493090336618791480, guid: 2d049ae1db0e2b74c8251022ae6dcb95, type: 2}
+  preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -927,7 +924,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
-      CodeGeneration: False
+      EnterpriseAuthentication: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -962,8 +959,8 @@ PlayerSettings:
       Contacts: False
       Proximity: False
       InternetClient: True
+      CodeGeneration: False
       BackgroundMediaPlayback: False
-      EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False