Commit 998cd46d authored by wind2009's avatar wind2009

Fix 星辰

parent 5fdd8538
Pipeline #34434 passed with stages
in 2 minutes and 6 seconds
...@@ -92,6 +92,7 @@ function s.RegisterMergedEvent_ToSingleCard_AddOperation(c,g,event,event_code_si ...@@ -92,6 +92,7 @@ function s.RegisterMergedEvent_ToSingleCard_AddOperation(c,g,event,event_code_si
EVENT_CHAIN_END, EVENT_CHAIN_END,
EVENT_SUMMON, EVENT_SUMMON,
EVENT_SPSUMMON, EVENT_SPSUMMON,
EVENT_MSET,
EVENT_BATTLE_DESTROYED EVENT_BATTLE_DESTROYED
} }
for _,code in ipairs(ec) do for _,code in ipairs(ec) do
...@@ -111,7 +112,7 @@ function s.MergedDelayEventCheck1_ToSingleCard(e,tp,eg,ep,ev,re,r,rp) ...@@ -111,7 +112,7 @@ function s.MergedDelayEventCheck1_ToSingleCard(e,tp,eg,ep,ev,re,r,rp)
g:Clear() g:Clear()
end end
end end
if Duel.GetCurrentChain()==0 and #g>0 and (g:IsExists(Card.IsReason,1,nil,REASON_ADJUST) or Duel.CheckEvent(EVENT_MSET)) then if Duel.GetCurrentChain()==0 and #g>0 and g:IsExists(Card.IsReason,1,nil,REASON_ADJUST) then
local _eg=g:Clone() local _eg=g:Clone()
Duel.RaiseEvent(_eg,e:GetLabel(),re,r,rp,ep,ev) Duel.RaiseEvent(_eg,e:GetLabel(),re,r,rp,ep,ev)
g:Clear() g:Clear()
......
...@@ -87,6 +87,7 @@ function s.RegisterMergedEvent_ToSingleCard_AddOperation(c,g,event,event_code_si ...@@ -87,6 +87,7 @@ function s.RegisterMergedEvent_ToSingleCard_AddOperation(c,g,event,event_code_si
EVENT_CHAIN_END, EVENT_CHAIN_END,
EVENT_SUMMON, EVENT_SUMMON,
EVENT_SPSUMMON, EVENT_SPSUMMON,
EVENT_MSET,
EVENT_BATTLE_DESTROYED EVENT_BATTLE_DESTROYED
} }
for _,code in ipairs(ec) do for _,code in ipairs(ec) do
...@@ -106,7 +107,7 @@ function s.MergedDelayEventCheck1_ToSingleCard(e,tp,eg,ep,ev,re,r,rp) ...@@ -106,7 +107,7 @@ function s.MergedDelayEventCheck1_ToSingleCard(e,tp,eg,ep,ev,re,r,rp)
g:Clear() g:Clear()
end end
end end
if Duel.GetCurrentChain()==0 and #g>0 and (g:IsExists(Card.IsReason,1,nil,REASON_ADJUST) or Duel.CheckEvent(EVENT_MSET)) then if Duel.GetCurrentChain()==0 and #g>0 and g:IsExists(Card.IsReason,1,nil,REASON_ADJUST) then
local _eg=g:Clone() local _eg=g:Clone()
Duel.RaiseEvent(_eg,e:GetLabel(),re,r,rp,ep,ev) Duel.RaiseEvent(_eg,e:GetLabel(),re,r,rp,ep,ev)
g:Clear() g:Clear()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment