3
0

6 Ревизии d9ad094d9d ... 6cad3d8ae5

Автор SHA1 Съобщение Дата
  gdl_123 6cad3d8ae5 ++lg преди 1 месец
  gdl_123 90a9602544 Merge branch 'hy_dny_localized' of http://43.226.57.217:3000/yishanyou/RoApp into hy_dny_localized преди 1 месец
  gdl_123 c4d0852116 Merge branch 'main' of ssh://192.168.0.8:29418/xianjing into hy_dny_localized преди 2 месеца
  gdl_123 98bb8f255f ++ 热更 преди 2 месеца
  gdl_123 dd226f8a04 ++ преди 2 месеца
  gdl_123 7308fb1acc ++font преди 2 месеца

+ 9 - 3
Assets/Content/Config/LanguagePackage_base.csv

@@ -1641,8 +1641,8 @@ BtnUnfollow,Unfollow
 BtnFollow,Follow
 BtnRemoveBlock,Unblock
 BtnOpen,Activate
-EnterText,Activate
-ShopDiscount,Click to enter chat content...
+EnterText,Click to enter chat content...
+ShopDiscount,{0}%off
 ShopSellwell,Must-buy
 ShopForeverBuy,Remaining purchases: {0}
 ShopDayBuy,Remaining purchases: {0}
@@ -19220,4 +19220,10 @@ DeleteErrorTxt,Account deletion has been applied for, please wait patiently.
 LoginGetServerListError,Too many players online. Please try again later.
 LoginGetServerListErrorString,Too many players are logging in. Retrying in {0}s.
 SdkLinkTxt,#c00ab65\nDear Adventurers,We are currently fixing an issue with in-app purchases.\n In the meantime, please use our Web Payment Center for recharge. Enjoy extra rewards for web recharge!\n Web Payment Center: #cff9800#t#hhttps://i.dze-game.com/recharge_center{https://i.dze-game.com/recharge_center}#h#t \n#c00ab65 Sorry for the trouble.
-DownloadResSize,{0}m/{1}m
+DownloadResSize,{0}m/{1}m
+LanguageSetting,Language Setting
+languageSelectTxt,Select Language
+lgn_cn,中文繁体
+lgn_en,English
+lgn_vi,Vietnamese
+lgn_th,Thai

+ 1 - 1
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset

@@ -33731,7 +33731,7 @@ Texture2D:
   m_MipsStripped: 0
   m_TextureFormat: 1
   m_MipCount: 1
-  m_IsReadable: 0
+  m_IsReadable: 1
   m_IsPreProcessed: 0
   m_IgnoreMasterTextureLimit: 0
   m_StreamingMipmaps: 0

+ 4 - 0
Assets/Editor/AssetBundle/CheckHotUpdateRes.cs

@@ -325,6 +325,10 @@ public class CheckHotUpdateRes : EditorWindow
                 }
                 else
                 {
+                    if (isignore)
+                    {
+                        continue;
+                    }
                     Debug.Log($"新 {newlist[i].FullName} MD5=[{newlist[i].MD5}]   Base = [{baseName}]");
                     needResList.Add(newlist[i]);
                 }

+ 1 - 1
Assets/Src/Core/DownLoad/DownloadMgr.cs

@@ -184,7 +184,7 @@ public class DownloadMgr : Singleton<DownloadMgr>
             downloadUrl = GetDownloadUrl();
 
 
-            downloadTaskMaxNum = 5;
+            downloadTaskMaxNum = 1;
             localFilePath = GetLocalResPath();//FileSystem.LocalDocumentPath;
 
 #if UNITY_IOS

+ 22 - 9
Assets/Src/GameLogic/LaunchLoadMgr.cs

@@ -165,14 +165,15 @@ public class LaunchLoadMgr
 
     private IEnumerator CheckResUpdate()
     {
+        DownloadMgr Dmgr = DownloadMgr.Instance;
         m_LoadingRootGo.SetActive(true);
-        DownloadMgr.Instance.CheckVersion();
+        Dmgr.CheckVersion();
         SetLoadDes("CheckRes");
         SetLoadPrecent(0);
         int pre = 0;
         yield return new WaitUntil(() =>
         {
-            if (!DownloadMgr.Instance.CheckFinish)
+            if (!Dmgr.CheckFinish)
             {
                 pre += 10;
                 if (pre >= 100)
@@ -185,22 +186,22 @@ public class LaunchLoadMgr
                 pre = 100;
             }
             SetLoadPrecent(pre);
-            return DownloadMgr.Instance.CheckFinish;
+            return Dmgr.CheckFinish;
         });
 
 
-        if (DownloadMgr.Instance.CheckNeedDownload())
+        if (Dmgr.CheckNeedDownload())
         {
             SetLoadDes("DownloadRes");
             SetLoadPrecent(0);
             yield return new WaitUntil(() =>
             {
-                bool isFinish = DownloadMgr.Instance.DownLoadFinish();
+                bool isFinish = Dmgr.DownLoadFinish();
                 if (isFinish)
                 {
 
                     //#if UNITY_IOS
-                    if (DownloadMgr.Instance.DowmloadError)
+                    if (Dmgr.DowmloadError)
                     {
                         isFinish = false;
                         SetLoadDes("GameLogin20");
@@ -213,16 +214,28 @@ public class LaunchLoadMgr
                 }
                 else
                 {
-                    float dsize = DownloadMgr.Instance.DownloadSize;
-                    float tsize = DownloadMgr.Instance.TotalSize;
+                    float dsize = Dmgr.DownloadSize;
+                    float tsize = Dmgr.TotalSize;
                     float press = (dsize / tsize) * 100;
                     SetLoadPrecent((int)press);
+                    if (Dmgr.DownloadTaskMaxNum == 1)
+                    {
+                        string tstr = (tsize / (1024 * 1024)).ToString("f2");
+                        string dstr = (dsize / (1024 * 1024)).ToString("f2");
+
+                        string str = I18N.T("DownloadResSize");
+                        if (str == "DownloadResSize")
+                        {
+                            str = "资源下载:{0}m/{1}m";
+                        }
+                        SetLoadDes(string.Format(str, dstr, tstr));
+                    }                    
                 }
                     return isFinish;
             });
         }
         yield return new WaitForSeconds(1);
-        DownloadMgr.Instance.Free();
+        Dmgr.Free();
         OnEndDownload();
     }