From b0002cf78117752db2405ed33669096731b10cb8 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 25 Jul 2020 20:42:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=96=87=E5=AD=97=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/Language.lua | 1 + .../~Lua/Common/functions.lua | 2 +- .../ArenaTopMatch/ArenaTopMatchManager.lua | 4 ++-- .../TopMatchPlayBattleAinSelectPopup.lua | 4 ++-- .../ArenaTopMatch/View/ATM_MainMatchView.lua | 2 +- .../~Lua/Modules/Battle/View/BattlePanel.lua | 2 +- .../Modules/Carbon/CarbonScoreSortPanel.lua | 2 +- .../~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 2 +- .../Modules/Carbon/XuanYuanMirrorManager.lua | 12 +++++------ .../Modules/Carbon/XuanYuanMirrorPanel.lua | 2 +- .../Carbon/XuanYuanMirrorPanelList.lua | 14 ++++++------- .../Compound/view/CompoundPanel_Treasure.lua | 2 +- .../DataCenterService/TapDBManager.lua | 2 +- .../EliteMonster/EliteMonsterManager.lua | 2 +- .../Guild/DeathPos/DeathPosInfoPanel.lua | 2 +- .../Guild/DeathPos/DeathPosManager.lua | 4 ++-- .../LuckyTurnTable/LuckyTurnTablePanel.lua | 20 +++++++++---------- .../~Lua/Modules/Map/View/MapControllView.lua | 2 +- .../~Lua/Modules/Operating/QianKunBox.lua | 2 +- .../Popup/RewardEquipSingleShowPopup.lua | 2 +- .../Popup/RewardItemSingleShowPopup.lua | 12 +++++------ .../View/GeneralPopup_EquipBatchSell.lua | 2 +- .../View/GeneralPopup_EquipSingleSell.lua | 2 +- .../GeneralPopup_ResolveEquipTreasure.lua | 8 ++++---- .../Popup/View/GeneralPopup_ResolveRecall.lua | 2 +- .../Popup/View/GeneralPopup_TrialBomb.lua | 2 +- .../Modules/Resolve/EquipSellSelectPopup.lua | 4 ++-- .../~Lua/Modules/Story/StoryManager.lua | 1 - .../TreasureOfHeavenManager.lua | 2 +- data_execl/Language_data/LanguageLua.csv | 1 + 30 files changed, 61 insertions(+), 60 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 6a10972f12..7f6e647f11 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2277,4 +2277,5 @@ [12276] = "神将归元成功,等级重置为1级", [12277] = "未查询到符合条件的装备!", [12278] = "%d天%02d时", + [12279] = "妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力", } diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index af41682e02..85357d458f 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1084,7 +1084,7 @@ function TimeToDH(second) local minute = math.floor(second / 60) % 60 local sec = second % 60 local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) - return string.format("%d天%02d时",day, hour) + return string.format(Language[12278],day, hour) end --- 将一段时间转换为时分秒 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index b928f99151..9b114782fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -583,7 +583,7 @@ function this.GetCurTopMatchName() -- else -- stageName = math.pow(2, opTurn) .. Language[10097]--强 -- end - stageName = stageNameTable[this.baseInfo.battleTurn] or "不知道"..this.baseInfo.battleTurn + stageName = stageNameTable[this.baseInfo.battleTurn] or Language[12243]..this.baseInfo.battleTurn end local stateName = TOP_MATCH_STATE_NAME[this.baseInfo.battleState] or Language[10127]--未知 return titleName, stageName, stateName @@ -601,7 +601,7 @@ function this.GetTurnNameByRoundTimes(roundTimes,curTurn) return Language[10125]..NumToSimplenessFont[roundTimes] else -- 淘汰赛 - return stageNameTable[roundTimes] or "不知道"..this.baseInfo.battleTurn + return stageNameTable[roundTimes] or Language[12243]..this.baseInfo.battleTurn end -- local curTurn = roundTimes - maxRound -- 当前淘汰赛轮数 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/TopMatchPlayBattleAinSelectPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/TopMatchPlayBattleAinSelectPopup.lua index 0eb72aa614..88d186b230 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/TopMatchPlayBattleAinSelectPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/TopMatchPlayBattleAinSelectPopup.lua @@ -38,7 +38,7 @@ end --界面打开时调用(用于子类重写) function TopMatchPlayBattleAinSelectPopup:OnOpen(v) - this.title.text = "战斗记录" + this.title.text = Language[10146] for i = 1, 3 do local curPre = this.battleRecord[i] if curPre then @@ -52,7 +52,7 @@ function TopMatchPlayBattleAinSelectPopup:OnOpen(v) end end function this.SetPreShow(index,curPre,v) - Util.GetGameObject(curPre, "titleText"):GetComponent("Text").text = string.format("第%s场", index) + Util.GetGameObject(curPre, "titleText"):GetComponent("Text").text = string.format(Language[12244], index) Util.AddOnceClick(Util.GetGameObject(curPre, "PlayBackBtn"), function () this.SetPlayBack(v.fightResult,v.id,v.defInfo,v.attackInfo) end) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index 9650068f80..8046b80cf8 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -268,7 +268,7 @@ function this.SetWeedOutRootInfo() this.WeedOutText.text = Language[12208] this.WeedOutMyRank.text = Language[10104] this.WeedOutMyRankText.text = tmData.myrank <= 0 and Language[10041] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank) - this.WeedOutBestRank.text = "历史最高排名:" + this.WeedOutBestRank.text = Language[12245] this.WeedOutBestRankText.text = tmData.maxRank <= 0 and Language[10094] or this.GetRankName(tmData.maxRank) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index b0aa7b21e8..82dc79956c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -71,7 +71,7 @@ function this:BindEvent() end) Util.AddClick(this.ButtonLock, function () - PopupTipPanel.ShowTip("30级或首充后解锁") + PopupTipPanel.ShowTip(Language[12246]) end) local pauseTime = 31 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua index a930cea517..6eba6fac7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua @@ -132,7 +132,7 @@ end --- --------- 组件显示的初始化 -------------------------------------- function this.SetItemShow(panelType) local str = "" - str = panelType == PANEL_TYPE.TRIAL_RANK and "森罗幻境排行" or Language[10314] + str = panelType == PANEL_TYPE.TRIAL_RANK and Language[12247] or Language[10314] this.title.text = str this.monsterTitleRoot:SetActive(true)--两个排行用的一个titleroot diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index c6e123d556..432ba69e0e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -387,4 +387,4 @@ function CarbonTypePanelV2:OnDestroy() end end -return CarbonTypePanelV2 +return CarbonTypePanelV2 \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua index f14b694f29..4ccad8bd8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua @@ -30,7 +30,7 @@ function this.InitMirrorData() data.monsterId = v.MonsterId LogGreen("v.TeamRules:"..#v.TeamRules) data.teamRules = v.TeamRules - data.condition = string.format("需要上阵%s名%s系神将",data.teamRules[1][2],this.PropertyName(data.teamRules[1][1])) + data.condition = string.format(Language[12248],data.teamRules[1][2],this.PropertyName(data.teamRules[1][1])) data.power = v.FightForce data.rewardList = {} --概率奖励 @@ -62,15 +62,15 @@ end function this.PropertyName(_type) _type = tonumber(_type) if _type == 1 then - return "人" + return Language[11057] elseif _type == 2 then - return "佛" + return Language[12120] elseif _type == 3 then - return "妖" + return Language[12121] elseif _type == 4 then - return "道" + return Language[12122] else - return "人" + return Language[11057] end end diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index a21c530cee..f18898025c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua @@ -95,7 +95,7 @@ function this:OnShow(...) Util.SetGray(this.btnFochan, not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.BUDDHIST_MIRROR)) Util.SetGray(this.btnDaoxuan, not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TAOIST_MIRROR)) - this.remainTimes = "今日剩余次数:"..5 + this.remainTimes = Language[12249]..5 -- 音效 SoundManager.PlayMusic(SoundConfig.BGM_Carbon) -- 播放动画 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index 390b95fb16..638700ad4f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -11,10 +11,10 @@ local list = {} local colorText = { sprite = { [-1] = "s_slbz_1anniuhuise",[0] = "s_slbz_1anniuongse",[1] = "s_slbz_1anniuhuangse"}, color = { [-1] = "3B3B3B",[0] = "855139",[1] = "8B670C"}, - text = { [-1] = "未开启",[0] = "挑战",[1] = "扫荡" } + text = { [-1] = Language[10339],[0] = Language[10334],[1] = Language[10336] } } local difficult = { - text = {"简单","普通","困难","噩梦","炼狱","地狱","深渊","传奇","神话"}, + text = {Language[10351],Language[10352],Language[10353],Language[12250],Language[10354],Language[12148],Language[12251],Language[12252],Language[12253]}, sprite = {"x_xb_tiao_05","x_xb_tiao_04","x_xb_tiao_03","x_xb_tiao_02","x_xb_tiao_01"}, } @@ -72,7 +72,7 @@ function this:SwitchView() end end if curObj then - Util.GetGameObject(curObj,"Text"):GetComponent("Text").text = "妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力" + Util.GetGameObject(curObj,"Text"):GetComponent("Text").text = Language[12279] end this.ScrollView:SetData(dataList, function (index, go) this:SetLevelData(go, dataList[index]) @@ -92,13 +92,13 @@ function this:SetLevelData(go, data) elseif data.state == 0 then tip.text=data.condition else - tip.text="已通过" + tip.text=Language[10337] end Util.AddOnceClick(btnFight:GetGameObject("Button"),function() if data.state ==0 then UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.XUANYUAN_MIRROR,curType) elseif data.state == -1 then - PopupTipPanel.ShowTip("通过上一难度开启") + PopupTipPanel.ShowTip(Language[12255]) else --扫荡 end @@ -155,8 +155,8 @@ end --界面打开时调用(用于子类重写) function this:OnShow(...) - this.remainTimesTip.text = "剩余时间:5天23小时" - this.vipTips.text = "(激活特权可增加次数)" + this.remainTimesTip.text = Language[12256] + this.vipTips.text = Language[12257] this:SwitchView() end diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua index 6a967200ff..670a3e29cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -317,7 +317,7 @@ function this.AutoCompound(_position) end end if LengthOfTable(endReward) < 1 then - PopupTipPanel.ShowTip("消耗材料不足") + PopupTipPanel.ShowTip(Language[12258]) return end --BagManager.GetItemCountById(14) - diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/TapDBManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/TapDBManager.lua index 2c7dd92126..45d5fe2afc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/TapDBManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/TapDBManager.lua @@ -1,4 +1,4 @@ -TapDBManager = {} +TapDBManager = {} local this = TapDBManager function this.Initialize() if AppConst.isSDK then diff --git a/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterManager.lua b/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterManager.lua index 9947c9206c..4932dd1282 100644 --- a/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterManager.lua @@ -55,4 +55,4 @@ function this.ClearEliteMonster() end -return this +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index 81877de40d..53ea769d9f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -88,7 +88,7 @@ function DeathPosInfoPanel:BindEvent() return end if DeathPosManager.allowchallange==DeathPosStatus.Belated then - PopupTipPanel.ShowTip("挑战阶段加入公会,不允许参与本轮十绝阵!") + PopupTipPanel.ShowTip(Language[12259]) return end if DeathPosManager.battleTime<=0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua index e096c9b308..d32af947ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua @@ -139,10 +139,10 @@ end function this.ChangeDamageForm(_damage) local damage = _damage if damage/100000000 >= 1 then - return tostring(math.floor(damage/1000000)/100).."亿" + return tostring(math.floor(damage/1000000)/100)..Language[12100] end if damage/100000 >= 1 then - return tostring(math.floor(damage/10000)).."万" + return tostring(math.floor(damage/10000))..Language[10042] end return damage end diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua index 4425d4dd0c..fe7c1d52fa 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua @@ -237,7 +237,7 @@ function this.SwitchTreasureType(treasureType) this.ClearDefault() if treasureType==TreasureType.Lucky then LuckyTurnTableManager.curTreasureType=treasureType - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount) + this.maxTimes.text =string.format(Language[12260],LuckyTurnTableManager.luckyTimes,maxTimesCount) this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LuckyTreasure }) this.bg1.sprite=Util.LoadSprite(BgName[1]) @@ -281,12 +281,12 @@ function this.SwitchTreasureType(treasureType) this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示 this.RrFreshInfo() LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 1) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount) + this.maxTimes.text =string.format(Language[12260],LuckyTurnTableManager.luckyTimes,maxTimesCount) end) else --PopupTipPanel.ShowTip("幸运探宝券不足!") if LuckyTurnTableManager.luckyTimes + 1 > maxTimesCount then - PopupTipPanel.ShowTip("不可超出最大探宝次数!") + PopupTipPanel.ShowTip(Language[12261]) return else UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,60,nil) @@ -303,12 +303,12 @@ function this.SwitchTreasureType(treasureType) this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示 this.RrFreshInfo() LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 15) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount) + this.maxTimes.text =string.format(Language[12260],LuckyTurnTableManager.luckyTimes,maxTimesCount) end) else --PopupTipPanel.ShowTip("幸运探宝券不足!") if LuckyTurnTableManager.luckyTimes + 15 > maxTimesCount then - PopupTipPanel.ShowTip("不可超出最大探宝次数!") + PopupTipPanel.ShowTip(Language[12261]) return else UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,60,nil) @@ -348,7 +348,7 @@ function this.SwitchTreasureType(treasureType) elseif treasureType==TreasureType.Advanced then LuckyTurnTableManager.curTreasureType=treasureType - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount) + this.maxTimes.text =string.format(Language[12260],LuckyTurnTableManager.advanceTimes,maxTimesCount) this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.AdvancedTreasure }) this.bg1.sprite=Util.LoadSprite(BgName[3]) @@ -389,7 +389,7 @@ function this.SwitchTreasureType(treasureType) and LuckyTurnTableManager.advanceTimes + 1 <= maxTimesCount then LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,false,function() LuckyTurnTableManager.SetTimes(nil,LuckyTurnTableManager.advanceTimes + 1) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount) + this.maxTimes.text =string.format(Language[12260],LuckyTurnTableManager.advanceTimes,maxTimesCount) --Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData)) this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos) this.SetPropShow(61,TreasureType.Advanced) @@ -397,7 +397,7 @@ function this.SwitchTreasureType(treasureType) end) else --(24暂时关闭)注释和tip反转注释 - PopupTipPanel.ShowTip("高级探宝券不足!") + PopupTipPanel.ShowTip(Language[12262]) -- if LuckyTurnTableManager.advanceTimes + 1 > maxTimesCount then -- PopupTipPanel.ShowTip("不可超出最大探宝次数!") -- return @@ -412,7 +412,7 @@ function this.SwitchTreasureType(treasureType) and LuckyTurnTableManager.advanceTimes + 10 <= maxTimesCount then LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,true,function() LuckyTurnTableManager.SetTimes(nil,LuckyTurnTableManager.advanceTimes + 10) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount) + this.maxTimes.text =string.format(Language[12260],LuckyTurnTableManager.advanceTimes,maxTimesCount) --Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData)) this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos) this.SetPropShow(61,TreasureType.Advanced) @@ -420,7 +420,7 @@ function this.SwitchTreasureType(treasureType) end) else --(24暂时关闭)注释和tip反转注释 - PopupTipPanel.ShowTip("高级探宝券不足!") + PopupTipPanel.ShowTip(Language[12262]) -- if LuckyTurnTableManager.advanceTimes + 10 > maxTimesCount then -- PopupTipPanel.ShowTip("不可超出最大探宝次数!") -- return diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua index 3de886bfb0..463179f480 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua @@ -472,7 +472,7 @@ function this.EdgeEventTrigger(u, v) if v.heroHp<=0 then num = num -1 if num == 0 then - PopupTipPanel.ShowTip("猎妖师全部死亡,无法进入战斗!") + PopupTipPanel.ShowTip(Language[12263]) Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) return end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua index c3032ac947..3eda28bc85 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua @@ -224,7 +224,7 @@ end function QianKunBox:refreshMagicNum() local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox) self.leftUptips1.text = lotterySpecialConfig[20].Count-math.floor(actData.value/1000) - self.btnTimes.text = tostring(lotterySpecialConfig[21].Count-actData.value%1000).."次内必得金色魂印" + self.btnTimes.text = tostring(lotterySpecialConfig[21].Count-actData.value%1000)..Language[12264] self.midDowntips1.text = Language[12239] end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua index c961a02165..adeff8c503 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua @@ -87,7 +87,7 @@ function RewardEquipSingleShowPopup:BindEvent() end) end else - PopupTipPanel.ShowTip("无此装备") + PopupTipPanel.ShowTip(Language[12265]) end end) Util.AddClick(this.btnLock, function() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index b415503b70..a815e053ab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -218,17 +218,17 @@ end function this.getType() local type = itemConfig[itemSid].ItemBaseType if type == 1 then - return Language[11093].."特殊" + return Language[11093]..Language[12266] elseif type == 2 then - return Language[11093].."碎片" + return Language[11093]..Language[10219] elseif type == 4 then - return Language[11093].."装备" + return Language[11093]..Language[12267] elseif type == 5 then - return Language[11093].."宝物" + return Language[11093]..Language[12268] elseif type == 6 then - return Language[11093].."魂印" + return Language[11093]..Language[12269] elseif type == 7 then - return Language[11093].."材料" + return Language[11093]..Language[12270] end end --为关卡跳转做的排序 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua index 601b790532..a5aeb13dd0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua @@ -68,7 +68,7 @@ function this:OnShow(_parent,...) end end this.bodyText.text=string.format(Language[12234],num) - this.BodyText2:GetComponent("Text").text="(注意:本次出售包含金色或红色装备!)" + this.BodyText2:GetComponent("Text").text=Language[12271] this.BodyText2.gameObject:SetActive(isShow) local data={} local index = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua index 2bbaba0864..8775026c4c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua @@ -60,7 +60,7 @@ function this:BindEvent() end) Util.AddClick(this.confirmBtn,function() if count == 0 then - PopupTipPanel.ShowTip("出售数量不可为0个") + PopupTipPanel.ShowTip(Language[12272]) return end if selectEquipTreasureData.itemConfig.Quantity >= 4 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua index 37a95a5dc8..bc4214dcfd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua @@ -72,7 +72,7 @@ function this:OnShow(_parent,...) dropList = args[1] selectEquipTreasureData=args[2] - this.titleText.text="宝物分解" + this.titleText.text=Language[12212] --返还比 local isEquipShowSure = false selectEquipTreasureDataDid = {} @@ -83,10 +83,10 @@ function this:OnShow(_parent,...) isEquipShowSure=true end end - this.bodyText.text="宝物将分解为宝魂,若宝物已强化或精炼,分解后将清空强化和精炼等级,并100%返还养成材料。" - this.bodyText2:GetComponent("Text").text="(注意:本次出售包含金色或红色宝器!)" + this.bodyText.text=Language[12273] + this.bodyText2:GetComponent("Text").text=Language[12274] this.bodyText2.gameObject:SetActive(isEquipShowSure) - this.tipText.text = "分解后获得:" + this.tipText.text = Language[12275] local data={} local index = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua index 35d876a78e..2eeae2ac4d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua @@ -36,7 +36,7 @@ function this:BindEvent() end NetManager.HeroRetureEvent(data, function(msg) HeroManager.ResetHero(data) - PopupTipPanel.ShowTip("神将归元成功,等级重置为1级") + PopupTipPanel.ShowTip(Language[12276]) parent:ClosePanel() UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function () ResolvePanel.SwitchView(1) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua index 0c86f769a7..6573f0ba9d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua @@ -1,4 +1,4 @@ ------ 森罗次元炸弹 ----- +----- 森罗次元炸弹 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua index d7fdd13a89..992ea992cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua @@ -78,12 +78,12 @@ function EquipSellSelectPopup:BindEvent() end end if LengthOfTable(qualityList) == 0 or LengthOfTable(starList) == 0 then - PopupTipPanel.ShowTip("未查询到符合条件的装备!") + PopupTipPanel.ShowTip(Language[12277]) return end local data = BagManager.GetEquipDataByEquipQualityAndStar(qualityList,starList) if #data < 1 then - PopupTipPanel.ShowTip("未查询到符合条件的装备!") + PopupTipPanel.ShowTip(Language[12277]) return end self:ClosePanel() diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua index bcfc768c0c..b1c5784df6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua @@ -321,4 +321,3 @@ return this - diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua index 4be0001793..f6a5be6a3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua @@ -88,4 +88,4 @@ function this.RedPoint() return false end -return this +return this \ No newline at end of file diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 0480784d9a..8f9b8feab3 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2276,3 +2276,4 @@ 12276,񽫹Ԫɹ\ȼΪ1 12277,δѯװ 12278,%d%02dʱ +12279,ϵ񽫶50%˺\nϵ񽫽50%