【本地化】lua文本重新导出

dev_chengFeng
gaoxin 2021-03-04 15:16:23 +08:00
parent 7a6808a8d1
commit d31b9298df
38 changed files with 2352 additions and 2361 deletions

View File

@ -2180,53 +2180,53 @@
[12179] = GetLanguageStrById("战力:"), [12179] = GetLanguageStrById("战力:"),
[12180] = GetLanguageStrById("赔率:"), [12180] = GetLanguageStrById("赔率:"),
[12181] = GetLanguageStrById("装备种类:"), [12181] = GetLanguageStrById("装备种类:"),
[12182] = GetLanguageStrById("大闹天宫进入重置阶段请等待凌晨0点后进入"), [12182] = GetLanguageStrById("最高纪录:"),
[12183] = GetLanguageStrById("无法对共鸣神将进行此操作"), [12183] = GetLanguageStrById("大闹天宫进入重置阶段请等待凌晨0点后进入"),
[12184] = GetLanguageStrById("次内必得金色及以上魂印"), [12184] = GetLanguageStrById("无法对共鸣神将进行此操作!"),
[12185] = GetLanguageStrById("鸿蒙碑开启引导"), [12185] = GetLanguageStrById("次内必得金色及以上魂印"),
[12186] = GetLanguageStrById("收到援助:"), [12186] = GetLanguageStrById("鸿蒙碑开启引导"),
[12187] = GetLanguageStrById("需要6名鸿蒙守卫才可激活共鸣效果!"), [12187] = GetLanguageStrById("收到援助:"),
[12188] = GetLanguageStrById("是否花费%d妖晶直接恢复"), [12188] = GetLanguageStrById("需要6名鸿蒙守卫才可激活共鸣效果!"),
[12189] = GetLanguageStrById("进错了....."), [12189] = GetLanguageStrById("是否花费%d妖晶直接恢复"),
[12190] = GetLanguageStrById("进错了"), [12190] = GetLanguageStrById("进错了....."),
[12191] = GetLanguageStrById("共鸣ing"), [12191] = GetLanguageStrById("进错了"),
[12192] = GetLanguageStrById("获得鸿蒙碑共鸣效果"), [12192] = GetLanguageStrById("共鸣ing"),
[12193] = GetLanguageStrById("获得鸿蒙共鸣效果"), [12193] = GetLanguageStrById("获得鸿蒙共鸣效果"),
[12194] = GetLanguageStrById("%s%d星"), [12194] = GetLanguageStrById("获得鸿蒙阵共鸣效果"),
[12195] = GetLanguageStrById("\t\t\t\t\t\t<color=green>%d级</color>(当前上限%d级)"), [12195] = GetLanguageStrById("%s%d星"),
[12196] = GetLanguageStrById("\t\t\t\t\t\t<color=green>%d级</color>(%s)"), [12196] = GetLanguageStrById("\t\t\t\t\t\t<color=green>%d级</color>(当前上限%d级)"),
[12197] = GetLanguageStrById("\t\t\t\t\t\t<color=red>无</color>"), [12197] = GetLanguageStrById("\t\t\t\t\t\t<color=green>%d级</color>(%s)"),
[12198] = GetLanguageStrById("\t\t\t\t\t\t%s%d星(%s)"), [12198] = GetLanguageStrById("\t\t\t\t\t\t<color=red>无</color>"),
[12199] = GetLanguageStrById("鸿蒙使者不足6位无法产生共鸣"), [12199] = GetLanguageStrById("\t\t\t\t\t\t%s%d星(%s)"),
[12200] = GetLanguageStrById("鸿蒙碑等级已达上限"), [12200] = GetLanguageStrById("鸿蒙使者不足6位无法产生共鸣"),
[12201] = GetLanguageStrById("鸿蒙塔等级:"), [12201] = GetLanguageStrById("鸿蒙碑等级已达上限!"),
[12202] = GetLanguageStrById("成长护符不足!"), [12202] = GetLanguageStrById("鸿蒙塔等级:"),
[12203] = GetLanguageStrById("<color=#ffbc22>%s</color>\n<color=#bd922a>后恢复</color>"), [12203] = GetLanguageStrById("成长护符不足!"),
[12204] = GetLanguageStrById(" 添加等级 "), [12204] = GetLanguageStrById("<color=#ffbc22>%s</color>\n<color=#bd922a>后恢复</color>"),
[12205] = GetLanguageStrById("清除数据"), [12205] = GetLanguageStrById(" 添加等级 "),
[12206] = GetLanguageStrById("请先解锁前一个共鸣位置!"), [12206] = GetLanguageStrById("清除数据"),
[12207] = GetLanguageStrById("共鸣格子已经全部解锁"), [12207] = GetLanguageStrById("请先解锁前一个共鸣位置!"),
[12208] = GetLanguageStrById("是否花费%s玄黄之气解锁共鸣位置"), [12208] = GetLanguageStrById("共鸣格子已经全部解锁"),
[12209] = GetLanguageStrById("玄黄之气不足%s是否直接花费%s妖晶解锁共鸣位置?"), [12209] = GetLanguageStrById("是否花费%s玄黄之气解锁共鸣位置?"),
[12210] = GetLanguageStrById("鸿蒙等级"), [12210] = GetLanguageStrById("玄黄之气不足%s是否直接花费%s妖晶解锁共鸣位置"),
[12211] = GetLanguageStrById("确认花费<color=#FF0000>%s</color>%s将%s涅槃为初始状态,并<color=#55C78AFF>100%s返还</color>养成消耗"), [12211] = GetLanguageStrById("鸿蒙等级"),
[12212] = GetLanguageStrById("确认花费<color=#55C78AFF>%s</color>%s将%s涅槃为初始状态,并<color=#55C78AFF>100%s返还</color>养成消耗"), [12212] = GetLanguageStrById("已达到最大时长"),
[12213] = GetLanguageStrById("排行榜数据到头"), [12213] = GetLanguageStrById("确认花费<color=#FF0000>%s</color>%s将%s涅槃为初始状态,并<color=#55C78AFF>100%s返还</color>养成消耗"),
[12214] = GetLanguageStrById("装备品阶"), [12214] = GetLanguageStrById("确认花费<color=#55C78AFF>%s</color>%s将%s涅槃为初始状态,并<color=#55C78AFF>100%s返还</color>养成消耗"),
[12215] = GetLanguageStrById("装备星级"), [12215] = GetLanguageStrById("排行榜数据到头"),
[12216] = GetLanguageStrById("请先选择一个神将"), [12216] = GetLanguageStrById("装备品阶"),
[12217] = GetLanguageStrById("共鸣神将选择"), [12217] = GetLanguageStrById("装备星级"),
[12218] = GetLanguageStrById("穿 戴"), [12218] = GetLanguageStrById("请先选择一个神将"),
[12219] = GetLanguageStrById("卸 下"), [12219] = GetLanguageStrById("共鸣神将选择"),
[12220] = GetLanguageStrById("共鸣装备,无法一键卸下"), [12220] = GetLanguageStrById("穿 戴"),
[12221] = GetLanguageStrById("装备共鸣中,不可一键装备!"), [12221] = GetLanguageStrById("卸 下"),
[12222] = GetLanguageStrById("更换后将暂时失去共鸣装备,确定更换?"), [12222] = GetLanguageStrById("共鸣装备,无法一键卸下"),
[12223] = GetLanguageStrById("点击交换icon"), [12223] = GetLanguageStrById("装备共鸣中,不可一键装备!"),
[12224] = GetLanguageStrById("equipIdList长度是 "), [12224] = GetLanguageStrById("更换后将暂时失去共鸣装备,确定更换?"),
[12225] = GetLanguageStrById("点击交换else语句"), [12225] = GetLanguageStrById("点击交换icon"),
[12226] = GetLanguageStrById("升级成功!"), [12226] = GetLanguageStrById("equipIdList长度是 "),
[12227] = GetLanguageStrById("装备个数"), [12227] = GetLanguageStrById("点击交换else语句"),
[12228] = GetLanguageStrById("最高纪录:"), [12228] = GetLanguageStrById("升级成功!"),
[12229] = GetLanguageStrById("已达到最大时长"), [12229] = GetLanguageStrById("装备个数"),
[12230] = GetLanguageStrById("竞技守卫"), [12230] = GetLanguageStrById("竞技守卫"),
} }

