Commit c972feae authored by wind2009's avatar wind2009

Fix

parent 48069b2f
Pipeline #33732 passed with stages
in 2 minutes and 56 seconds
...@@ -53,7 +53,7 @@ merge_databases: ...@@ -53,7 +53,7 @@ merge_databases:
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: '12.10' # 更新的时候改这里,修改成上一个tag的版本号 REF_COMMIT: '12.11' # 更新的时候改这里,修改成上一个tag的版本号
script: script:
- apt update;apt -y install wget - apt update;apt -y install wget
- currentPath=$PWD - currentPath=$PWD
......
pics/100237001.jpg

79 KB | W: | H:

pics/100237001.jpg

88.9 KB | W: | H:

pics/100237001.jpg
pics/100237001.jpg
pics/100237001.jpg
pics/100237001.jpg
  • 2-up
  • Swipe
  • Onion skin
pics/100237002.jpg

88.4 KB | W: | H:

pics/100237002.jpg

104 KB | W: | H:

pics/100237002.jpg
pics/100237002.jpg
pics/100237002.jpg
pics/100237002.jpg
  • 2-up
  • Swipe
  • Onion skin
pics/100237003.jpg

83.1 KB | W: | H:

pics/100237003.jpg

97.3 KB | W: | H:

pics/100237003.jpg
pics/100237003.jpg
pics/100237003.jpg
pics/100237003.jpg
  • 2-up
  • Swipe
  • Onion skin
pics/100237004.jpg

83.5 KB | W: | H:

pics/100237004.jpg

98.5 KB | W: | H:

pics/100237004.jpg
pics/100237004.jpg
pics/100237004.jpg
pics/100237004.jpg
  • 2-up
  • Swipe
  • Onion skin
pics/100237005.jpg

86 KB | W: | H:

pics/100237005.jpg

99.7 KB | W: | H:

pics/100237005.jpg
pics/100237005.jpg
pics/100237005.jpg
pics/100237005.jpg
  • 2-up
  • Swipe
  • Onion skin
pics/100237006.jpg

95.4 KB | W: | H:

pics/100237006.jpg

88.6 KB | W: | H:

pics/100237006.jpg
pics/100237006.jpg
pics/100237006.jpg
pics/100237006.jpg
  • 2-up
  • Swipe
  • Onion skin
pics/100237007.jpg

78.6 KB | W: | H:

pics/100237007.jpg

80.8 KB | W: | H:

pics/100237007.jpg
pics/100237007.jpg
pics/100237007.jpg
pics/100237007.jpg
  • 2-up
  • Swipe
  • Onion skin
pics/100237008.jpg

94 KB | W: | H:

pics/100237008.jpg

98.3 KB | W: | H:

pics/100237008.jpg
pics/100237008.jpg
pics/100237008.jpg
pics/100237008.jpg
  • 2-up
  • Swipe
  • Onion skin
pics/100237009.jpg

87.4 KB | W: | H:

pics/100237009.jpg

96.6 KB | W: | H:

pics/100237009.jpg
pics/100237009.jpg
pics/100237009.jpg
pics/100237009.jpg
  • 2-up
  • Swipe
  • Onion skin
pics/100237010.jpg

85.3 KB | W: | H:

pics/100237010.jpg

98.7 KB | W: | H:

pics/100237010.jpg
pics/100237010.jpg
pics/100237010.jpg
pics/100237010.jpg
  • 2-up
  • Swipe
  • Onion skin
...@@ -86,7 +86,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -86,7 +86,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.cfilter(c,tp) function s.cfilter(c,tp)
return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_ONFIELD) return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_ONFIELD)
and c:IsReason(REASON_EFFECT) and c:GetPreviousTypeOnField()&TYPE_SPELL+TYPE_TRAP~=0 and c:IsReason(REASON_EFFECT) and c:GetPreviousTypeOnField()&(TYPE_SPELL+TYPE_TRAP)~=0
end end
function s.descon(e,tp,eg,ep,ev,re,r,rp) function s.descon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(s.cfilter,1,nil,tp) return eg:IsExists(s.cfilter,1,nil,tp)
......
...@@ -113,7 +113,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -113,7 +113,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end end
function s.desop(e,tp,eg,ep,ev,re,r,rp) function s.desop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then if tc:IsRelateToChain() then
Duel.Destroy(tc,REASON_EFFECT) Duel.Destroy(tc,REASON_EFFECT)
end end
end end
...@@ -32,7 +32,7 @@ end ...@@ -32,7 +32,7 @@ end
function s.filter2(c,e,tp,m,f,chkf) function s.filter2(c,e,tp,m,f,chkf)
if not (c:IsType(TYPE_FUSION) and c:IsAttribute(ATTRIBUTE_EARTH) and (not f or f(c)) if not (c:IsType(TYPE_FUSION) and c:IsAttribute(ATTRIBUTE_EARTH) and (not f or f(c))
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false)) then return false end and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false)) then return false end
aux.FCheckAdditional=c.branded_fusion_check or s.fcheck aux.FCheckAdditional=s.fcheck
local res=c:CheckFusionMaterial(m,nil,chkf) local res=c:CheckFusionMaterial(m,nil,chkf)
aux.FCheckAdditional=nil aux.FCheckAdditional=nil
return res return res
......
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