From aae0749f1a779799829f91675f8e45d9991eaacb Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 20 Apr 2021 13:48:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=8B=B1=E9=9B=84=E5=8D=87=E6=98=9F?= =?UTF-8?q?=E7=A5=AD=E5=93=81=E3=80=91=E6=8F=90=E4=BA=A4=20=E2=80=94?= =?UTF-8?q?=E2=80=944?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Net/NetManager.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 252c4d1a4b..bb60fe9a66 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -745,13 +745,17 @@ function this.HeroUpStarEvent(heroId, consumeMaterials, func) c.position = i for j = 1, #consumeMaterials[i] do local e = c.heroIds:add() - e.type = consumeMaterials[i][j].type - if consumeMaterials[i][j].type == RoleUpStarMatType.hero then - e.itemId = consumeMaterials[i][j].dynamicId - elseif consumeMaterials[i][j].type == RoleUpStarMatType.item then - e.itemId = tostring(consumeMaterials[i][j].id) + if consumeMaterials[i][j].type then--英雄正常升星 做了英雄狗粮逻辑 + e.type = consumeMaterials[i][j].type + if consumeMaterials[i][j].type == RoleUpStarMatType.hero then + e.itemId = consumeMaterials[i][j].dynamicId + elseif consumeMaterials[i][j].type == RoleUpStarMatType.item then + e.itemId = tostring(consumeMaterials[i][j].id) + end + else--英雄合成 没有做英雄狗粮逻辑 + e.type = RoleUpStarMatType.hero + e.itemId = consumeMaterials[i][j] end - -- c.heroIds:append(consumeMaterials[i][j]) end end --for j = 1, #data.ConsumeMaterial do