Skip to content

P
pre-release-database-cdb
Commit 08f94238 authored by wind2009's avatar wind2009
Browse files
Options

Fix Drake_shark_gf

parent 52660621
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 15 deletions
.gitlab-ci.yml
View file @ 08f94238
...@@ -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: '11.8' # 更新的时候改这里，修改成上一个tag的版本号 REF_COMMIT: '11.9' # 更新的时候改这里，修改成上一个tag的版本号
script: script:
- apt update;apt -y install wget - apt update;apt -y install wget
- currentPath=$PWD - currentPath=$PWD
......
script/c101208009.lua
View file @ 08f94238
...@@ -95,21 +95,29 @@ function s.Drake_shark_f(function_f,int_lv,card_c) ...@@ -95,21 +95,29 @@ function s.Drake_shark_f(function_f,int_lv,card_c)
return c:IsXyzLevel(card_c,int_lv) and (not function_f or function_f(c)) return c:IsXyzLevel(card_c,int_lv) and (not function_f or function_f(c))
end end
end end
function s.sxfilter(c,tp,xc,eid) function s.sxfilter(c,tp,xc)
local te=c:IsHasEffect(81096431,tp) local te=c:IsHasEffect(81096431,tp)
if te and te:GetValue()==eid then if te then
local etg=te:GetTarget() local etg=te:GetTarget()
return not etg or etg(te,xc) return not etg or etg(te,xc)
end end
return false
end
function s.sxvalue(c,tp,xc)
local te=c:IsHasEffect(81096431,tp)
if te then
local etg=te:GetTarget()
if not etg or etg(te,xc) then
return te:GetValue()
end
end
end end
function s.Drake_shark_gf(int_ct,int_tp,xc) function s.Drake_shark_gf(int_ct,int_tp,xc)
return function (g) return function (g)
local ct=g:GetCount() local ct=g:GetCount()
if g:IsExists(s.sxfilter,1,nil,int_tp,xc,81096431) then local eg=g:Filter(s.sxfilter,nil,int_tp,xc)
ct=ct+1 if #eg>0 then
end ct=ct+eg:GetClassCount(s.sxvalue,int_tp,xc)
if g:IsExists(s.sxfilter,1,nil,int_tp,xc,id) then
ct=ct+1
end end
return ct>=int_ct return ct>=int_ct
end end
......
script/c81096431.lua
View file @ 08f94238
...@@ -51,21 +51,29 @@ function s.Drake_shark_f(function_f,int_lv,card_c) ...@@ -51,21 +51,29 @@ function s.Drake_shark_f(function_f,int_lv,card_c)
return c:IsXyzLevel(card_c,int_lv) and (not function_f or function_f(c)) return c:IsXyzLevel(card_c,int_lv) and (not function_f or function_f(c))
end end
end end
function s.sxfilter(c,tp,xc,eid) function s.sxfilter(c,tp,xc)
local te=c:IsHasEffect(id,tp) local te=c:IsHasEffect(id,tp)
if te and te:GetValue()==eid then if te then
local etg=te:GetTarget() local etg=te:GetTarget()
return not etg or etg(te,xc) return not etg or etg(te,xc)
end end
return false
end
function s.sxvalue(c,tp,xc)
local te=c:IsHasEffect(id,tp)
if te then
local etg=te:GetTarget()
if not etg or etg(te,xc) then
return te:GetValue()
end
end
end end
function s.Drake_shark_gf(int_ct,int_tp,xc) function s.Drake_shark_gf(int_ct,int_tp,xc)
return function (g) return function (g)
local ct=g:GetCount() local ct=g:GetCount()
if g:IsExists(s.sxfilter,1,nil,int_tp,xc,id) then local eg=g:Filter(s.sxfilter,nil,int_tp,xc)
ct=ct+1 if #eg>0 then
end ct=ct+eg:GetClassCount(s.sxvalue,int_tp,xc)
if g:IsExists(s.sxfilter,1,nil,int_tp,xc,101208009) then
ct=ct+1
end end
return ct>=int_ct return ct>=int_ct
end end
......
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