Commit d4ebbcd3 authored by Amiya's avatar Amiya

Merge branch 'master' of git.moenext.com:mycard/pre-release-database-cdb

parents f0b24ccb d4a71d30
Pipeline #43625 passed with stages
in 2 minutes and 32 seconds
...@@ -115,7 +115,7 @@ add_script_diff: ...@@ -115,7 +115,7 @@ add_script_diff:
FIELDS: 'name,desc,overallString,picUrl' FIELDS: 'name,desc,overallString,picUrl'
GIT_DEPTH: '1000' GIT_DEPTH: '1000'
OUTPUT_FILENAME: test-release.json OUTPUT_FILENAME: test-release.json
REF_COMMIT: '22.15' # 更新的时候改这里,修改成上一个tag的版本号 REF_COMMIT: '22.16' # 更新的时候改这里,修改成上一个tag的版本号
script: script:
- apt update;apt -y install wget - apt update;apt -y install wget
- currentPath=$PWD - currentPath=$PWD
......
No preview for this file type
...@@ -80,7 +80,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -80,7 +80,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
local tc2=nil local tc2=nil
if Duel.GetLocationCount(p1,LOCATION_MZONE)>0 if Duel.GetLocationCount(p1,LOCATION_MZONE)>0
and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.spfilter2),p1,LOCATION_GRAVE,0,1,nil,e,p1) and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.spfilter2),p1,LOCATION_GRAVE,0,1,nil,e,p1)
and Duel.SelectYesNo(p1,aux.Stringid(id,2)) then and Duel.SelectYesNo(p1,aux.Stringid(id,3)) then
Duel.Hint(HINT_SELECTMSG,p1,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,p1,HINTMSG_SPSUMMON)
local sg1=Duel.SelectMatchingCard(p1,aux.NecroValleyFilter(s.spfilter2),p1,LOCATION_GRAVE,0,1,1,nil,e,p1) local sg1=Duel.SelectMatchingCard(p1,aux.NecroValleyFilter(s.spfilter2),p1,LOCATION_GRAVE,0,1,1,nil,e,p1)
Duel.HintSelection(sg1) Duel.HintSelection(sg1)
...@@ -88,7 +88,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -88,7 +88,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
if Duel.GetLocationCount(p2,LOCATION_MZONE)>0 if Duel.GetLocationCount(p2,LOCATION_MZONE)>0
and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.spfilter2),p2,LOCATION_GRAVE,0,1,nil,e,p2) and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.spfilter2),p2,LOCATION_GRAVE,0,1,nil,e,p2)
and Duel.SelectYesNo(p2,aux.Stringid(id,2)) then and Duel.SelectYesNo(p2,aux.Stringid(id,3)) then
Duel.Hint(HINT_SELECTMSG,p2,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,p2,HINTMSG_SPSUMMON)
local sg2=Duel.SelectMatchingCard(p2,aux.NecroValleyFilter(s.spfilter2),p2,LOCATION_GRAVE,0,1,1,nil,e,p2) local sg2=Duel.SelectMatchingCard(p2,aux.NecroValleyFilter(s.spfilter2),p2,LOCATION_GRAVE,0,1,1,nil,e,p2)
Duel.HintSelection(sg2) Duel.HintSelection(sg2)
...@@ -96,7 +96,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -96,7 +96,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
if tc1 then if tc1 then
if Duel.SpecialSummonStep(tc1,0,p1,p1,true,false,POS_FACEUP) then if Duel.SpecialSummonStep(tc1,0,p1,p1,true,false,POS_FACEUP) then
tc1:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3)) tc1:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,4))
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_LEAVE_FIELD_REDIRECT) e1:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
...@@ -108,7 +108,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -108,7 +108,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
if tc2 then if tc2 then
if Duel.SpecialSummonStep(tc2,0,p2,p2,true,false,POS_FACEUP) then if Duel.SpecialSummonStep(tc2,0,p2,p2,true,false,POS_FACEUP) then
tc2:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3)) tc2:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,4))
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_LEAVE_FIELD_REDIRECT) e1:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
......
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