Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-12-14 09:35:51 +08:00
commit 6a6f67d0ce
2 changed files with 4 additions and 4 deletions

View File

@ -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)

View File

@ -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