无尽修改提交

dev_chengFeng
jiaoyangna 2021-05-28 11:29:27 +08:00
parent 5c3c32be15
commit 81761b26af
2 changed files with 33 additions and 18 deletions

View File

@ -730,7 +730,7 @@ function this.GetShiQiValue()
local moraleLv1 = 0 local moraleLv1 = 0
local itemCount = BagManager.GetItemCountById(this.shiQiValue) local itemCount = BagManager.GetItemCountById(this.shiQiValue)
for k,v in ConfigPairs(endlessMorale) do for k,v in ConfigPairs(endlessMorale) do
if not v.Exp or #v.Exp < 1 then if not v.Exp or #v.Exp < 2 then
moraleLv1 = v.Level moraleLv1 = v.Level
id = v.Id id = v.Id
break break
@ -773,7 +773,8 @@ function this.GetTreasureLevel()
local moraleLv1 = 0 local moraleLv1 = 0
local itemCount = BagManager.GetItemCountById(this.scoreValueId) local itemCount = BagManager.GetItemCountById(this.scoreValueId)
for k,v in ConfigPairs(endlessTreasure) do for k,v in ConfigPairs(endlessTreasure) do
if not v.Integral or #v.Integral < 1 then LogGreen("itemCount:"..itemCount.." v.Integral:"..tostring(v.Integral))
if not v.Integral or #v.Integral < 1 or #v.Integral[1] < 2 then
moraleLv1 = v.Level moraleLv1 = v.Level
id = v.Id id = v.Id
break break

View File

@ -126,35 +126,49 @@ function EndLessMapView:BindEvent()
return return
end end
if not this:CanClick() then return end if not this:CanClick() then return end
local u = function(pro) local s = function(pro)
local str = "" local str = ""
for i = 1,#pro do local index = 1
if i ~= 1 then for k,v in pairs(pro) do
local config = ConfigManager.GetConfigData(ConfigName.PropertyConfig,k)
if not config then
else
if index ~= 1 then
str = str .. "," str = str .. ","
end end
local config = ConfigManager.GetConfigData(ConfigName.PropertyConfig,pro[i][1])
if not config then
return ""
else
str = str .. config.Info .. "+" str = str .. config.Info .. "+"
str = str .. GetEquipPropertyFormatStr(config.Style,pro[i][2]) str = str .. GetEquipPropertyFormatStr(config.Style,v)
index = index + 1
end end
end end
return str return str
end end
local u = function(id,isAppend,pros)
for i = (isAppend and id or 1), id do
local pro = endlessMorale[i].Props
for k,v in ipairs(pro) do
if not pros[v[1]] then
pros[v[1]] = 0
end
pros[v[1]] = pros[v[1]] + v[2]
end
end
return pros
end
local s = function(index) local s = function(index)
local id, lv = EndLessMapManager.GetShiQiValue() local id, lv = EndLessMapManager.GetShiQiValue()
local pro1,nextPro = nil --local pro1,nextPro = nil
local pro = {} local pro = {}
if index == 1 then --属性加成 if index == 1 then --属性加成
pro1 = (endlessMorale[id].Props and #endlessMorale[id].Props > 0) and endlessMorale[id].Props or {} local pros = {}
local str = u(pro1) local pros = u(id,false,pros)
local str = s(pros)
if str and str ~= "" then if str and str ~= "" then
table.insert(pro,string.format("本级加成:全体神将<color=#55c688>%s</color>",str)) table.insert(pro,string.format("本级加成:全体神将<color=#55c688>%s</color>",str))
end end
nextPro = (endlessMorale[id + 1] and endlessMorale[id + 1].Props and #endlessMorale[id + 1].Props > 0) and endlessMorale[id + 1].Props or {} id = id + 1
LogGreen("#nextPro:"..#nextPro) local pros = u(id,true,pros)
local str = u(nextPro) local str = s(pros)
if str and str ~= "" then if str and str ~= "" then
table.insert(pro,string.format("下级加成:全体神将<color=#55c688>%s</color>",str)) table.insert(pro,string.format("下级加成:全体神将<color=#55c688>%s</color>",str))
end end