guodong 3 tahun lalu
induk
melakukan
56754bee82

+ 0 - 1
GameClient/Assets/Game/Launcher/Version/VersionController.cs

@@ -83,7 +83,6 @@ namespace GFGGame
                 LauncherView.Instance.SetDesc($"正在计算更新内容大小...", $"{ totalCount - remainCount }/{totalCount}");
                 yield return getDownloadSize;
             }
-            Debug.Log("VersionController GetDownloadSize tips");
             if (getDownloadSize.totalSize > 0 || updateVersions.changed)
             {
                 string message = $"游戏有新的版本,需要更新{Utility.FormatBytes(getDownloadSize.totalSize)}大小的内容";

+ 34 - 14
GameClient/Assets/ThirdParty/Xasset/EncryptHelper.cs

@@ -47,33 +47,53 @@ namespace VEngine
         /// </summary>
         internal static byte[] GetDecryptData(string filePath, char[] secretKey = null)
         {
+            //Logger.I($"GetDecryptData filePath : {filePath} secretKey : {secretKey}");
             byte[] encryptData;
-            using (UnityWebRequest webRequest = UnityWebRequest.Get(filePath))
+            if (filePath.IndexOf("storage/emulated") > 0)
             {
-                webRequest.SendWebRequest();
-                while (!webRequest.isDone) { }
+                encryptData = File.ReadAllBytes(filePath);
+                if (secretKey != null)
+                {
+                    for (int i = 0; i < secretKey.Length; i++)
+                    {
+                        encryptData[i] = (byte)(encryptData[i] ^ secretKey[i % secretKey.Length]);
+                    }
+                }
+            }
+            else
+            {
+                using (UnityWebRequest webRequest = UnityWebRequest.Get(filePath))
+                {
+                    webRequest.SendWebRequest();
+                    while (!webRequest.isDone) { }
 #if UNITY_2020_1_OR_NEWER
-                if (webRequest.result == UnityWebRequest.Result.Success)
+                    //Logger.I($"GetDecryptData filePath : 1 webRequest.isDone : {webRequest.isDone} webRequest.result : {webRequest.result}");
+                    if (webRequest.result == UnityWebRequest.Result.Success)
 #else
+                    Logger.I($"GetDecryptData filePath : 2");
                 if (string.IsNullOrEmpty(webRequest.error))
 #endif
-                {
-                    encryptData = webRequest.downloadHandler.data;
-                    if (secretKey != null)
                     {
-                        for (int i = 0; i < secretKey.Length; i++)
+                        //Logger.I($"GetDecryptData filePath : 3");
+                        encryptData = webRequest.downloadHandler.data;
+                        if (secretKey != null)
                         {
-                            encryptData[i] = (byte)(encryptData[i] ^ secretKey[i % secretKey.Length]);
+                            for (int i = 0; i < secretKey.Length; i++)
+                            {
+                                encryptData[i] = (byte)(encryptData[i] ^ secretKey[i % secretKey.Length]);
+                            }
                         }
                     }
-                }
-                else
-                {
-                    encryptData = null;
+                    else
+                    {
+                        //Logger.I($"GetDecryptData filePath : 4");
+                        encryptData = null;
+                    }
                 }
             }
             return encryptData;
         }
+
     }
-    
+
 }