View File

@ -115,4 +115,4 @@ function BattleUnit:ClearLoopFunc(t)
self._LoopFuncList = {} self._LoopFuncList = {}
end end
end end
--++++++++++++++LoopFunc --++++++++++++++LoopFunc

View File

@ -204,7 +204,7 @@ function this.SetPlayerInfo(ranks,myRankInfo)
this.monsterWave.text = Language[11685]..Language[10036] this.monsterWave.text = Language[11685]..Language[10036]
elseif myRank > 0 then elseif myRank > 0 then
this.monsterRank.text = Language[10103]..tostring(myRank) this.monsterRank.text = Language[10103]..tostring(myRank)
this.monsterWave.text = GetLanguageStrById(Language[12228])..Language[10262] .. myWave .. Language[10266] this.monsterWave.text = GetLanguageStrById(Language[12182])..Language[10262] .. myWave .. Language[10266]
end end
end end
-- 其他玩家的排行 -- 其他玩家的排行

View File

@ -366,7 +366,7 @@ function this.BtnClick(id)
CheckRedPointStatus(RedPointType.OrdinaryExplore) CheckRedPointStatus(RedPointType.OrdinaryExplore)
else else
if ExpeditionManager.ExpeditionState == 2 then if ExpeditionManager.ExpeditionState == 2 then
PopupTipPanel.ShowTip(Language[12182]) PopupTipPanel.ShowTip(Language[12183])
else else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION)) PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION))
end end

View File

