diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 703ec09f93..44e4a393f1 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1939,7 +1939,7 @@ Language = { [11938] = GetLanguageStrById("级,我们为您准备了超值礼包,准您提升战力!!!"), [11939] = GetLanguageStrById("恭喜您通关"), [11940] = GetLanguageStrById(",我们为您准备了超值礼包,帮助您快速通关"), - [11941] = GetLanguageStrById("恭喜您通过心魔试炼"), + [11941] = GetLanguageStrById("恭喜您通过四海历练"), [11942] = GetLanguageStrById("层,我们为您准备了超值礼包,帮助您快速通关"), [11943] = GetLanguageStrById("当前特权等级的任务已经完成"), [11944] = GetLanguageStrById("特权"), @@ -2164,7 +2164,7 @@ Language = { [12163] = GetLanguageStrById("解锁"), [12164] = GetLanguageStrById("已将任务解锁!"), [12165] = GetLanguageStrById("已锁定任务!"), - [12166] = GetLanguageStrById("通过心魔试炼第%s波"), + [12166] = GetLanguageStrById("通过四海历练第%s波"), [12167] = GetLanguageStrById("无可领取附件!"), [12168] = GetLanguageStrById("【金色】"), [12169] = GetLanguageStrById("已经拥有该皮肤"), @@ -2304,7 +2304,7 @@ Language = { [12303] = GetLanguageStrById("剩余:%s次"), [12304] = GetLanguageStrById("已兑换"), [12305] = GetLanguageStrById("兑换"), - [12306] = GetLanguageStrById("心魔试炼阵容:"), + [12306] = GetLanguageStrById("四海历练阵容:"), [12307] = GetLanguageStrById("当前已激活该称号,是否要重复使用?"), [12308] = GetLanguageStrById("成功激活称号!"), [12309] = GetLanguageStrById("%s、单场战斗伤害到达%s"), diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua index 213f4620dd..3c587e80e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua @@ -343,8 +343,8 @@ function this.CheckFightOpenRule(fightId) local star = FightLevelManager.GetAllChapterStars() if star < rule[2] then states[index] = false - tips[index] = string.format("山河社稷图星数达%s", rule[2])-- 山河社稷图%s星 - btnTxts[index] = string.format("山河社稷图%s星", rule[2]) + tips[index] = string.format("征服四海星数达%s", rule[2])-- 山河社稷图%s星 + btnTxts[index] = string.format("征服四海%s星", rule[2]) --LogRed(tips[index]..", 当前:"..star) end elseif rule[1] == 2 then diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua index 4157431340..9a5f57a37d 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua @@ -178,7 +178,7 @@ function FightLevelTrialPanel:SingleDataShow(item,data,index) end Util.AddOnceClick(getBtn,function () if state == 0 then - --PopupTipPanel.ShowTip("请前往山河社稷图获取更多星星!") + --PopupTipPanel.ShowTip("请前往征服四海获取更多星星!") UIManager.OpenPanel(UIName.FightLevelChapterPanel) elseif state == 1 then NetManager.GetActivityRewardRequest(data.missionId,self.actData.activityId,function (_drop) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index 29dde1b202..537ac6b2fe 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua @@ -70,7 +70,7 @@ function this:ShowInfo() this.titleText.text=Language[11587] this.text1.text=string.format("消耗%s点仙缘积分\n可领取一个传说自选箱!",_CostItem) this.text2.text=""--Language[11589] --后续改成读表 - this.text3.text= string.format("充值%s或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star) + this.text3.text= string.format("充值%s或征服四海累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star) --Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),_Con_Recharge)..Language[11591] local isUnlock = VipManager.GetChargedNum() >= _Con_Recharge or FightLevelManager.GetAllChapterStars() >= _Con_Star diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 99b2a3ceba..5e7d6437bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -246,7 +246,7 @@ end --Check function Practice:UpgradeCheck() if PracticeManager.StarNum < self.curLevelConfig.NeedStarNum then - PopupTipPanel.ShowTip("无法破境,请前往山河社稷图获取更多星星!") + PopupTipPanel.ShowTip("无法破境,请前往征服四海获取更多星星!") return true end if self.curLevelConfig.LevelUpCost then diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 7b796f5f50..1d962fe98a 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -19,7 +19,7 @@ local activityType = { [1] = {name = Language[11935],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21,Text = Language[12319]}, [2] = {name = Language[11936],timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8,Text = ""}, [3] = {name = "关卡推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25,Text = Language[12320]}, -[4] = {name = "心魔试炼礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26,Text = Language[12321]}, +[4] = {name = "四海历练礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26,Text = Language[12321]}, --[5] = {name = "灵兽推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 31,Text = "恭喜您获得极品灵兽,这是为您准备的灵兽成长礼包,助您实力飞升"}, --[6] = {name = "惊喜礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 33,Text = "购买惊喜礼盒成功激活限时豪礼,祝您战力飞升,一路通关"}, --[7] = {name = "轩辕宝镜推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 36,Text = "恭喜您获得红色宝物,海量宝物强化资源,助您实力飞升"},