合并分支

Assets/Editor/AssetBundle/CheckHotUpdateRes.cs

@@ -6,13 +6,11 @@ using Game.Config;
 using System;
 using System.Reflection;
 using System.IO;
-<<<<<<< .mine
+
 using System.Text;
 
-=======
 using System.IO.Compression;
 
->>>>>>> .theirs
 public class CheckHotUpdateRes : EditorWindow
 {
 
@@ -346,15 +344,15 @@ public class CheckHotUpdateRes : EditorWindow
 
         byte[] mdatas = File.ReadAllBytes(datapath + curResInfo.mainfestFileName);
 
-<<<<<<< .mine
+
         ChangedataUrls.Append($"http://weix.vvfyj.cn/res/WDAndroidRes/{ info.mainfestFileName}\n\r");
         ChangedataUrls.Append($"http://weix.vvfyj.cn/res/WDAndroidRes/{ info.VersionFileName}\n\r");
-        FileHelper.WirteToFile($"{info.OutputPath}/{info.mainfestFileName}", mdatas);
-=======
+        //FileHelper.WirteToFile($"{info.OutputPath}/{info.mainfestFileName}", mdatas);
+
         FileHelper.WirteToFile($"{outP}/{curResInfo.mainfestFileName}", mdatas);
 
 
->>>>>>> .theirs
+
         FileHelper.WirteToFile($"{info.OutputPath}/ChangeFileUrls.txt", Encoding.UTF8.GetBytes(ChangedataUrls.ToString()));
 
     }

Assets/Src/Core/DownLoad/DownloadMgr.cs

@@ -775,7 +775,7 @@ public class DownloadMgr : Singleton<DownloadMgr>
     }
 
 
-    private void ReadDataFromFile(string name,Action<byte[]> callback,bool onlyLocal = false,uint streamPerPath = 0)
+    public void ReadDataFromFile(string name,Action<byte[]> callback,bool onlyLocal = false,uint streamPerPath = 0)
     {
         LocalFilePathInfo dlocalPath = GetLocalFilePath(name,onlyLocal, streamPerPath);