From 1e47fc310b8cd1f37ba2e6ff0e6bd2e0e61c844d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 22 Mar 2021 16:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E3=80=91=E9=82=80?= =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E7=BA=A2=E5=8C=85=EF=BC=8C=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/Language.lua | 3 +++ Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua | 6 +++--- .../~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua | 2 +- data_execl/Language_data/LanguageLua.csv | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index e88d44ae92..0deebaef00 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2234,4 +2234,7 @@ [12233] = GetLanguageStrById("核心神将:"), [12234] = GetLanguageStrById("%d次内必得金色及以上魂印"), [12235] = GetLanguageStrById("重连失败,请重新登录"), + [12236] = GetLanguageStrById("%s 级公会 %s 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 %s 级)【马上加入】"), + [12237] = GetLanguageStrById("%s 发送了%s,请迅速前往抢夺红包!"), + [12238] = GetLanguageStrById("替 换"), } diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index 5cce2227ca..9182df8242 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua @@ -466,7 +466,7 @@ function this.RequestSendGuildTranscript(func) local channel = CHAT_CHANNEL.FAMILY local guildData = MyGuildManager.GetMyGuildInfo() local content = string.format( - GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,135).Desc), + GetLanguageStrById(Language[10314]), PlayerManager.nickName) this.RequestSendChatMsg(channel, content, function() end) @@ -512,7 +512,7 @@ function this.AnalysisGlobalChat(msg) chat.gLimitLv = tonumber(headList[5]) chat.joinType = tonumber(headList[6]) chat.content = string.format( - GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,136).Desc), + GetLanguageStrById(Language[12236]), chat.gLv, chat.gName, chat.gLimitLv) @@ -520,7 +520,7 @@ function this.AnalysisGlobalChat(msg) chat.nickName=headList[2] chat.redpackName=GetLanguageStrById(headList[3]) chat.content = string.format( - GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,137).Desc), + GetLanguageStrById(Language[12237]), chat.nickName, chat.redpackName) elseif chat.type==GLOBAL_CHAT_TYPE.GUILD_AID then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index 16389e5148..89f92c0542 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -158,7 +158,7 @@ function RoleEquipChangePopup:OnShow() this.equipPanel[2].curEquipText:SetActive(false) this.equipPanel[1].curEquipBtnDown:SetActive(false) this.equipPanel[2].curEquipBtnDown:SetActive(true) - this.equipPanel[2].curEquipBtnDownText.text = "替 换" + this.equipPanel[2].curEquipBtnDownText.text = Language[12238] --"替 换" this.ShowCurEquipData(2) this.NextCurEquipData() diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 4d537e7606..0ae1e9a2b0 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2233,3 +2233,6 @@ 12233,񽫣 12234,%dڱصýɫϻӡ 12235,ʧܣµ¼ +12236,%s %s ļϢλð߼룡(ȼ %s )ϼ롿 +12237,%s %sѸǰ +12238,