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

Assets/Content/Config/DownLoadUrlCfg.csv

@@ -1,6 +1,6 @@
 ID,Platform,BaseUrl,ServerUrl,Param1,DownloadPath,MaxNum
 ID,Platform,BaseUrl,ServerUrl,Param1,DownloadPath,MaxNum
 int,string,string,string,string,string,int
-1,GameDebug,http://110.40.223.119:88/dny/,http://110.40.223.119:81/,dny,res/AndroidNewRes/,1
+1,GameDebug,http://43.226.57.217:88/dny/,http://43.226.57.217:81/,dny,res/AndroidNewRes/,1
 2,Android,http://43.156.13.116:88/dny/,http://43.156.13.116:81/,dny,res/AndroidNewRes/,1
 3,IOS,http://43.156.13.116:88/dny/,http://43.156.13.116:81/,dny,res/IosRes/,1

Assets/Src/Core/DownLoad/AssetDownloader.cs

@@ -79,12 +79,12 @@ public class AssetDownloader : SingletonMono<AssetDownloader>
 
 
 
-    private IEnumerator DownloadFile(string url, Action<UnityWebRequest> callback)
+    private IEnumerator DownloadFile(string url, Action<UnityWebRequest> callback, int _timeout = 5)
     {
         Debug.Log($"url = {url}");
         UnityWebRequest webRqst = UnityWebRequest.Get(url);
         float timeOut = Time.time;
-        webRqst.timeout = 20;
+        webRqst.timeout = _timeout;
         UnityWebRequestAsyncOperation asyncOperation = webRqst.SendWebRequest();
         float progress = 0;
        
@@ -291,9 +291,9 @@ public class AssetDownloader : SingletonMono<AssetDownloader>
     }
 
 
-    public void DownLoadFileByCoroutine(string url, Action<UnityWebRequest> callback)
+    public void DownLoadFileByCoroutine(string url, Action<UnityWebRequest> callback,int timeout = 5)
     {
-        StartCoroutine(DownloadFile(url, callback));
+        StartCoroutine(DownloadFile(url, callback,5));
     }
 
     public void AssetLoadToLocalByCorutine(string url, string toPath, Action<byte[]> callback = null)

Assets/Src/Core/DownLoad/DownloadTask.cs

@@ -73,7 +73,7 @@ public class DownloadTask : MonoBehaviour
         {
             ret = false;
         }
-        webRqst.timeout = 20;
+        webRqst.timeout = 5;
         return ret;
     }
 

Assets/Src/GameLogic/LaunchLoadMgr.cs

