Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile
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
fallenstardust
YGOMobile
Commits
35106b1a
Commit
35106b1a
authored
Dec 14, 2025
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
卡组编辑添加算法:根据genesys总分控制添加卡片数量
筛选条件选择genesys时只展示有信用分的卡牌列表,不显示禁卡
parent
53022b98
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
76 additions
and
6 deletions
+76
-6
mobile/src/main/java/cn/garymb/ygomobile/loader/CardLoader.java
.../src/main/java/cn/garymb/ygomobile/loader/CardLoader.java
+3
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerFragment.java
...ava/cn/garymb/ygomobile/ui/cards/DeckManagerFragment.java
+52
-1
mobile/src/main/java/ocgcore/data/LimitList.java
mobile/src/main/java/ocgcore/data/LimitList.java
+21
-4
No files found.
mobile/src/main/java/cn/garymb/ygomobile/loader/CardLoader.java
View file @
35106b1a
...
...
@@ -167,7 +167,7 @@ public class CardLoader implements ICardSearcher {
@Override
public
List
<
Card
>
sort
(
List
<
Card
>
cards
)
{
Collections
.
sort
(
cards
,
CardSort
.
ASC
);
cards
.
sort
(
CardSort
.
ASC
);
return
cards
;
}
...
...
@@ -210,6 +210,8 @@ public class CardLoader implements ICardSearcher {
ids
=
limitList
.
limit
;
}
else
if
(
cardLimitType
==
LimitType
.
SemiLimit
)
{
ids
=
limitList
.
semiLimit
;
}
else
if
(
cardLimitType
==
LimitType
.
GeneSys
)
{
ids
=
limitList
.
getGeneSysCodeList
();
}
else
if
(
cardLimitType
==
LimitType
.
All
)
{
ids
=
limitList
.
getCodeList
();
}
else
{
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerFragment.java
View file @
35106b1a
...
...
@@ -73,6 +73,7 @@ import java.util.ArrayList;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Map
;
import
cn.garymb.ygomobile.AppsSettings
;
import
cn.garymb.ygomobile.Constants
;
...
...
@@ -1131,13 +1132,63 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
LimitList
limitList
=
mDeckAdapater
.
getLimitList
();
int
id
=
cardInfo
.
getGameCode
();
Integer
count
=
mCount
.
get
(
id
);
if
(
limitList
==
null
)
{
return
count
!=
null
&&
count
<=
3
;
}
if
(
limitList
.
check
(
cardInfo
,
LimitType
.
Forbidden
))
{
YGOUtil
.
showTextToast
(
getString
(
R
.
string
.
tip_card_max
,
0
));
return
false
;
}
if
(
limitList
.
check
(
cardInfo
,
LimitType
.
GeneSys
))
{
// 检查GeneSys信用分限制
if
(
limitList
.
getCredits
()
!=
null
&&
limitList
.
getCreditLimits
()
!=
null
)
{
// 获取当前卡片的信用分值
Integer
cardCreditValue
=
limitList
.
getCredits
().
get
(
cardInfo
.
Alias
==
0
?
cardInfo
.
Code
:
cardInfo
.
Alias
);
if
(
cardCreditValue
!=
null
&&
cardCreditValue
>
0
)
{
// 计算当前卡组中所有GeneSys卡片的信用分总和
int
totalCredit
=
0
;
SparseArray
<
Integer
>
cardCounts
=
mDeckAdapater
.
getCardCount
();
for
(
int
i
=
0
;
i
<
cardCounts
.
size
();
i
++)
{
int
cardId
=
cardCounts
.
keyAt
(
i
);
int
cardQuantity
=
cardCounts
.
valueAt
(
i
);
// 检查这张卡是否是GeneSys卡
if
(
limitList
.
getCredits
().
containsKey
(
cardId
))
{
Integer
creditValue
=
limitList
.
getCredits
().
get
(
cardId
);
if
(
creditValue
!=
null
)
{
// 如果是当前要添加的卡片,需要考虑添加后的数量
if
(
cardId
==
cardInfo
.
Code
||
cardId
==
cardInfo
.
Alias
)
{
totalCredit
+=
creditValue
*
(
cardQuantity
+
1
);
}
else
{
totalCredit
+=
creditValue
*
cardQuantity
;
}
}
}
}
// 检查是否超过信用分上限
boolean
overLimit
=
false
;
for
(
Map
.
Entry
<
String
,
Integer
>
entry
:
limitList
.
getCreditLimits
().
entrySet
())
{
Integer
creditLimit
=
entry
.
getValue
();
if
(
creditLimit
!=
null
&&
totalCredit
>
creditLimit
)
{
overLimit
=
true
;
break
;
}
}
if
(
overLimit
)
{
YGOUtil
.
showTextToast
(
"超过总分上限:"
+
limitList
.
getCreditLimits
().
entrySet
());
return
false
;
}
}
}
}
if
(
count
!=
null
)
{
if
(
limitList
.
check
(
cardInfo
,
LimitType
.
Limit
))
{
if
(
count
>=
1
)
{
...
...
@@ -1766,7 +1817,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
});
}
else
{
Log
.
d
(
"seesee"
,
deckFile
.
getPathFile
().
getAbsolutePath
());
Log
.
d
(
"seesee"
,
deckFile
.
getPathFile
().
getAbsolutePath
());
loadDeckFromFile
(
deckFile
.
getPathFile
());
ll_click_like
.
setVisibility
(
View
.
GONE
);
}
...
...
mobile/src/main/java/ocgcore/data/LimitList.java
View file @
35106b1a
...
...
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
ocgcore.enums.LimitType
;
...
...
@@ -54,7 +55,7 @@ public class LimitList {
public
List
<
String
>
getStringForbidden
()
{
List
<
String
>
strFobidden
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
forbidden
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
forbidden
.
size
();
i
++)
{
strFobidden
.
add
(
forbidden
.
get
(
i
).
toString
());
}
return
strFobidden
;
...
...
@@ -62,7 +63,7 @@ public class LimitList {
public
List
<
String
>
getStringLimit
()
{
List
<
String
>
strLimit
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
limit
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
limit
.
size
();
i
++)
{
strLimit
.
add
(
limit
.
get
(
i
).
toString
());
}
return
strLimit
;
...
...
@@ -70,7 +71,7 @@ public class LimitList {
public
List
<
String
>
getStringSemiLimit
()
{
List
<
String
>
strSemiLimit
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
semiLimit
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
semiLimit
.
size
();
i
++)
{
strSemiLimit
.
add
(
semiLimit
.
get
(
i
).
toString
());
}
return
strSemiLimit
;
...
...
@@ -133,18 +134,34 @@ public class LimitList {
if
(
allList
.
isEmpty
())
{
allList
.
addAll
(
forbidden
);
allList
.
addAll
(
limit
);
allList
.
addAll
(
semiLimit
);;
allList
.
addAll
(
semiLimit
);
;
allList
.
addAll
(
credits
.
keySet
());
}
return
allList
;
}
/**
* 获取按信用分值卡牌ID列表(不含禁止卡)
*
* @return 包含信用分卡牌ID列表
*/
public
List
<
Integer
>
getGeneSysCodeList
()
{
if
(
credits
==
null
||
credits
.
isEmpty
())
{
//防止空指针异常
return
new
ArrayList
<>();
}
return
new
ArrayList
<>(
credits
.
keySet
());
}
public
boolean
check
(
Card
cardInfo
,
LimitType
type
)
{
return
check
(
cardInfo
.
Code
,
cardInfo
.
Alias
,
type
);
}
/**
* 判断入参code或alias对应的卡片是否属于限制类型x,x由type确定
*
* @param code
* @param alias
* @param type
...
...
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