@ -171,7 +171,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
end end
end end
Util.AddOnceClick(GongMingMask, function() Util.AddOnceClick(GongMingMask, function()
PopupTipPanel.ShowTip(Language[12183]) PopupTipPanel.ShowTip(Language[12184])
end) end)
Util.AddOnceClick(cardBtn, function() Util.AddOnceClick(cardBtn, function()
if curSelectHeroList[heroData.dynamicId] then if curSelectHeroList[heroData.dynamicId] then

View File

@ -276,7 +276,7 @@ function this.SingleHeroDataShow(_go,_heroData)
this.cost:SetActive(true) this.cost:SetActive(true)
end end
Util.AddOnceClick(GongMingMask, function() Util.AddOnceClick(GongMingMask, function()
PopupTipPanel.ShowTip(Language[12183]) PopupTipPanel.ShowTip(Language[12184])
end) end)
Util.AddOnceClick(cardBtn, function() Util.AddOnceClick(cardBtn, function()
if heroData.dynamicId == curSelectHero.dynamicId then if heroData.dynamicId == curSelectHero.dynamicId then

View File

@ -278,7 +278,7 @@ function QianKunBox:refreshMagicNum()
local d = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySpecialConfig,"Type",singleRecruit.MergePool) local d = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySpecialConfig,"Type",singleRecruit.MergePool)
-- self.leftUptips1.text = d[1].Count-math.floor(actData.value/1000) -- self.leftUptips1.text = d[1].Count-math.floor(actData.value/1000)
local t = d[1].Count-math.floor(actData.value/1000) local t = d[1].Count-math.floor(actData.value/1000)
self.btnTimes.text = tostring(d[2].Count-actData.value%1000)..Language[12184] self.btnTimes.text = tostring(d[2].Count-actData.value%1000)..Language[12185]
self.midDowntips1.text = Language[10495]..t..Language[10496] self.midDowntips1.text = Language[10495]..t..Language[10496]
end end

View File

@ -485,10 +485,10 @@ function this.RefreshPanelShowByState()
PlayerManager.carbonType = 1 PlayerManager.carbonType = 1
if ExpeditionManager.ExpeditionState == 2 then if ExpeditionManager.ExpeditionState == 2 then
UIManager.OpenPanel(UIName.CarbonTypePanelV2) UIManager.OpenPanel(UIName.CarbonTypePanelV2)
PopupTipPanel.ShowTip(Language[12182]) PopupTipPanel.ShowTip(Language[12183])
elseif ExpeditionManager.ExpeditionState == 3 then elseif ExpeditionManager.ExpeditionState == 3 then
UIManager.OpenPanel(UIName.CarbonTypePanelV2) UIManager.OpenPanel(UIName.CarbonTypePanelV2)
PopupTipPanel.ShowTip(Language[12182]) PopupTipPanel.ShowTip(Language[12183])
end end
end end
end end

View File

@ -20,7 +20,7 @@ end
this.IsFirstOpenHarmonyBei = false this.IsFirstOpenHarmonyBei = false
function this.HongMengGuideFun(OnOff) function this.HongMengGuideFun(OnOff)
--鸿蒙碑开启引导 --鸿蒙碑开启引导
print(Language[12185]) print(Language[12186])
if OnOff == 1 then if OnOff == 1 then
-- body -- body
UIManager.OpenPanel(UIName.MainPanel) UIManager.OpenPanel(UIName.MainPanel)

View File

@ -150,7 +150,7 @@ function this.SingleHelpDataShow(go,data)
Util.GetGameObject(go, "heroPro/frame/chipImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[data.type].Quantity)) Util.GetGameObject(go, "heroPro/frame/chipImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[data.type].Quantity))
Util.GetGameObject(go, "heroPro/frame/proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig[data.type].PropertyName)) Util.GetGameObject(go, "heroPro/frame/proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig[data.type].PropertyName))
Util.GetGameObject(go, "okAid/chipInfo"):GetComponent("Text").text = GetLanguageStrById(itemConfig[data.type].Name) Util.GetGameObject(go, "okAid/chipInfo"):GetComponent("Text").text = GetLanguageStrById(itemConfig[data.type].Name)
Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text =Language[12186]..data.num.."/"..guildHelpConfig[1].RecourseTime[2] Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text =Language[12187]..data.num.."/"..guildHelpConfig[1].RecourseTime[2]
Util.GetGameObject(go, "okAid/getFinishText"):SetActive(data.num == data.hadtakenum and data.hadtakenum == guildHelpConfig[1].RecourseTime[2]) Util.GetGameObject(go, "okAid/getFinishText"):SetActive(data.num == data.hadtakenum and data.hadtakenum == guildHelpConfig[1].RecourseTime[2])
Util.GetGameObject(go, "okAid/progressbar/progress1"):GetComponent("Image").fillAmount = data.num/guildHelpConfig[1].RecourseTime[2] Util.GetGameObject(go, "okAid/progressbar/progress1"):GetComponent("Image").fillAmount = data.num/guildHelpConfig[1].RecourseTime[2]
Util.GetGameObject(go, "okAid/progressbar/progress2"):GetComponent("Image").fillAmount = data.hadtakenum/guildHelpConfig[1].RecourseTime[2] Util.GetGameObject(go, "okAid/progressbar/progress2"):GetComponent("Image").fillAmount = data.hadtakenum/guildHelpConfig[1].RecourseTime[2]

View File

