Merge branch 'main' of ssh://192.168.0.8:29418/XianJing into cn_merage

# Conflicts:
#	Assets/Src/Core/DownLoad/DownloadMgr.cs

Assets/Src/Core/DownLoad/DownloadDataEntity.cs

@@ -44,3 +44,30 @@ public class DownloadDataEntity : GameData<DownloadDataEntity>
         DownloadDataEntity.Onload(csvReader);
     }
 }
+
+
+
+public class DownLoadUrlCfg : GameData<DownLoadUrlCfg>
+{
+    public string Platform;
+
+    public string BaseUrl;
+
+    public string Url;
+    public string Param1;
+    public bool IsOPen;
+
+    public override string FlieName()
+    {
+        return "DownLoadUrlCfg";
+    }
+
+    public DownLoadUrlCfg()
+    {
+       
+    }
+    public static void OnCsvLoad(CsvReader csvReader)
+    {
+        DownLoadUrlCfg.Onload(csvReader);
+    }
+}

Assets/Src/Core/DownLoad/DownloadMgr.cs

@@ -222,13 +222,16 @@ public class DownloadMgr : Singleton<DownloadMgr>
 #endif
 
     }
-
+    private string GetParam1()
+    {
+        return "null";
+    }
     public void CheckVersion()
     {
         string baseUrl = GetBaseUrl();
         if (!string.IsNullOrEmpty(baseUrl) && tryGetVersionCount <= 3)
         {
-            baseUrl += $"serverlist/download?platform={GetPlatform()}";
+            baseUrl += $"serverlist/download?platform={GetPlatform()}&param={GetParam1()}";
             Log("Url = " + baseUrl);
             AssetDownloader.Instance.DownLoadFileByCoroutine(baseUrl,webReq=> 
             {
@@ -403,7 +406,7 @@ public class DownloadMgr : Singleton<DownloadMgr>
         {
             downloadingList.Remove(task.CurDownloadEntity);
         }
-        downloadingSize = 0;
+     
         downloadSize += task.downloadSize;
 
         
@@ -549,28 +552,35 @@ public class DownloadMgr : Singleton<DownloadMgr>
             }
 
 
-            if (localMaxCode >= RVersionCode && SVersionCode == localMaxCode)
+            if (localMaxCode >= RVersionCode)
             {
-                Debug.Log($"lVersionstr =  {lVersionstr}  SVersionstr = {SVersionstr}  =====  version = {version} 不需要跟新 需要删除之前下载资源");
-                versionData = null;
-                ReadDataFromFile(downloadedAssetsFileName, dlocaldatas =>
+                if (SVersionCode == localMaxCode)
                 {
-                    if (dlocaldatas != null)
+                    Debug.Log($"lVersionstr =  {lVersionstr}  SVersionstr = {SVersionstr}  =====  version = {version} 不需要跟新 需要删除之前下载资源");
+                    versionData = null;
+                    ReadDataFromFile(downloadedAssetsFileName, dlocaldatas =>
                     {
-                        List<DownloadDataEntity> localdownloadedList = SerizlizeResList(dlocaldatas);
-                        if (localdownloadedList != null && localdownloadedList.Count > 0)
+                        if (dlocaldatas != null)
                         {
-                            downloadSucessList.AddRange(localdownloadedList);
-                        }
-                        DeleteDownloadFiles();
-
-                    }
-                    else
-                    {
-                        SetCheckFinish();
-                    }
-                },true);
+                            List<DownloadDataEntity> localdownloadedList = SerizlizeResList(dlocaldatas);
+                            if (localdownloadedList != null && localdownloadedList.Count > 0)
+                            {
+                                downloadSucessList.AddRange(localdownloadedList);
+                            }
+                            DeleteDownloadFiles();
 
+                        }
+                        else
+                        {
+                            SetCheckFinish();
+                        }
+                    }, true);
+                }
+                else
+                {
+                    Debug.Log($"lVersionstr =  {lVersionstr}  SVersionstr = {SVersionstr}  =====  version = {version}   不需要更新");
+                    SetCheckFinish();
+                }
             }
             else
             {