Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
P
pre-release-database-cdb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Crescent/毛虫
pre-release-database-cdb
Commits
c5d73f8f
Commit
c5d73f8f
authored
Sep 10, 2024
by
wind2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'patch-1' into 'master'
Fix c100226150.lua See merge request
mycard/pre-release-database-cdb!108
parents
d0aa737c
7d611f1d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
script/c100226150.lua
script/c100226150.lua
+2
-2
No files found.
script/c100226150.lua
View file @
c5d73f8f
...
@@ -30,8 +30,8 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
...
@@ -30,8 +30,8 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
local
mg2
=
Duel
.
GetMatchingGroup
(
s
.
filter0
,
tp
,
LOCATION_EXTRA
,
0
,
nil
)
local
mg2
=
Duel
.
GetMatchingGroup
(
s
.
filter0
,
tp
,
LOCATION_EXTRA
,
0
,
nil
)
if
mg2
:
GetCount
()
>
0
then
if
mg2
:
GetCount
()
>
0
then
mg
:
Merge
(
mg2
)
mg
:
Merge
(
mg2
)
aux
.
FGoalCheckAdditional
=
s
.
fcheck
end
end
aux
.
FGoalCheckAdditional
=
s
.
fcheck
local
res
=
Duel
.
IsExistingMatchingCard
(
s
.
filter2
,
tp
,
LOCATION_EXTRA
,
0
,
1
,
nil
,
e
,
tp
,
mg
,
nil
,
chkf
)
local
res
=
Duel
.
IsExistingMatchingCard
(
s
.
filter2
,
tp
,
LOCATION_EXTRA
,
0
,
1
,
nil
,
e
,
tp
,
mg
,
nil
,
chkf
)
aux
.
FGoalCheckAdditional
=
nil
aux
.
FGoalCheckAdditional
=
nil
if
not
res
then
if
not
res
then
...
@@ -52,8 +52,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
...
@@ -52,8 +52,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
local
mg2
=
Duel
.
GetMatchingGroup
(
s
.
filter0
,
tp
,
LOCATION_EXTRA
,
0
,
nil
)
local
mg2
=
Duel
.
GetMatchingGroup
(
s
.
filter0
,
tp
,
LOCATION_EXTRA
,
0
,
nil
)
if
mg2
:
GetCount
()
>
0
then
if
mg2
:
GetCount
()
>
0
then
mg1
:
Merge
(
mg2
)
mg1
:
Merge
(
mg2
)
aux
.
FGoalCheckAdditional
=
s
.
fcheck
end
end
aux
.
FGoalCheckAdditional
=
s
.
fcheck
local
sg1
=
Duel
.
GetMatchingGroup
(
s
.
filter2
,
tp
,
LOCATION_EXTRA
,
0
,
nil
,
e
,
tp
,
mg1
,
nil
,
chkf
)
local
sg1
=
Duel
.
GetMatchingGroup
(
s
.
filter2
,
tp
,
LOCATION_EXTRA
,
0
,
nil
,
e
,
tp
,
mg1
,
nil
,
chkf
)
aux
.
FGoalCheckAdditional
=
nil
aux
.
FGoalCheckAdditional
=
nil
local
mg2
=
nil
local
mg2
=
nil
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment