无尽副本提交

dev_chengFeng
jiaoyangna 2021-05-26 20:27:39 +08:00
parent 8f6fce191b
commit 107d20677a
5 changed files with 22 additions and 9 deletions

View File

@ -95,7 +95,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
heroData.star = _msgHeroData.star
heroData.lv = _msgHeroData.level
heroData.breakId = _msgHeroData.breakId
-- --LogGreen("heroData.id:"..heroData.id.." heroData.breakId:"..heroData.breakId)
LogGreen("heroData.id:"..heroData.id.." _msgHeroData.starBreakId:".._msgHeroData.starBreakId)
heroData.upStarId = _msgHeroData.starBreakId
heroData.skinId = _msgHeroData.skinId
heroData.createTime = _msgHeroData.createTimelocal

View File

@ -277,8 +277,8 @@ function this.InitSingleEndlessHero(_msgHeroData)
heroData.star = _msgHeroData.star
heroData.lv = _msgHeroData.level
heroData.breakId = _msgHeroData.breakId
--LogGreen("heroData.id:"..heroData.id.." heroData.breakId:"..heroData.breakId)
heroData.upStarId = _msgHeroData.starBreakId
LogGreen("_msgHeroData.heroId:".._msgHeroData.heroId.." heroData.dynamicId:"..heroData.dynamicId.." _msgHeroData.starBreakId:".._msgHeroData.starBreakId)
heroData.createTime = _msgHeroData.createTimelocal
heroData.lockState = _msgHeroData.lockState
heroData.createtype = _msgHeroData.createtype
@ -354,6 +354,7 @@ function this.InitSingleEndlessHero(_msgHeroData)
heroData.sortId = #this.heroDataLists + 1
heroData.harmonyGongMing = _msgHeroData.createtype
this.heroDataLists[heroData.dynamicId] = heroData
heroData.warPower = HeroManager.CalculateHeroAllProValList(1, heroData.dynamicId, false)[HeroProType.WarPower]
end

View File

@ -133,8 +133,12 @@ function EndLessMapView:BindEvent()
str = str .. ","
end
local config = ConfigManager.GetConfigData(ConfigName.PropertyConfig,pro[i][1])
str = str .. config.Info .. "+"
str = str .. GetEquipPropertyFormatStr(config.Style,pro[i][2])
if not config then
return ""
else
str = str .. config.Info .. "+"
str = str .. GetEquipPropertyFormatStr(config.Style,pro[i][2])
end
end
return str
end
@ -146,16 +150,24 @@ function EndLessMapView:BindEvent()
pro1 = (endlessMorale[id].Props and #endlessMorale[id].Props > 0) and endlessMorale[id].Props or {}
local str = u(pro1)
if str and str ~= "" then
table.insert(pro,string.format("本级加成:全体神将%s",str))
table.insert(pro,string.format("本级加成:全体神将<color=#55c688>%s</color>",str))
end
nextPro = (endlessMorale[id + 1] and endlessMorale[id + 1].Props and #endlessMorale[id + 1].Props > 0) and endlessMorale[id + 1].Props or {}
LogGreen("#nextPro:"..#nextPro)
local str = u(nextPro)
if str and str ~= "" then
table.insert(pro,string.format("下级加成:全体神将%s",str))
table.insert(pro,string.format("下级加成:全体神将<color=#55c688>%s</color>",str))
end
else --特殊加成
for k,v in ConfigPairs(endlessMorale) do
if v.Skill and v.Skill > 0 then
table.insert(pro,string.format("%s级%s",v.Level,PassiveSkillConfig[v.Skill].Desc))
local volor = ""
if id >= v.Id then
volor = "#55c688"
else
volor = "#FFFFFF"
end
table.insert(pro,string.format("<color=%s>%s级%s</color>",volor,v.Level,PassiveSkillConfig[v.Skill].Desc))
end
end
end

View File

@ -91,7 +91,7 @@ function QuickCommonPurchasePart:SpecialDeal()
self.timer = nil
end
local itemId = self.context.type
if AutoRecoverManager.IsAutoRecover(itemId) then
if AutoRecoverManager.IsAutoRecover(itemId) and itemId ~= 1 then
local function update()
local remainTime = AutoRecoverManager.GetRecoverTime(itemId)
if remainTime < 0 then

View File

@ -33,7 +33,7 @@ function this.InitTypeTaskList(_userMissionList)
userMissionList.takeTimes = _userMissionList[i].takeTimes
userMissionList.heroId = _userMissionList[i].heroId
userMissionList.lock = _userMissionList[i].lock
LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock.. " progress:".._userMissionList[i].progress)
--LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock.. " progress:".._userMissionList[i].progress)
if not TypeTaskData[_userMissionList[i].type] then
TypeTaskData[_userMissionList[i].type] = {}
end