@@ -134,10 +134,10 @@ public class LaunchLoadMgr
 
         if (isOpenCheck)
         {
-            string checkurl = $"{url}serverlist/serverstate?platform={param}";
+            string checkurl = $"{url}{param}";
             AssetDownloader.Instance.DownLoadFileByCoroutine(checkurl, webreq =>
              {
-                 bool isShenHe = false;
+                 bool isShenHe = true;
                  if (webreq != null)
                  {
                      string data = webreq.downloadHandler.text;
@@ -154,7 +154,7 @@ public class LaunchLoadMgr
                  {
                      GameMgr.Instance.DoTaskByCorutine(CheckResUpdate);
                  }
-             });
+             },2);
         }
         else
         {

Build/BuildDependenceResource/PackConfig.json

@@ -35,11 +35,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
-            "notifyUrl": "http://110.40.223.119:81//notice",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
+            "notifyUrl": "http://43.226.57.217:81//notice",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69423",
             "leBian_ClientChId": "PATCH_V3",
             "leBian_SECID": "dmcve6kq.c",
@@ -149,11 +149,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
-            "notifyUrl": "http://110.40.223.119:88/res/NoticeNew/",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
+            "notifyUrl": "http://43.226.57.217:88/res/NoticeNew/",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69423",
             "leBian_ClientChId": "youyi_bt_jj",
             "leBian_SECID": "dmcve6kq.c",
@@ -435,11 +435,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
             "notifyUrl": "http://cxzcdn.hkhappygame.com/res/TestServerNotice/",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69423",
             "leBian_ClientChId": "youyi_bt_jj",
             "leBian_SECID": "dmcve6kq.c",
@@ -544,11 +544,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
-            "notifyUrl": "http://110.40.223.119:88/res/NoticeNew/",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
+            "notifyUrl": "http://43.226.57.217:88/res/NoticeNew/",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69423",
             "leBian_ClientChId": "youyi_bt_jj",
             "leBian_SECID": "dmcve6kq.c",
@@ -705,11 +705,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
-            "notifyUrl": "http://110.40.223.119:88/res/NoticeNew/",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
+            "notifyUrl": "http://43.226.57.217:88/res/NoticeNew/",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69423",
             "leBian_ClientChId": "youyi_bt_jj",
             "leBian_SECID": "dmcve6kq.c",
@@ -814,11 +814,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
-            "notifyUrl": "http://110.40.223.119:88/res/NoticeNew/",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
+            "notifyUrl": "http://43.226.57.217:88/res/NoticeNew/",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69423",
             "leBian_ClientChId": "youyi_bt_jj",
             "leBian_SECID": "dmcve6kq.c",
@@ -864,11 +864,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
-            "notifyUrl": "http://110.40.223.119:88/res/NoticeNew/",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
+            "notifyUrl": "http://43.226.57.217:88/res/NoticeNew/",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69423",
             "leBian_ClientChId": "youyi_bt_jj",
             "leBian_SECID": "dmcve6kq.c",
@@ -1028,11 +1028,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
-            "notifyUrl": "http://110.40.223.119:81//notice",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
+            "notifyUrl": "http://43.226.57.217:81//notice",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69510",
             "leBian_ClientChId": "youyi_cxzjj_bt",
             "leBian_SECID": "jbr2lfjj.c",
@@ -1227,11 +1227,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
             "notifyUrl": "http://cxzcdn.hkhappygame.com/res/TestServerNotice/",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69031",
             "leBian_ClientChId": "cxzjj_bt",
             "leBian_SECID": "tx75web0.c",
@@ -1685,11 +1685,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://110.40.223.119:81//",
-            "serverListUrl": "http://110.40.223.119:81//serverlist",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
             "notifyUrl": "http://cxzcdn.hkhappygame.com/res/TestServerNotice/",
-            "specialInfoUrl": "http://110.40.223.119:81//channel",
-            "customerServiceInfoUrl": "http://110.40.223.119:81//vipService"
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService"
         }
     ]
 }

README.md

@@ -4,22 +4,27 @@
 
 | 分支 | 说明 |
 |:-------:|:-------:|
- |   cn_0_1  | 国内 0.1 版
- | cn_merage
- | cn_zhuanFu | 国内专服
- | hy_en |海外英文(英美)
- | hy_iios_new | 海外ios(港澳台)
- | hy_ios | 海外ios(港澳台)（旧）
- | hy_ios_en |海外英文IOS(英美)
- | hy_new | 海外(港澳台)
- | hy_oldhp
- | hy_ru |海外俄语
- | hy_skin | 舍弃掉的
- | hy_test  | 海外测试(用于测试服，一般用于合并主分支的修改)(港澳台)
- | main  |主
- | new | 海外ios(港澳台)（旧）
- | skin_test
- | sskin  | 皮肤测试
+|   cn_0_1  | 国内 0.1 版
+| cn_merage | 合并
+| cn_zhuanFu | 国内专服
+| hy_en | 海外英文(英美)
+| hy_iios_new | 海外ios(港澳台)
+| hy_ios | 海外ios(港澳台)（旧）
+| hy_ios_en | 海外英文IOS(英美)
+| hy_new | 海外(港澳台)
+| hy_oldhp | 旧版hp
+| hy_ru | 海外俄语
+| hy_skin | 舍弃掉的
+| hy_test  | 海外测试(用于测试服，一般用于合并主分支的修改)(港澳台)
+| main  | 主
+| new | 海外ios(港澳台)（旧）
+| skin_test | 皮肤测试
+| sskin  | 皮肤测试
+
+> 各语言最新分支 
+> > 英文版: hy_dny </br>
+> > 繁体：hy_tw-en </br>
+> > 俄语：hy_ru </br>
 
 ## 目录结构说明
 ### 常规目录