From 3d19df7cb2f8167ffd49f3cad6343678c6acd6ac Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 13 Dec 2021 18:43:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=85=B3=E5=8D=A1=E6=96=B0?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=91=E5=8D=B8=E4=B8=8B=E5=86=8D=E7=A9=BF?= =?UTF-8?q?=E6=88=B4=E8=A3=85=E5=A4=87=E5=90=8E=E5=85=B3=E5=8D=A1=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index b5d985e666..fecc1c79d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -86,7 +86,7 @@ function this.GetLimitStarEquipNum(star) for _, hero in pairs(allHeroDatas) do if hero.equipIdList and #hero.equipIdList > 0 then for i = 1, #hero.equipIdList do - local id = hero.equipIdList[i] + local id = tonumber(hero.equipIdList[i]) if equipConfig[id].Star >= star then allNum = allNum + 1 end From ab085087b059b5780c6e8312da689eb3339b747b Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 13 Dec 2021 18:56:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=93=AA=E5=90=92=E7=9A=84=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E5=90=8E=E6=91=87=E5=BB=B6=E6=97=B6=EF=BC=8C=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Role/Skill.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua index 2d8abc4422..06d22c9139 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua @@ -89,9 +89,9 @@ function Skill:Cast(func) local duration = self.hitTime + self.continueTime -- 结算时间向后延长0.2秒,避免在效果结算完成前就结束了技能释放 local time=0.8 - if self.id==1282 then - time=2.5 - end + -- if self.id==1282 then + -- time=1 + -- end BattleLogic.WaitForTrigger(duration + time, function() self.owner.Event:DispatchEvent(BattleEventName.SkillCastEnd, self) BattleLogic.Event:DispatchEvent(BattleEventName.SkillCastEnd, self)