@ -57,7 +57,7 @@ function EnvoyItem:OnOpen()
if self.data.time - GetTimeStamp() > 0 then if self.data.time - GetTimeStamp() > 0 then
local content = "" local content = ""
local money = math.ceil((self.data.time - GetTimeStamp()) / 432) local money = math.ceil((self.data.time - GetTimeStamp()) / 432)
content =string.format(Language[12188],money) content =string.format(Language[12189],money)
MsgPanel.ShowTwo(content,function () MsgPanel.ShowTwo(content,function ()
MsgPanel.Hide() MsgPanel.Hide()
@ -122,11 +122,11 @@ function EnvoyItem:SetItem(go,data)
self.Empty:SetActive(true) self.Empty:SetActive(true)
if self.data.time-GetTimeStamp() > 0 then if self.data.time-GetTimeStamp() > 0 then
-- body -- body
print(Language[12189]..self.data.time-GetTimeStamp()) print(Language[12190]..self.data.time-GetTimeStamp())
self.AddImage:SetActive(false) self.AddImage:SetActive(false)
self.RedPoint:SetActive(false) self.RedPoint:SetActive(false)
else else
print(Language[12190]) print(Language[12191])
self.AddImage:SetActive(true) self.AddImage:SetActive(true)
self.RedPoint:SetActive(true) self.RedPoint:SetActive(true)
end end

View File

@ -70,7 +70,7 @@ function HarmonyPanel:BindEvent()
-- body -- body
UIManager.OpenPanel(UIName.GongMingResultTips) UIManager.OpenPanel(UIName.GongMingResultTips)
else else
PopupTipPanel.ShowTip(Language[12187]) PopupTipPanel.ShowTip(Language[12188])
end end
--二级共鸣弹窗 --二级共鸣弹窗

View File

@ -196,7 +196,7 @@ function this.IsGongMing(did)
for i = 1, #this.hongmengHeroInfos do for i = 1, #this.hongmengHeroInfos do
-- body -- body
if did == this.hongmengHeroInfos[i].heroId then if did == this.hongmengHeroInfos[i].heroId then
PopupTipPanel.ShowTip(Language[12191]) PopupTipPanel.ShowTip(Language[12192])
return return
end end
end end

View File

@ -79,9 +79,9 @@ function GongMingResultTips:OnOpen(flag)
else else
if HarmonyManager:HongMengTowerUpLimit()>=330 then if HarmonyManager:HongMengTowerUpLimit()>=330 then
-- body -- body
this.textTitle.text = Language[12192]
else
this.textTitle.text = Language[12193] this.textTitle.text = Language[12193]
else
this.textTitle.text = Language[12194]
end end
local data = HarmonyManager:GetAdditions() local data = HarmonyManager:GetAdditions()
@ -102,7 +102,7 @@ function GongMingResultTips:OnOpen(flag)
Util.GetGameObject(this.TextOneAll,"textEqiue"):GetComponent("Text").text = Language[10086] Util.GetGameObject(this.TextOneAll,"textEqiue"):GetComponent("Text").text = Language[10086]
else else
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star) local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star)
Util.GetGameObject(this.TextOneAll,"textEqiue"):GetComponent("Text").text = string.format(Language[12194],GetQuantityStrByquality(equip.Quality),equip.Stars) Util.GetGameObject(this.TextOneAll,"textEqiue"):GetComponent("Text").text = string.format(Language[12195],GetQuantityStrByquality(equip.Quality),equip.Stars)
end end
end end
@ -207,12 +207,12 @@ function GongMingResultTips:OnOpen(flag)
Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = string.format(Language[10086]) Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = string.format(Language[10086])
else else
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star) local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star)
Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = string.format(Language[12194],GetQuantityStrByquality(equip.Quality),equip.Stars) Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = string.format(Language[12195],GetQuantityStrByquality(equip.Quality),equip.Stars)
end end
else else
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value) local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value)
Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = string.format(Language[12194],GetQuantityStrByquality(equip.Quality),equip.Stars) Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = string.format(Language[12195],GetQuantityStrByquality(equip.Quality),equip.Stars)
end end
-- body -- body
elseif data[i].additionType == 3 then elseif data[i].additionType == 3 then

View File

@ -48,17 +48,17 @@ function GongMingResultTips:OnOpen(skinId)
if data[i].additionType == 1 then if data[i].additionType == 1 then
if data[i].heroTid == 0 then if data[i].heroTid == 0 then
local num = HarmonyManager:HongMengTowerUpLimit() local num = HarmonyManager:HongMengTowerUpLimit()
self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12195],data[i].value,num) self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12196],data[i].value,num)
elseif data[i].heroTid == -1 then elseif data[i].heroTid == -1 then
else else
self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12196],data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12197],data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
end end
elseif data[i].additionType == 2 then elseif data[i].additionType == 2 then
if data[i].value == -1 then if data[i].value == -1 then
self.upStarSkillTextPreEquip:GetComponent("Text").text = string.format(Language[12197]) self.upStarSkillTextPreEquip:GetComponent("Text").text = string.format(Language[12198])
else else
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value) local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value)
self.upStarSkillTextPreEquip:GetComponent("Text").text = GetStringByEquipQua(equip.Quality,string.format(Language[12198],GetQuantityStrByquality(equip.Quality),equip.Stars,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)) self.upStarSkillTextPreEquip:GetComponent("Text").text = GetStringByEquipQua(equip.Quality,string.format(Language[12199],GetQuantityStrByquality(equip.Quality),equip.Stars,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName))
end end
elseif data[i].additionType == 3 then elseif data[i].additionType == 3 then
if data[i].heroTid~= 0 and data[i].value > 0 then if data[i].heroTid~= 0 and data[i].value > 0 then
@ -70,7 +70,7 @@ function GongMingResultTips:OnOpen(skinId)
self.upStarSkillTextPreHun:GetComponent("Text").text = "" self.upStarSkillTextPreHun:GetComponent("Text").text = ""
else else
self.upStarSkillTextPreHun:SetActive(true) self.upStarSkillTextPreHun:SetActive(true)
self.upStarSkillTextPreHun:GetComponent("Text").text = string.format(Language[12197]) self.upStarSkillTextPreHun:GetComponent("Text").text = string.format(Language[12198])
end end
end end
elseif data[i].additionType == 4 then elseif data[i].additionType == 4 then
@ -83,7 +83,7 @@ function GongMingResultTips:OnOpen(skinId)
self.upStarSkillTextPreSoul:GetComponent("Text").text ="" self.upStarSkillTextPreSoul:GetComponent("Text").text =""
else else
self.upStarSkillTextPreSoul:SetActive(true) self.upStarSkillTextPreSoul:SetActive(true)
self.upStarSkillTextPreSoul:GetComponent("Text").text = string.format(Language[12197]) self.upStarSkillTextPreSoul:GetComponent("Text").text = string.format(Language[12198])
end end
end end
else else
@ -91,7 +91,7 @@ function GongMingResultTips:OnOpen(skinId)
print(data[i].heroTid ) print(data[i].heroTid )
self.upStarSkillTextPreFa:GetComponent("Text").text =string.format("\t\t\t\t\t\t<color=green>%d</color>(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) self.upStarSkillTextPreFa:GetComponent("Text").text =string.format("\t\t\t\t\t\t<color=green>%d</color>(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
else else
self.upStarSkillTextPreFa:GetComponent("Text").text =string.format(Language[12197]) self.upStarSkillTextPreFa:GetComponent("Text").text =string.format(Language[12198])
end end
end end
end end

View File

@ -85,13 +85,13 @@ function HongMengEnvoyPanel:BindEvent()
if count > 6 then if count > 6 then
UIManager.OpenPanel(UIName.GongMingResultTips) UIManager.OpenPanel(UIName.GongMingResultTips)
else else
PopupTipPanel.ShowTip(Language[12199]) PopupTipPanel.ShowTip(Language[12200])
end end
end) end)
Util.AddClick(self.UpBtn,function() Util.AddClick(self.UpBtn,function()
if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= HarmonyManager:HongMengTowerUpLimit() then if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= HarmonyManager:HongMengTowerUpLimit() then
PopupTipPanel.ShowTip(Language[12200]) PopupTipPanel.ShowTip(Language[12201])
else else
local data = HarmonyManager:GetHongMengUpData() local data = HarmonyManager:GetHongMengUpData()
--print(data.LevelUp[1][2].." "..data.LevelUp[2][2]) --print(data.LevelUp[1][2].." "..data.LevelUp[2][2])
@ -113,7 +113,7 @@ function HongMengEnvoyPanel:BindEvent()
self.UnShowText:SetActive(true) self.UnShowText:SetActive(true)
self.UpBtnRedPoint:SetActive(false) self.UpBtnRedPoint:SetActive(false)
end end
self.GradeText.text = Language[12201]..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) self.GradeText.text = Language[12202]..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum)
for i = 1, #self.EnvoyItemList do for i = 1, #self.EnvoyItemList do
self.EnvoyItemList[i]:UpdateFun() self.EnvoyItemList[i]:UpdateFun()
end end
@ -123,7 +123,7 @@ function HongMengEnvoyPanel:BindEvent()
HarmonyManager.WarPowerChangeNotify() HarmonyManager.WarPowerChangeNotify()
end) end)
else else
PopupTipPanel.ShowTip(Language[12202]) PopupTipPanel.ShowTip(Language[12203])
end end
else else
PopupTipPanel.ShowTip(Language[11771]) PopupTipPanel.ShowTip(Language[11771])
@ -141,7 +141,7 @@ function HongMengEnvoyPanel:RunTimerFun()
value.Empty:SetActive(true) value.Empty:SetActive(true)
end end
local time_content = TimeToFelaxible(HarmonyManager.hongmengGuards[key].time - GetTimeStamp()) local time_content = TimeToFelaxible(HarmonyManager.hongmengGuards[key].time - GetTimeStamp())
value.timer_text.text = string.format(Language[12203], time_content) value.timer_text.text = string.format(Language[12204], time_content)
else else
if not value.AddImage.activeSelf then if not value.AddImage.activeSelf then
value.AddImage:SetActive(true) value.AddImage:SetActive(true)
@ -275,7 +275,7 @@ function HongMengEnvoyPanel:OnOpen(equipSId)
local sum = HarmonyManager:HongMengTowerUpLimit() local sum = HarmonyManager:HongMengTowerUpLimit()
self.GradeText.text = Language[12201]..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) self.GradeText.text = Language[12202]..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum)
self:IsUpBtnGray() self:IsUpBtnGray()
self:InitTextMum() self:InitTextMum()
self:CheckEvoyEquip() self:CheckEvoyEquip()

