From 1e26aad15654b66886eaf595a6621f7c5b9e6b24 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 26 Jan 2022 16:01:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E9=80=8D=E9=81=A5=E6=B8=B8?= =?UTF-8?q?=E3=80=91=E6=95=B0=E6=8D=AE=E6=89=93=E5=8D=B0=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/XiaoYao/XiaoYaoManager.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index feb4e7b60b..97156a6d8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -70,6 +70,13 @@ function this.OpenXiaoYaoMap(mapId,func) table.sort(curMapData.cell,function(a,b) return a.cellIndex < b.cellIndex end) + + -- local str = "{" + -- for k, v in ipairs(curMapData.cell) do + -- str = str ..string.format("{cellId=%s,pointId=%s,cellIndex=%s,rewardId=%s},", v.cellId, v.pointId, v.cellIndex, v.rewardId) + -- end + -- str = str .."}" + -- LogError(str) end this.fightBossIndex = 0 this.GetHeroIndex = 0 From 62a9cda5d3fcaf781ad2e0b5fc421569a53e9857 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 Jan 2022 13:21:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A7=91=E8=8E=B7=E9=B8=9F=E7=A5=9E=E9=AD=82?= =?UTF-8?q?=E4=BA=94=E5=AF=B9=E6=89=80=E6=9C=89=E4=BA=BA=E7=94=9F=E6=95=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index e7ee192bba..501222ef43 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -9498,6 +9498,10 @@ local passivityList = { if not skill then return end + if target ~= role then + return + end + if time==triggerTime then return end