Merge branch 'china/local' into china/test

dev_chengFeng hotfix/mht_china/xq/cdn_xq_test/0.1.38
JieLing 2021-06-19 17:29:38 +08:00
commit 63e5f8a705
4 changed files with 9 additions and 4 deletions

View File

@ -1042,6 +1042,8 @@ JumpType = {
SheJiDaDianShangDian = 20060, --社稷大典商店 SheJiDaDianShangDian = 20060, --社稷大典商店
XinJiangLaiXiShangDian = 20200, --社稷大典商店 XinJiangLaiXiShangDian = 20200, --社稷大典商店
XingChenShangDian = 20059, --星辰商店 XingChenShangDian = 20059, --星辰商店
ChaoFanRuSheng = 20061,
} }
NPCPosType={ NPCPosType={

View File

@ -242,13 +242,13 @@ function BuffManager:ClearBuff(target, func)
while idx <= list.size do while idx <= list.size do
local buff = list.buffer[idx] local buff = list.buffer[idx]
if buff.target == target and (not func or (func and buff.clear and func(buff))) then if buff.target == target and (not func or (func and buff.clear and func(buff))) then
if func and func(buff) then -- if func and func(buff) then
if buff.type== BuffName.Shield then if buff.type== BuffName.Shield then
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Shield) buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Shield)
elseif buff.type== BuffName.DOT or buff.type==BuffName.Control or buff.type==BuffName.Immune then elseif buff.type== BuffName.DOT or buff.type==BuffName.Control then
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear)
end end
end -- end
buff:OnEnd() buff:OnEnd()
buff.target.Event:DispatchEvent(BattleEventName.BuffEnd, buff) buff.target.Event:DispatchEvent(BattleEventName.BuffEnd, buff)
putBuff(buff) putBuff(buff)

View File

@ -5708,7 +5708,7 @@ local passivityList = {
BattleUtil.RandomAction(pro, function() BattleUtil.RandomAction(pro, function()
BattleLogic.BuffMgr:ClearBuff(defRole, function(buff) BattleLogic.BuffMgr:ClearBuff(defRole, function(buff)
if buff.type == BuffName.Immune and (buff.immuneType == 4 or buff.immuneType == 2) then if buff.type == BuffName.Immune and (buff.immuneType == 4 or buff.immuneType == 2) then
-- buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear)
return true return true
end end
return false return false

View File

@ -666,6 +666,9 @@ local jumpDic = {
[JumpType.EndlessXingDongliBuy] = function(data) [JumpType.EndlessXingDongliBuy] = function(data)
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = 1 }) UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = 1 })
end, end,
[JumpType.ChaoFanRuSheng] = function(data)
this.JumpActivity(ActivityTypeDef.ChaoFanRuSheng,data[1])
end,
} }
function this.JumpActivity(data,skipfactor) function this.JumpActivity(data,skipfactor)