View File

@ -129,7 +129,7 @@ function HongMengUnLoadPanel:SetTextTwo(go,data)
Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[10086]) Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[10086])
else else
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star) local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star)
Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[12194],GetQuantityStrByquality(equip.Quality),equip.Stars) Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[12195],GetQuantityStrByquality(equip.Quality),equip.Stars)
end end
if self.HunDegree > 0 then if self.HunDegree > 0 then
@ -183,18 +183,18 @@ function HongMengUnLoadPanel:SetText(go,_data)
Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[10086]) Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[10086])
else else
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star) local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star)
Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[12194],GetQuantityStrByquality(equip.Quality),equip.Stars) Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[12195],GetQuantityStrByquality(equip.Quality),equip.Stars)
end end
else else
if _data.harmonyGongMing then if _data.harmonyGongMing then
-- body -- body
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,dataAdditon[i].value) local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,dataAdditon[i].value)
Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[12194],GetQuantityStrByquality(equip.Quality),equip.Stars) Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[12195],GetQuantityStrByquality(equip.Quality),equip.Stars)
else else
local _Star = EquipManager.GetMinEquipStar(_data.equipIdList) local _Star = EquipManager.GetMinEquipStar(_data.equipIdList)
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star) local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,_Star)
Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[12194],GetQuantityStrByquality(equip.Quality),equip.Stars) Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format(Language[12195],GetQuantityStrByquality(equip.Quality),equip.Stars)
end end
end end

View File

