Commit c1a7747c authored by fallenstardust's avatar fallenstardust

添加当前卡组信用分与上限显示,并随着卡组变动即时更新

parent 35106b1a
...@@ -348,7 +348,7 @@ public class DeckInfo { ...@@ -348,7 +348,7 @@ public class DeckInfo {
} }
public List<Card> getAllCards() { public List<Card> getAllCards() {
if (allCards.size() == 0) { if (allCards.isEmpty()) {
allCards.addAll(mainCards); allCards.addAll(mainCards);
allCards.addAll(extraCards); allCards.addAll(extraCards);
allCards.addAll(sideCards); allCards.addAll(sideCards);
......
...@@ -17,8 +17,8 @@ import ocgcore.enums.LimitType; ...@@ -17,8 +17,8 @@ import ocgcore.enums.LimitType;
*/ */
public class LimitList { public class LimitList {
private String name = "?"; private String name = "?";
private Map<String, Integer> credit_limits; private Map<String, Integer> credit_limits;//GeneSys模式特有的总分值
private Map<Integer, Integer> credits; private Map<Integer, Integer> credits;//GeneSys模式特有的单张卡ID和其信用分
/** /**
* 0 * 0
*/ */
...@@ -135,7 +135,6 @@ public class LimitList { ...@@ -135,7 +135,6 @@ public class LimitList {
allList.addAll(forbidden); allList.addAll(forbidden);
allList.addAll(limit); allList.addAll(limit);
allList.addAll(semiLimit); allList.addAll(semiLimit);
;
allList.addAll(credits.keySet()); allList.addAll(credits.keySet());
} }
return allList; return allList;
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
android:src="@drawable/box_deck" /> android:src="@drawable/box_deck" />
<TextView <TextView
android:id="@+id/tv_credit_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
......
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