Merge branch 'hy_dny' of ssh://192.168.0.8:29418/xianjing into hy_dny_ios

Assets/Editor/AssetBundle/CheckHotResWindownInfo.asset

@@ -48,4 +48,5 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 6be65e5917e79df4783e29f466d36a89, type: 2}
   - {fileID: 11400000, guid: 19a063455ed384245b6b164827c2a07f, type: 2}
   - {fileID: 11400000, guid: c073919380063d54ba234822a8c4444a, type: 2}
+  - {fileID: 11400000, guid: 58dd8e224b45b394db008a6c7fca7457, type: 2}
   Tags: []

Assets/Editor/AssetBundle/Hy_Dny-Android-hx.asset

@@ -0,0 +1,34 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
+  m_Name: Hy_Dny-Android-hx
+  m_EditorClassIdentifier: 
+  Name: "\u4E1C\u5357\u4E9A\u6DF7\u6DC6\u8D44\u6E90"
+  CN_Name: "\u6B63\u5F0F\u670D\uFF08\u5B89\u5353\u6DF7\u6DC6\uFF09"
+  OldPath: "D:\\\u9879\u76EE\\\u70ED\u66F4\u8D44\u6E90/3_dny_hx"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
+  OutputPath: "D:\\\u9879\u76EE\\\u70ED\u66F4\u8D44\u6E90/3_dny_hx"
+  BaseNameFileInfoPath: 
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  rG_Ignore_Infos: []
+  Rg_Essential_Infos: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1
+  IsHx: 0
+  hxKey: jj530ahsdpoi123bdco3kl0lgmvx
+  abNameHxInfo:
+    HxKey: 
+    Infos: []

Assets/Editor/AssetBundle/Hy_Dny-Android-hx.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 58dd8e224b45b394db008a6c7fca7457
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Src/Core/Config/ConfigMgr.cs

@@ -478,9 +478,10 @@ public class ConfigMgr : Singleton<ConfigMgr>
         else
             return null;
     }
-
-
-    
+    public void ClearDLUrlData()
+    {
+        urldatas = null;
+    }
 }
 
 public class I18N
@@ -765,4 +766,6 @@ public class EditorConfigCSV
         }
         return Table;
     }
+
+
 }

Assets/Src/Core/DownLoad/DownloadMgr.cs

@@ -84,7 +84,6 @@ public class DownloadMgr : Singleton<DownloadMgr>
 
     private int tryGetVersionCount;
     public bool isQiangDownload;
-
     public string ResVersion { get; private set; }
     public override void Init()
     {
@@ -927,7 +926,7 @@ public class DownloadMgr : Singleton<DownloadMgr>
             downloadUrl = GetDownloadUrl();
             Log("downloadUrl = " + downloadUrl);
         }
-
+        ConfigMgr.Instance.ClearDLUrlData();
     }
 
 
@@ -968,4 +967,26 @@ public class DownloadMgr : Singleton<DownloadMgr>
 
         return ret;
     }
+
+    public DownLoadUrlCfg GetDLCfgByKey(string key)
+    {
+        if (downLoadUrlCfgs.ContainsKey(key))
+        {
+            return downLoadUrlCfgs[key];
+        }
+        return null;
+    }
+
+    /// <summary>
+    /// BaseUrl   是否开启检查
+    /// ServerUrl url
+    /// Param1 url参数，平台
+    /// DownloadPath 是否隐藏进度条
+    /// </summary>
+    /// <returns></returns>
+    public DownLoadUrlCfg GetCheckSHCfg()
+    {
+        return GetDLCfgByKey("ShenHe");
+    }
+
 }

Assets/Src/Core/DownLoad/FileHelper.cs

@@ -476,6 +476,11 @@ public class FileHelper
         return stringBuilder.ToString();
     }
 
+
+    public static bool CheckStringIsTrue(string str)
+    {
+        return str == "true" || str == "TRUE" || str == "True";
+    }
     //public static string[][] GetCsvDatas(string text)
     //{
     //    using (System.IO.StringReader stringReader = new System.IO.StringReader(text))

Assets/Src/GameLogic/LaunchLoadMgr.cs

@@ -114,12 +114,57 @@ public class LaunchLoadMgr
         }
     }
 
-    private IEnumerator CheckResUpdate()
+    private void CheckISShenHe()
     {
 #if UNITY_IOS && !UNITY_EDITOR
         GameMgr.Instance.InitSDK_E();
 #endif
         DownloadMgr.Instance.InitUrlCfg();
+        DownLoadUrlCfg cfg = DownloadMgr.Instance.GetCheckSHCfg();
+        bool isOpenCheck = false;
+        string url = "";
+        string param = "";
+        bool active = true;
+        if (cfg!=null)
+        {
+            isOpenCheck = FileHelper.CheckStringIsTrue(cfg.BaseUrl);
+            url = cfg.ServerUrl;
+            param = cfg.Param1;
+            active = FileHelper.CheckStringIsTrue(cfg.DownloadPath);
+        }
+
+        if (isOpenCheck)
+        {
+            string checkurl = $"{url}serverlist/serverstate?platform={param}";
+            AssetDownloader.Instance.DownLoadFileByCoroutine(checkurl, webreq =>
+             {
+                 bool isShenHe = false;
+                 if (webreq != null)
+                 {
+                     string data = webreq.downloadHandler.text;
+                     isShenHe =  data == "1" || data == "\"1\"";
+                 }
+
+                 if (isShenHe)
+                 {
+                     OnEndDownload();
+                     SetLoadScrollBarActive(active);
+                 }
+                 else
+                 {
+                     GameMgr.Instance.DoTaskByCorutine(CheckResUpdate);
+                 }
+             });
+        }
+        else
+        {
+            GameMgr.Instance.DoTaskByCorutine(CheckResUpdate);
+        }
+
+    }
+
+    private IEnumerator CheckResUpdate()
+    {
         DownloadMgr.Instance.CheckVersion();
         SetLoadDes("CheckRes");
         SetLoadPrecent(0);
@@ -177,6 +222,11 @@ public class LaunchLoadMgr
         }
         yield return new WaitForSeconds(1);
         DownloadMgr.Instance.Free();
+        OnEndDownload();
+    }
+
+    private void OnEndDownload()
+    {
         GameMgr.Instance.CheckVersion();
         GameMgr.Instance.SetSDKName(DownloadMgr.Instance.GetSDKName());
         //m_LoadingRootGo.SetActive(false);
@@ -221,7 +271,8 @@ public class LaunchLoadMgr
     private void OnLoadCfgEnd(CoreEvent<int> ce)
     {
         EventMgr.RemoveEventListener<int>(ECoreEventType.EID_ConfigMgrInit, OnLoadCfgEnd);
-        GameMgr.Instance.DoTaskByCorutine(CheckResUpdate);
+        //GameMgr.Instance.DoTaskByCorutine(CheckResUpdate);
+        CheckISShenHe();
     }
     private void OnConfigMgrInited(CoreEvent<int> ce)
     {
@@ -475,4 +526,9 @@ public class LaunchLoadMgr
             m_LoadScrollBar.size = precent * 0.01f;
     }
 
+
+    private void SetLoadScrollBarActive(bool active)
+    {
+        m_LoadScrollBar.gameObject.SetActive(active);
+    }
 }