diff --git a/lua/app/common/i18n_manager.lua b/lua/app/common/i18n_manager.lua index 21c154f0..95870abf 100644 --- a/lua/app/common/i18n_manager.lua +++ b/lua/app/common/i18n_manager.lua @@ -133,12 +133,16 @@ local LANGUAGE_HIGHLIGHT_SPRITE = { } function I18N:init() - local curLanguage = LocalData:getSelectedLanguage() - if curLanguage == "" or not self:supportLanguage(curLanguage) then - curLanguage = self:getSystemLanguage() - if curLanguage == nil then - curLanguage = CS.BF.BFPlatform.GetCurrentLanguageInfo():GetFallbackLanguage() - end + -- local curLanguage = LocalData:getSelectedLanguage() + -- if curLanguage == "" or not self:supportLanguage(curLanguage) then + -- curLanguage = self:getSystemLanguage() + -- if curLanguage == nil then + -- curLanguage = CS.BF.BFPlatform.GetCurrentLanguageInfo():GetFallbackLanguage() + -- end + -- end + local curLanguage = self:getSystemLanguage() + if curLanguage == nil then + curLanguage = CS.BF.BFPlatform.GetCurrentLanguageInfo():GetFallbackLanguage() end local changeStatus = self:setLanguage(curLanguage, true) diff --git a/lua/app/first/first.lua b/lua/app/first/first.lua index beae94cc..91c2ccd2 100644 --- a/lua/app/first/first.lua +++ b/lua/app/first/first.lua @@ -46,15 +46,21 @@ function First:init() end function First:initLanguage() - self.language = PlayerPrefs.GetString("SELECTED_LANGUAGE", "") - print("first init language " .. self.language) - if not LANGUAGES[self.language] then - self.language = self:getSystemLanguage() - if self.language == nil then - self.language = BFPlatform.GetCurrentLanguageInfo():GetFallbackLanguage() - end - PlayerPrefs.SetString("SELECTED_LANGUAGE", self.language) + -- self.language = PlayerPrefs.GetString("SELECTED_LANGUAGE", "") + -- print("first init language " .. self.language) + -- if not LANGUAGES[self.language] then + -- self.language = self:getSystemLanguage() + -- if self.language == nil then + -- self.language = BFPlatform.GetCurrentLanguageInfo():GetFallbackLanguage() + -- end + -- PlayerPrefs.SetString("SELECTED_LANGUAGE", self.language) + -- end + -- 根据语言来,不切换 + self.language = self:getSystemLanguage() + if self.language == nil then + self.language = BFPlatform.GetCurrentLanguageInfo():GetFallbackLanguage() end + PlayerPrefs.SetString("SELECTED_LANGUAGE", self.language) self.stringMap = firstText.data self.strNoNetwork = self.stringMap["STR_NO_NETWORK_CONNECTION"][self.language]