万达修改

AssetBundles/Android/Android.manifest

@@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 3019674541
+CRC: 4054660950
 AssetBundleManifest:
   AssetBundleInfos:
     Info_0:

AssetBundles/Android/editorpanel_prefab.manifest

@@ -3,10 +3,10 @@ CRC: 999136343
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: de15767c2fa12bccfc1d35af07b62135
+    Hash: 2f0b84613c1295433a7b666a31ff4352
   TypeTreeHash:
     serializedVersion: 2
-    Hash: 87c78773dd0257390dad9ec4ab8d14b8
+    Hash: 51ec8ac0fe74c9a37c2ed6dfe6e4a24b
 HashAppended: 0
 ClassTypes:
 - Class: 1
@@ -19,22 +19,16 @@ ClassTypes:
   Script: {instanceID: 0}
 - Class: 65
   Script: {instanceID: 0}
-- Class: 114
-  Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 9c95b88064877c843ac852eae6e145cd, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 948b9ab040508dc48a294230f85b39e2, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
 - Class: 114
@@ -45,6 +39,8 @@ ClassTypes:
   Script: {fileID: 11500000, guid: 91420c16c314a044ca239a4e451708d0, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: b3ba789618d29764280b4afcd4513b22, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
 - Class: 114
@@ -53,12 +49,16 @@ ClassTypes:
   Script: {fileID: 11500000, guid: e8156b1a26e594746911f480f9ec2553, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: a994f4dad6c29c14fa62581d7a329f1b, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 03552ffddb5c8174eba6db6a835a41fd, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 455f245ed7c60ac46a0a539817ecc6e1, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 7508c6fe7d17bee47ba29ae4fdbc17cc, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
 - Class: 115

Assets/QFramework/Toolkits/ResKit/Scripts/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c292321a96c5f44d5bd3e6e013fcbc4a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Template/Prefab/Video.prefab

@@ -839,7 +839,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4142974184678981529
 Transform:
   m_ObjectHideFlags: 0
@@ -918,7 +918,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4142974185978899410
 Transform:
   m_ObjectHideFlags: 0
@@ -1092,7 +1092,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1272,7 +1272,7 @@ Transform:
   m_GameObject: {fileID: 6197663789174776919}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.0026, y: 0.0104, z: 0.00001}
-  m_LocalScale: {x: 0.13638704, y: 0.092157386, z: 0.022464}
+  m_LocalScale: {x: 0.16, y: 0.09000001, z: 0.022464}
   m_Children: []
   m_Father: {fileID: 6197663790409351699}
   m_RootOrder: 0
@@ -1316,12 +1316,12 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: c499e12dbcd4a7246bceac1925c08e0c, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Sprite: {fileID: 21300000, guid: f9439d41a0af1fa4392c32a57b904104, type: 3}
+  m_Color: {r: 0.9433962, g: 0.9433962, b: 0.9433962, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 4.85, y: 4.85}
+  m_Size: {x: 10.24, y: 5.23}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
@@ -1480,7 +1480,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6197663789716070211
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1769,7 +1769,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/SDK/Examples/HandTracking/Scripts/VideoControl.cs

@@ -16,6 +16,14 @@ public class VideoControl : MonoBehaviour {
     }
 
     public List<VideoInfo> videoList;
+    private void Awake()
+    {
+      
+    }
+    private void Start()
+    {
+        VideoStartSwitch();
+    }
 
     public void VideoStartSwitch() {
         isStart = videoPlayer.isPlaying;

Assets/SDK/Examples/StandardAssets/Video.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5b71396933303194ebee533403fe6c93
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/QFrameWorkNewUI.unity

@@ -5735,7 +5735,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2017418898
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scripts/Http/HttpTool.cs

@@ -39,6 +39,7 @@ public class HttpTool : MonoBehaviour
             if (_instacne == null)
             {
                 Debug.LogError("Awake error");
+               // HttpTool._instacne = gameObject.GetComponent<HttpTool>();
             }
             return _instacne;
         }

Assets/Scripts/Loader/LoadManager.cs

@@ -32,7 +32,7 @@ public class LoadManager : MonoSingleton<LoadManager>
         listDownLoad = new List<DownLoadMaterial>();
         if (PlayerPrefs.HasKey("LoadData111"))
         {
-            string str = PlayerPrefs.GetString("LoadData11");
+            string str = PlayerPrefs.GetString("LoadData111");
             listDownLoad = JsonConvert.DeserializeObject<List<DownLoadMaterial>>(str);
             if (listDownLoad == null)
                 listDownLoad = new List<DownLoadMaterial>();

Assets/Scripts/ViewUI/LoginPanel.cs

@@ -70,9 +70,9 @@ public class LoginPanel : SingletonMono<LoginPanel>
         version.text = "V"+Application.version;
         //  PlayerPrefs.DeleteAll();
 
-
-      //  OnClickLogin();
-
+#if UNITY_EDITOR
+        OnClickLogin();
+# endif
         //SendInit send = new SendInit();
         //send.sn = "ABD123456";
         //send.projectId = 10;
@@ -134,9 +134,10 @@ public class LoginPanel : SingletonMono<LoginPanel>
 
         m_Logn.onClick.AddListener(OnClickLogin);
         m_RemenberPwd.onValueChanged.AddListener(OnRemPwdValueChange);
-
        
-      
+
+
+
     }
     #region UI监听事件
 
@@ -302,7 +303,10 @@ public class LoginPanel : SingletonMono<LoginPanel>
     /// </summary>
     private void OnClickLogin()
     {
-
+#if UNITY_EDITOR
+        m_AccountStr = "mandan.chao@ghz-tech.com";
+        m_PasswordStr = "123456Aa";
+#endif
         loaginError.SetActive(false);
 
         //m_AccountStr = "yifei.yang@ivglass.com";
@@ -311,8 +315,7 @@ public class LoginPanel : SingletonMono<LoginPanel>
         ////m_AccountStr = "test_basic@ghz-tech.com";
         ////m_PasswordStr = "123456789";
 
-        //m_AccountStr = "16426755@qq.com";
-        //m_PasswordStr = "123456Aa";
+       
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
         {

Assets/StreamingAssets/AssetBundles/Android/Android.manifest

@@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 3019674541
+CRC: 4054660950
 AssetBundleManifest:
   AssetBundleInfos:
     Info_0:

Assets/StreamingAssets/AssetBundles/Android/editorpanel_prefab.manifest

@@ -3,10 +3,10 @@ CRC: 999136343
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: de15767c2fa12bccfc1d35af07b62135
+    Hash: 2f0b84613c1295433a7b666a31ff4352
   TypeTreeHash:
     serializedVersion: 2
-    Hash: 87c78773dd0257390dad9ec4ab8d14b8
+    Hash: 51ec8ac0fe74c9a37c2ed6dfe6e4a24b
 HashAppended: 0
 ClassTypes:
 - Class: 1
@@ -19,22 +19,16 @@ ClassTypes:
   Script: {instanceID: 0}
 - Class: 65
   Script: {instanceID: 0}
-- Class: 114
-  Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 9c95b88064877c843ac852eae6e145cd, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 948b9ab040508dc48a294230f85b39e2, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
 - Class: 114
@@ -45,6 +39,8 @@ ClassTypes:
   Script: {fileID: 11500000, guid: 91420c16c314a044ca239a4e451708d0, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: b3ba789618d29764280b4afcd4513b22, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
 - Class: 114
@@ -53,12 +49,16 @@ ClassTypes:
   Script: {fileID: 11500000, guid: e8156b1a26e594746911f480f9ec2553, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: a994f4dad6c29c14fa62581d7a329f1b, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 03552ffddb5c8174eba6db6a835a41fd, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 455f245ed7c60ac46a0a539817ecc6e1, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 7508c6fe7d17bee47ba29ae4fdbc17cc, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
 - Class: 115

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from SK-20211220VCWK at 2023/6/5 14:28:04
+Build from LAPTOP-KUIJ34JI at 2023/7/3 18:12:40

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: ghz
-  productName: "\u57FA\u7840\u7248MRNavigatorManager"
+  productName: "\u57FA\u7840\u7248MRNavigator"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -175,7 +175,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.ghz.navigatormanager
+    Android: com.ghz.navigator
   buildNumber: {}
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 26
@@ -275,7 +275,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: 4477ace904094f744b364de8cbc83a68, type: 3}
+      m_Icon: {fileID: 2800000, guid: d8a608d9c854f0943a4ed297477701a9, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0

QCAR/somedata16

@@ -0,0 +1 @@
+AAABmUmaPeHE8ggVLoCYvRQE60cvp5gPpKaxTIIn34S+1/uoa1gO97s3K6yU2vFWp1wQe4iGF8Txb6JZMEyTPyecJb9gduoS8ylsJDSj9NwqCE8pJM3qiYIOrmiQHiQp6C25HYlNYnwrRNiKdhDszyYjO9dKG0AjeqEdeFZ4s8vU+dgJNTS4aS8k/y/vlqaEI2U0NFDFCV1VaRuld9LsZXXJ/tPlqFp6va8ScE7P6zD1nn2OAlx3DqmhgPb4WHZppbHYCoa2VwzU+dhhBCHL7QWpAuSxMnYJvI+qGUgKaiVF8OV98Tyc+GIXnj/D4dOxlzXHCzT3QJeTLx+3ikFJDjEqHLc=