fix 筛选归属

e7a630cf · fallenstardust · 9623487f · e7a630cf
Commit e7a630cf authored Sep 11, 2021 by fallenstardust
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

mobile/src/main/java/cn/garymb/ygomobile/loader/CardSearchInfo.java .../main/java/cn/garymb/ygomobile/loader/CardSearchInfo.java +5 -1

No files found.
--- a/mobile/src/main/java/cn/garymb/ygomobile/loader/CardSearchInfo.java
+++ b/mobile/src/main/java/cn/garymb/ygomobile/loader/CardSearchInfo.java
@@ -114,7 +114,11 @@ class CardSearchInfo {
        }
        if (ot > CardOt.ALL.getId()) {
            if(ot == CardOt.NO_EXCLUSIVE.getId()){
-                if(card.Ot == CardOt.OCG.getId() || card.Ot == CardOt.TCG.getId()){
+                if (card.Ot == CardOt.OCG.getId() || card.Ot == CardOt.TCG.getId()) {
+                    return false;
+                }
+            } else if (ot == CardOt.OCG.getId() || ot == CardOt.TCG.getId()) {
+                if (card.Ot != ot) {
                    return false;
                }
            } else if ((card.Ot & ot) == 0) {