From a53f876a2fbcfa3d85e2aa2079d1125454724741 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 9 Apr 2021 17:13:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E3=80=91=E6=96=87=E5=AD=97=E8=B7=B3=E5=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/Language.lua | 7 +++---- Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua | 2 +- .../~Lua/Modules/Main/RedpotDebugPanel.lua | 2 +- .../View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua | 4 ++-- data_execl/Language_data/LanguageLua.csv | 3 +++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 21fb2d5ef8..5a98d6a935 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2283,8 +2283,7 @@ [12282] = GetLanguageStrById("每\n日\n仅\n需\n充\n值\n6\n元"), [12283] = GetLanguageStrById("每\n日\n仅\n需\n充\n值\n$0.99"), [12284] = GetLanguageStrById("%m月%d日%H时"), - [12285] = GetLanguageStrById("暂无可领取的奖励~"), - [12286] = GetLanguageStrById("次日0点重置"), - [12287] = GetLanguageStrById("请在以下道具中选择一种"), - [12288] = GetLanguageStrById("以下道具中可选择一种"), + [12285] = GetLanguageStrById("红点Debug"), + [12286] = GetLanguageStrById("解锁秘宝,可以领取额外专属奖励, 并直接获得200积分,可获取1980妖晶,邮件领取"), + [12287] = GetLanguageStrById("解锁秘宝,激活进阶专属奖励+ 直升15级,可获取1980妖晶,邮件领取"), } diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index a0d4e452d6..ba530dcee3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -91,7 +91,7 @@ function GMPanel:InitComponent() {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = Language[11176], inputTip = {Language[11196]}, callBack = nil}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "24#%s", btnTip = Language[11197], inputTip = {Language[11198]}, callBack = nil}, {type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[12175], inputTip = {Language[12176]}, callBack = this.TestFuncGuide}, - {type = GMType.Function, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "红点Debug", inputTip = {""}, callBack = this.OpenRedDebug}, + {type = GMType.Function, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[12285], inputTip = {""}, callBack = this.OpenRedDebug}, {type = GMType.Battle, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11199], inputTip = {""}, callBack = this.GoTestBattle}, diff --git a/Assets/ManagedResources/~Lua/Modules/Main/RedpotDebugPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/RedpotDebugPanel.lua index 55764b5c25..e4b74519bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/RedpotDebugPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/RedpotDebugPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local RedpotDebugPanel = Inherit(BasePanel) local RPData = require("Modules/Player/RedPointData") diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index ea932d6a21..865f24c449 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -59,11 +59,11 @@ function this:OnShow(_parent,...) rewardStateData = TreasureOfHeavenManger.rewardStateData rewardData = TreasureOfHeavenManger.GetAllRewardData() this:showRewardTianGong() - this.tip.text = Language[11562] + this.tip.text = Language[12286] elseif curType == 2 then rewardData = QinglongSerectTreasureManager.GetAllRewardData() this:showRewardQinglong() - this.tip.text = Language[11563] + this.tip.text = Language[12287] end end diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index dd608153e2..7d0392a3a0 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2282,3 +2282,6 @@ 12282,ÿ\n\n\n\n\nֵ\n6\nԪ 12283,ÿ\n\n\n\n\nֵ\n$0.99 12284,%m%d%Hʱ +12285,Debug +12286,رȡר ֱӻ200֣ɻȡ1980ʼȡ +12287,رר+ ֱ15ɻȡ1980ʼȡ