@ -126,7 +126,7 @@ function this.RunTimerFun()
local time_content = TimeToFelaxible(HarmonyManager.hongmengHeroInfos[value.index].time - GetTimeStamp()) local time_content = TimeToFelaxible(HarmonyManager.hongmengHeroInfos[value.index].time - GetTimeStamp())
--print(" ~~~~~ ",value.TimerText," xxxxx",time_content) --print(" ~~~~~ ",value.TimerText," xxxxx",time_content)
value.TimerText.text = string.format(Language[12203],time_content) value.TimerText.text = string.format(Language[12204],time_content)
else else
HarmonyManager.hongmengHeroInfos[value.index].time = 0 HarmonyManager.hongmengHeroInfos[value.index].time = 0
@ -250,12 +250,12 @@ function this.SingleBoxDataShow(go,boxData,index)
TempItem = index TempItem = index
HarmonyManager.GongMingBox = boxData.Id HarmonyManager.GongMingBox = boxData.Id
print(Language[12204],HarmonyManager.GongMingBox) print(Language[12205],HarmonyManager.GongMingBox)
else else
local content = "" local content = ""
--print((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / 432) --print((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / 432)
local money = math.ceil((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / 432) local money = math.ceil((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / 432)
content =string.format(Language[12188],money) content =string.format(Language[12189],money)
MsgPanel.ShowTwo(content,function () MsgPanel.ShowTwo(content,function ()
MsgPanel.Hide() MsgPanel.Hide()
@ -273,7 +273,7 @@ function this.SingleBoxDataShow(go,boxData,index)
-- body -- body
if HarmonyManager.hongmengHeroInfos[i].gridId ==boxData.Id then if HarmonyManager.hongmengHeroInfos[i].gridId ==boxData.Id then
HarmonyManager.hongmengHeroInfos[i].time = 0 HarmonyManager.hongmengHeroInfos[i].time = 0
print(Language[12205]) print(Language[12206])
break break
end end
end end
@ -289,7 +289,7 @@ function this.SingleBoxDataShow(go,boxData,index)
else else
if mask.activeSelf then if mask.activeSelf then
-- body -- body
PopupTipPanel.ShowTip(Language[12206]) PopupTipPanel.ShowTip(Language[12207])
else else
if lock.activeSelf then if lock.activeSelf then
-- body -- body
@ -317,15 +317,15 @@ function this:AddBoxFun(boxData)
local keys = GameDataBase.SheetBase.GetKeys(this.tab) --获取数据长度 local keys = GameDataBase.SheetBase.GetKeys(this.tab) --获取数据长度
if #HarmonyManager.hongmengHeroInfos >= #keys then if #HarmonyManager.hongmengHeroInfos >= #keys then
-- body -- body
PopupTipPanel.ShowTip(Language[12207]) PopupTipPanel.ShowTip(Language[12208])
return return
end end
if Gold >= boxData.PropPrice[2] then if Gold >= boxData.PropPrice[2] then
content =string.format(Language[12208],boxData.PropPrice[2]) content =string.format(Language[12209],boxData.PropPrice[2])
elseif Gold < boxData.PropPrice[2] then elseif Gold < boxData.PropPrice[2] then
-- body and DemonCrystal >= boxData.MoneyPrice[2] -- body and DemonCrystal >= boxData.MoneyPrice[2]
content=string.format(Language[12209],boxData.PropPrice[2],boxData.MoneyPrice[2]) content=string.format(Language[12210],boxData.PropPrice[2],boxData.MoneyPrice[2])
end end
MsgPanel.ShowTwo(content,function () MsgPanel.ShowTwo(content,function ()
@ -412,7 +412,7 @@ function this:OpenBoxFun()
-- body -- body
this:AddBoxFun(tempData) this:AddBoxFun(tempData)
else else
PopupTipPanel.ShowTip(Language[12207]) PopupTipPanel.ShowTip(Language[12208])
return return
end end

View File

@ -914,7 +914,7 @@ function this:BindEvent()
Util.AddClick(this.btnHongMeng,function() Util.AddClick(this.btnHongMeng,function()
NetManager.HongMengInfoResponse(function () NetManager.HongMengInfoResponse(function ()
-- body -- body
print(Language[12210]..HarmonyManager:HongMengTowerUpLimit()) print(Language[12211]..HarmonyManager:HongMengTowerUpLimit())
if HarmonyManager:HongMengTowerUpLimit() > 0 then if HarmonyManager:HongMengTowerUpLimit() > 0 then
-- body -- body
UIManager.OpenPanel(UIName.HongMengEnvoyPanel) UIManager.OpenPanel(UIName.HongMengEnvoyPanel)

View File

@ -193,7 +193,7 @@ end
function OnlineRewardPanel:RemainTimeDown() function OnlineRewardPanel:RemainTimeDown()
self:RemainTimeDownUpdata() self:RemainTimeDownUpdata()
if ActivityGiftManager.currentTimeIndex == #ActivityGiftManager.onlineData then if ActivityGiftManager.currentTimeIndex == #ActivityGiftManager.onlineData then
this.time2.text = Language[12229] this.time2.text = Language[12212]
end end
if self.timer then if self.timer then
self.timer:Stop() self.timer:Stop()
@ -206,7 +206,7 @@ function OnlineRewardPanel:RemainTimeDown()
if ActivityGiftManager.currentTimeIndex == #ActivityGiftManager.onlineData then if ActivityGiftManager.currentTimeIndex == #ActivityGiftManager.onlineData then
self.timer:Stop() self.timer:Stop()
self.timer = nil self.timer = nil
this.time2.text = Language[12229] this.time2.text = Language[12212]
end end
end, 1, -1, true) end, 1, -1, true)
self.timer:Start() self.timer:Start()

View File

@ -66,9 +66,9 @@ function this:OnShow(_parent,...)
fun = args[3] fun = args[3]
--判断妖晶是否充足 --判断妖晶是否充足
if coin>BagManager.GetItemCountById(id) then if coin>BagManager.GetItemCountById(id) then
this.infoTxt.text=string.format(Language[12211],coin,GetLanguageStrById(itemConfig[id].Name),GetLanguageStrById(lingshouConfig.Name),"%") this.infoTxt.text=string.format(Language[12213],coin,GetLanguageStrById(itemConfig[id].Name),GetLanguageStrById(lingshouConfig.Name),"%")
else else
this.infoTxt.text=string.format(Language[12212],coin,GetLanguageStrById(itemConfig[id].Name),GetLanguageStrById(lingshouConfig.Name),"%") this.infoTxt.text=string.format(Language[12214],coin,GetLanguageStrById(itemConfig[id].Name),GetLanguageStrById(lingshouConfig.Name),"%")
end end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[2]) FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[2])
end end

View File

@ -27,7 +27,7 @@ end
--请求排行榜下面数据 --请求排行榜下面数据
function this.RequestNextWarPowerPageData(fun) function this.RequestNextWarPowerPageData(fun)
if cur_isMax then LogGreen(Language[12213]) return end if cur_isMax then LogGreen(Language[12215]) return end
LogGreen("cur_rankIndex "..cur_rankIndex) LogGreen("cur_rankIndex "..cur_rankIndex)
NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据 NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据
this.ReceiveNextRankingData(msg,fun) this.ReceiveNextRankingData(msg,fun)

View File

@ -29,8 +29,8 @@ function EquipSellSelectPopup:InitComponent()
this.allSelectBtnImage = Util.GetGameObject(self.transform, "allSelectBtn/allSelectBtnImage") this.allSelectBtnImage = Util.GetGameObject(self.transform, "allSelectBtn/allSelectBtnImage")
this.cancelBtn = Util.GetGameObject(self.transform, "cancelBtn") this.cancelBtn = Util.GetGameObject(self.transform, "cancelBtn")
this.sellBtn = Util.GetGameObject(self.transform, "sellBtn") this.sellBtn = Util.GetGameObject(self.transform, "sellBtn")
Util.GetGameObject(self.gameObject, "titleBg/Image (3)/Text (1)"):GetComponent("Text").text = Language[12214] Util.GetGameObject(self.gameObject, "titleBg/Image (3)/Text (1)"):GetComponent("Text").text = Language[12216]
Util.GetGameObject(self.gameObject, "titleBg/Image (9)/Text (1)"):GetComponent("Text").text = Language[12215] Util.GetGameObject(self.gameObject, "titleBg/Image (9)/Text (1)"):GetComponent("Text").text = Language[12217]
quaGrid = {} quaGrid = {}
for i = 1, 5 do for i = 1, 5 do
quaGrid[i] = Util.GetGameObject(self.transform, "quaGrid/quaSelectBtn (" .. i .. ")") quaGrid[i] = Util.GetGameObject(self.transform, "quaGrid/quaSelectBtn (" .. i .. ")")

View File

@ -138,7 +138,7 @@ function this.SingleHeroDataShow(go,_heroData)
end end
end end
Util.AddOnceClick(GongMingMask, function() Util.AddOnceClick(GongMingMask, function()
PopupTipPanel.ShowTip(Language[12183]) PopupTipPanel.ShowTip(Language[12184])
end) end)
Util.AddOnceClick(cardclickBtn, function() Util.AddOnceClick(cardclickBtn, function()
if selectHeroData[heroData.dynamicId] then if selectHeroData[heroData.dynamicId] then

View File

@ -167,7 +167,7 @@ function this.SingleHeroDataShow(go,_heroData)
end end
end end
Util.AddOnceClick(GongMingMask, function() Util.AddOnceClick(GongMingMask, function()
PopupTipPanel.ShowTip(Language[12183]) PopupTipPanel.ShowTip(Language[12184])
end) end)
Util.AddOnceClick(cardclickBtn, function() Util.AddOnceClick(cardclickBtn, function()

View File

@ -152,7 +152,7 @@ function this.SingleHeroDataShow(go,_heroData)
end end
end end
Util.AddOnceClick(GongMingMask, function() Util.AddOnceClick(GongMingMask, function()
PopupTipPanel.ShowTip(Language[12183]) PopupTipPanel.ShowTip(Language[12184])
end) end)
Util.AddOnceClick(cardclickBtn, function() Util.AddOnceClick(cardclickBtn, function()

View File

@ -56,7 +56,7 @@ function EquipTreasureStrongPopup:BindEvent()
Util.AddClick(this.btn_strongPage, function() Util.AddClick(this.btn_strongPage, function()
if HarmonyManager.IsInfo(curEquipData.upHeroDid) then if HarmonyManager.IsInfo(curEquipData.upHeroDid) then
-- body -- body
PopupTipPanel.ShowTip(Language[12183]) PopupTipPanel.ShowTip(Language[12184])
else else
this.SetWindShow(1) this.SetWindShow(1)
end end

View File

@ -52,7 +52,7 @@ function RoleChooseListPanel:BindEvent()
Util.AddClick(this.btnYes, function() Util.AddClick(this.btnYes, function()
if TempData ==nil then if TempData ==nil then
-- body -- body
PopupTipPanel.ShowTip(Language[12216]) PopupTipPanel.ShowTip(Language[12218])
return return
end end
@ -116,7 +116,7 @@ end
function RoleChooseListPanel:OnOpen(flag) function RoleChooseListPanel:OnOpen(flag)
this.desText.text = "" this.desText.text = ""
this.numText.text = "" this.numText.text = ""
this.title_text.text =Language[12217] this.title_text.text =Language[12219]
self.flag = flag self.flag = flag
TempData = nil TempData = nil
--SelectHero = nil --SelectHero = nil

View File

@ -142,14 +142,14 @@ function RoleEquipChangePopup:OnShow()
this.equipPanel[1].bg:SetActive(true) this.equipPanel[1].bg:SetActive(true)
this.equipPanel[1].curEquipText:SetActive(false) this.equipPanel[1].curEquipText:SetActive(false)
this.equipPanel[1].curEquipBtnDown:SetActive(true) this.equipPanel[1].curEquipBtnDown:SetActive(true)
this.equipPanel[1].curEquipBtnDownText.text = Language[12218] this.equipPanel[1].curEquipBtnDownText.text = Language[12220]
this.ShowCurEquipData(1) this.ShowCurEquipData(1)
elseif type==2 then elseif type==2 then
this.equipPanel[2].bg:SetActive(false) this.equipPanel[2].bg:SetActive(false)
this.equipPanel[1].bg:SetActive(true) this.equipPanel[1].bg:SetActive(true)
this.equipPanel[1].curEquipText:SetActive(false) this.equipPanel[1].curEquipText:SetActive(false)
this.equipPanel[1].curEquipBtnDown:SetActive(true) this.equipPanel[1].curEquipBtnDown:SetActive(true)
this.equipPanel[1].curEquipBtnDownText.text = Language[12219] this.equipPanel[1].curEquipBtnDownText.text = Language[12221]
this.ShowCurEquipData(1) this.ShowCurEquipData(1)
elseif type==3 then elseif type==3 then
this.equipPanel[2].bg:SetActive(true) this.equipPanel[2].bg:SetActive(true)

View File

@ -186,7 +186,7 @@ function RoleEquipPanel:BindEvent()
--print(tostring(HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId)),tostring(curHeroData.harmonyGongMing)) --print(tostring(HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId)),tostring(curHeroData.harmonyGongMing))
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
-- body -- body
PopupTipPanel.ShowTip(Language[12220]) PopupTipPanel.ShowTip(Language[12222])
else else
this:AllEquipDownBtnOnClick() this:AllEquipDownBtnOnClick()
end end
@ -456,7 +456,7 @@ function this:AllEquipUpBtnOnClick()
) )
end end
if curHeroData.harmonyGongMing then if curHeroData.harmonyGongMing then
PopupTipPanel.ShowTip(Language[12221]) PopupTipPanel.ShowTip(Language[12223])
end end
--穿戴宝物 --穿戴宝物
if isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0 then if isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0 then
@ -721,7 +721,7 @@ function this:SetSelectBtn()
end end
function this:OpenTips(nextEquipData,pos) function this:OpenTips(nextEquipData,pos)
local content = Language[12222] local content = Language[12224]
MsgPanel.ShowTwo(content,function () MsgPanel.ShowTwo(content,function ()
end,function () end,function ()
@ -972,10 +972,10 @@ function this.SingleItemDataShow(_go, _itemData)
Util.AddOnceClick( Util.AddOnceClick(
Util.GetGameObject(_go.transform, "icon"), Util.GetGameObject(_go.transform, "icon"),
function() function()
print(Language[12223]) print(Language[12225])
if curHeroEquipDatas[equipConfig[_itemData.id].Position] then if curHeroEquipDatas[equipConfig[_itemData.id].Position] then
local nextEquipData = EquipManager.GetSingleEquipData(_itemData.id) local nextEquipData = EquipManager.GetSingleEquipData(_itemData.id)
print(Language[12224]..#curHeroData.equipIdList) print(Language[12226]..#curHeroData.equipIdList)
if curHeroData.harmonyGongMing then if curHeroData.harmonyGongMing then
-- body -- body
this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position) this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position)
@ -992,7 +992,7 @@ function this.SingleItemDataShow(_go, _itemData)
) )
end end
else else
print(Language[12225]) print(Language[12227])
UIManager.OpenPanel( UIManager.OpenPanel(
UIName.RoleEquipChangePopup, UIName.RoleEquipChangePopup,
this, this,

View File

@ -133,7 +133,7 @@ function RoleEquipTreasureChangePopup:BindEvent()
Util.AddClick(this.curEquipBtnStrong, function() Util.AddClick(this.curEquipBtnStrong, function()
if isGongMing then if isGongMing then
-- body -- body
PopupTipPanel.ShowTip(Language[12183]) PopupTipPanel.ShowTip(Language[12184])
else else
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,curEquipData,1) UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,curEquipData,1)
end end

View File

@ -530,7 +530,7 @@ function RoleInfoLayout:DeleteLvUpMaterials(isSingleLvUp,msg)
-- Log("后端更新猎妖师技术前端刷新界面curHeroData.lv "..curHeroData.lv) -- Log("后端更新猎妖师技术前端刷新界面curHeroData.lv "..curHeroData.lv)
end end
-- curHeroData.lv=curHeroData.lv -- curHeroData.lv=curHeroData.lv
PopupTipPanel.ShowTip(Language[12226]) PopupTipPanel.ShowTip(Language[12228])
end end
-- end -- end
-- end -- end

View File

@ -79,7 +79,7 @@ function RoleTalismanPanelV2:BindEvent()
--进阶按钮 --进阶按钮
Util.AddClick(this.advanceBtn, function() Util.AddClick(this.advanceBtn, function()
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
PopupTipPanel.ShowTip(Language[12183]) PopupTipPanel.ShowTip(Language[12184])
return return
end end
if curHeroData.talismanList<maxLv then if curHeroData.talismanList<maxLv then

View File

@ -179,7 +179,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
end end
end end
Util.AddOnceClick(GongMingMask, function() Util.AddOnceClick(GongMingMask, function()
PopupTipPanel.ShowTip(Language[12183]) PopupTipPanel.ShowTip(Language[12184])
end) end)
Util.AddOnceClick(cardBtn, function() Util.AddOnceClick(cardBtn, function()
if curSelectHeroList[heroData.dynamicId] then if curSelectHeroList[heroData.dynamicId] then

View File

@ -312,9 +312,3 @@ return this

View File

@ -261,7 +261,4 @@ end
function this:OnDestroy() function this:OnDestroy()
end end
return XiaoYaoYouPanel return XiaoYaoYouPanel

View File

@ -125,7 +125,7 @@ function HarmonyView:OnOpen()
end end
end end
print(Language[12227]..HarmonyManager.equipCount) print(Language[12229]..HarmonyManager.equipCount)
-- for i = 0, #self.GongMingTable do -- for i = 0, #self.GongMingTable do
-- if i == 5 then -- if i == 5 then
-- self:SetItem(self.HongMengData[i+1],self.GongMingTable[i],1) -- self:SetItem(self.HongMengData[i+1],self.GongMingTable[i],1)

File diff suppressed because it is too large Load Diff