diff --git a/Assets/ManagedResources/~Lua/Common/LanguageManager.lua b/Assets/ManagedResources/~Lua/Common/LanguageManager.lua index b97d097ef0..889727c132 100644 --- a/Assets/ManagedResources/~Lua/Common/LanguageManager.lua +++ b/Assets/ManagedResources/~Lua/Common/LanguageManager.lua @@ -12,6 +12,7 @@ function InitLanguageData() languageDic[config.original].zh = config.original languageDic[config.original].en = config.english or config.original languageDic[config.original].vi = config.vietnamese or config.original + languageDic[config.original].thai = config.Thailand or config.original count = count + 1 end end diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index f26858e740..68fc295947 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -2638,13 +2638,13 @@ end function GetLanguageStrById(zhStr) if languageDic[zhStr] then if GetCurLanguage() == 0 then - return languageDic[zhStr].zh + return languageDic[zhStr].vi elseif GetCurLanguage() == 1 then return languageDic[zhStr].en elseif GetCurLanguage() == 2 then - return languageDic[zhStr].vi + return languageDic[zhStr].thai else - return languageDic[zhStr].zh + return languageDic[zhStr].en end end return zhStr diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua index 2999e19a5a..d0b14e034d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua @@ -85,15 +85,7 @@ function SettingInfo:SetTipShow() this.dropDownText.text = "ภาษาไทย" end 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 + if GetCurLanguage() ~= flag then this.dropDownTip.gameObject:SetActive(true) else this.dropDownTip.gameObject:SetActive(false) @@ -124,15 +116,7 @@ function SettingInfo:BindEvent() function(value) PlayerPrefs.SetInt("language_flag", value) this:SetTipShow() - local language = 2 - if value == 0 then - language = 2 - elseif value == 1 then - language = 1 - else - language = 3 - end - if language == GetCurLanguage() then + if value == GetCurLanguage() then return end MsgPanel.ShowTwo(Language[12814], function() end, function()