From 8e1d427e2af6cf5fae31de9e0259503139491ee5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 28 May 2021 11:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Map/EndLessMapManager.lua | 1 - .../~Lua/Modules/Map/View/EndLessMapView.lua | 15 +++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index ee98f10d7c..b5362eb407 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -773,7 +773,6 @@ function this.GetTreasureLevel() local moraleLv1 = 0 local itemCount = BagManager.GetItemCountById(this.scoreValueId) for k,v in ConfigPairs(endlessTreasure) do - 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 id = v.Id diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index cc37536adb..e495529806 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -145,7 +145,8 @@ function EndLessMapView:BindEvent() end local u = function(id,isAppend,pros) for i = (isAppend and id or 1), id do - local pro = endlessMorale[i].Props + LogGreen("i:"..i) + local pro = endlessMorale[i].Props or {} for k,v in ipairs(pro) do if not pros[v[1]] then pros[v[1]] = 0 @@ -167,11 +168,13 @@ function EndLessMapView:BindEvent() table.insert(pro,string.format("本级加成:全体神将%s",str)) end id = id + 1 - local pros = u(id,true,pros) - local str = s(pros) - if str and str ~= "" then - table.insert(pro,string.format("下级加成:全体神将%s",str)) - end + if endlessMorale[id] then + local pros = u(id,true,pros) + local str = s(pros) + if str and str ~= "" then + table.insert(pro,string.format("下级加成:全体神将%s",str)) + end + end else --特殊加成 for k,v in ConfigPairs(endlessMorale) do if v.Skill and v.Skill > 0 then