From 7ee4724b5cc28b82ad79e4f01a9a1a8465b0998e Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Tue, 14 Jan 2025 17:01:59 +0800 Subject: [PATCH] 1 --- .../~Lua/Common/LanguageManager.lua | 13 ++++---- .../~Lua/Modules/Setting/SettingInfo.lua | 30 +++++++++++++++---- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/LanguageManager.lua b/Assets/ManagedResources/~Lua/Common/LanguageManager.lua index 72c7387876..b97d097ef0 100644 --- a/Assets/ManagedResources/~Lua/Common/LanguageManager.lua +++ b/Assets/ManagedResources/~Lua/Common/LanguageManager.lua @@ -1,9 +1,9 @@ -languageDic={} +languageDic = {} IsLanguagePack = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.LanguagePackager) function InitLanguageData() - local languageData= ConfigManager.GetConfig(ConfigName.Language) + local languageData = ConfigManager.GetConfig(ConfigName.Language) local count = 0; for index, config in ConfigPairs(languageData) do --LogPink("config.originalconfig.original "..config.id.." "..tostring(config.original).." "..tostring(config.english).." "..tostring(config.vietnamese)) @@ -15,9 +15,9 @@ function InitLanguageData() count = count + 1 end end - LogError("长度2:".. count) + LogError("长度2:" .. count) --LogGreen("语言初始化完成:"..tostring(#languageData)) -end +end -- 图片名字翻译 function GetTranslateSpriteName(name) @@ -29,11 +29,12 @@ function GetTranslateSpriteName(name) transName = string.sub(transName, 1, #transName - 2) .. "en" elseif l == 2 then transName = string.sub(transName, 1, #transName - 2) .. "vi" + elseif l == 3 then + transName = string.sub(transName, 1, #transName - 2) .. "en" end end LogError(transName) return transName end - -InitLanguageData() \ No newline at end of file +InitLanguageData() diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua index 37fc193a47..2999e19a5a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua @@ -76,14 +76,24 @@ function SettingInfo:SetTipShow() local flag = PlayerPrefs.GetInt("language_flag") --LogGreen("PlayerPrefs:"..flag) if flag == 0 then - this.dropDownText.text = Language[12810] - elseif flag == 2 then + --this.dropDownText.text = Language[12810] + --elseif flag == 2 then this.dropDownText.text = "Tiếng Việt" elseif flag == 1 then this.dropDownText.text = "English" + elseif flag == 2 then + this.dropDownText.text = "ภาษาไทย" end - this.dropDown.value = flag - 1 - if GetCurLanguage() ~= flag then + this.dropDown.value = flag + local language = 2 + if flag == 0 then + language = 2 + elseif flag == 1 then + language = 1 + else + language = 3 + end + if GetCurLanguage() ~= language then this.dropDownTip.gameObject:SetActive(true) else this.dropDownTip.gameObject:SetActive(false) @@ -112,9 +122,17 @@ function SettingInfo:BindEvent() if IsLanguagePack then this.dropDown.onValueChanged:AddListener( function(value) - PlayerPrefs.SetInt("language_flag", value + 1) + PlayerPrefs.SetInt("language_flag", value) this:SetTipShow() - if (value + 1) == GetCurLanguage() then + local language = 2 + if value == 0 then + language = 2 + elseif value == 1 then + language = 1 + else + language = 3 + end + if language == GetCurLanguage() then return end MsgPanel.ShowTwo(Language[12814], function() end, function()