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

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]);
                 }

Assets/Lua/Core/Constant.lua

@@ -11,6 +11,8 @@ local Constant = {
 
     OpenSystemLink = false,
     OpenSdkGameStartNtf = false,
+    OpenLanguageSetting = false,
+    LanguageNames = {'cn','en','vi','th'},
 
     HeroLeaderIcon = "FrameNew/label_main",
     HeroBattleIcon = "FrameNew/label_battling",

Assets/Lua/UI/UISettings/UISettingsView.lua

@@ -32,6 +32,7 @@ function UISettingsView:Init()
 	self:RefreshMusic()
 	self:RefreshSound()
 	self:RefreshDeleteAcount()
+	self:InitLanguageSelect()
 end
 
 function UISettingsView:RemoveEventListener()
@@ -285,5 +286,24 @@ function UISettingsView:OnDeleteSuc()
 				ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UINoticeTips, data)
             end, nil)
 end
+
+
+function UISettingsView:InitLanguageSelect()
+	if not Constant.OpenLanguageSetting then
+		self.languageSetting:SetActive(false)
+		return
+	end
+	self.languageSetting:SetActive(true)
+	self.uiBase:AddDropdownEventListener(self.lgsDropdown.dropdown, function (dropdown, value)
+		LogError("lgs dropdown value = "..value)
+	end)
+	self.lgsDropdown.dropdown.value = 0
+	DropDownHelper.ClearDropDown(self.lgsDropdown.dropdown);
+	DropDownHelper.SetStartName(self.lgsDropdown.dropdown, I18N.T('lgn_'..Constant.LanguageNames[1]))
+	for i = 1, #Constant.LanguageNames do
+		DropDownHelper.SetDropDownItems(self.lgsDropdown.dropdown, I18N.T('lgn_'..Constant.LanguageNames[i]));
+	end
+end
+
 return UISettingsView
 

Assets/Lua/UI/UISettings/UISettingsView_Generate.lua

@@ -2,6 +2,14 @@
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text UnityEngine.UI.Text
 
+---@class UISettings__Generate_lgsDropdown
+---@field public gameObject UnityEngine.GameObject
+---@field public dropdown UnityEngine.UI.Dropdown
+
+---@class UISettings__Generate_languageSelectTxt
+---@field public gameObject UnityEngine.GameObject
+---@field public text UnityEngine.UI.Text
+
 ---@class UISettings__Generate_sound_toggle
 ---@field public gameObject UnityEngine.GameObject
 ---@field public toggle UnityEngine.UI.Toggle
@@ -81,6 +89,9 @@
 ---@field private deleteTimeTxt UISettings__Generate_deleteTimeTxt
 ---@field private music UISettings__Generate_music
 ---@field private sound UISettings__Generate_sound
+---@field private languageSetting UnityEngine.GameObject
+---@field private languageSelectTxt UISettings__Generate_languageSelectTxt
+---@field private lgsDropdown UISettings__Generate_lgsDropdown
 ---@field private verText UISettings__Generate_verText
 local UISettingsView = class("UISettingsView", require("UIViewBase"))
 
@@ -121,6 +132,9 @@ function UISettingsView:InitGenerate(Root, data)
 	self:InitGenerate__18(Root,data)
 	self:InitGenerate__19(Root,data)
 	self:InitGenerate__20(Root,data)
+	self:InitGenerate__21(Root,data)
+	self:InitGenerate__22(Root,data)
+	self:InitGenerate__23(Root,data)
 
 
 end
@@ -377,6 +391,46 @@ end
 
 ---@private
 function UISettingsView:InitGenerate__20(Root, data)
+--[[
+	UIAnimator/Window/Bg/LanguageSetting
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/LanguageSetting").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.languageSetting = tmp
+end
+
+---@private
+function UISettingsView:InitGenerate__21(Root, data)
+--[[
+	UIAnimator/Window/Bg/LanguageSetting/languageSelectTxt
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/LanguageSetting/languageSelectTxt").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.languageSelectTxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
+end
+
+---@private
+function UISettingsView:InitGenerate__22(Root, data)
+--[[
+	UIAnimator/Window/Bg/LanguageSetting/LgsDropdown
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/LanguageSetting/LgsDropdown").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.lgsDropdown = tmp
+
+	tmp.dropdown = tmp:GetComponent(Enum.TypeInfo.Dropdown)
+end
+
+---@private
+function UISettingsView:InitGenerate__23(Root, data)
 --[[
 	UIAnimator/Window/Bg/VerBox/VerText
 --]]
@@ -459,6 +513,18 @@ function UISettingsView:GenerateDestroy()
 		tolua.setpeer(self.sound, nil)
 	end
 	self.sound = nil
+	if tolua.getpeer(self.languageSetting) ~= nil then
+		tolua.setpeer(self.languageSetting, nil)
+	end
+	self.languageSetting = nil
+	if tolua.getpeer(self.languageSelectTxt) ~= nil then
+		tolua.setpeer(self.languageSelectTxt, nil)
+	end
+	self.languageSelectTxt = nil
+	if tolua.getpeer(self.lgsDropdown) ~= nil then
+		tolua.setpeer(self.lgsDropdown, nil)
+	end
+	self.lgsDropdown = nil
 	if tolua.getpeer(self.verText) ~= nil then
 		tolua.setpeer(self.verText, nil)
 	end

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

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();
     }