新ot

mobile/src/main/java/cn/garymb/ygomobile/loader/CardSearchInfo.java

@@ -117,7 +117,7 @@ class CardSearchInfo {
                 if(card.Ot == CardOt.OCG.getId() || card.Ot == CardOt.TCG.getId()){
                     return false;
                 }
-            } else if (card.Ot != ot) {
+            } else if ((card.Ot & ot) == 0) {
                 return false;
             }
         }

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardDetail.java

@@ -278,7 +278,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
 
         type.setText(CardUtils.getAllTypeString(cardInfo, mStringManager).replace("/", "|"));
         attrView.setText(mStringManager.getAttributeString(cardInfo.Attribute));
-        otView.setText(mStringManager.getOtString(cardInfo.Ot));
+        otView.setText(mStringManager.getOtString(cardInfo.Ot, true));
         long[] sets = cardInfo.getSetCode();
         setName.setText("");
         int index = 0;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearcher.java

@@ -329,12 +329,9 @@ public class CardSearcher implements View.OnClickListener {
 
     private void initOtSpinners(Spinner spinner) {
         List<SimpleSpinnerItem> items = new ArrayList<>();
-        items.add(new SimpleSpinnerItem(0, getString(R.string.label_ot)));
         for (CardOt item : CardOt.values()) {
-            if (item != CardOt.ALL) {
-                items.add(new SimpleSpinnerItem(item.getId(),
-                        mStringManager.getOtString(item.getId())));
-            }
+            items.add(new SimpleSpinnerItem(item.getId(),
+                    mStringManager.getOtString(item.getId(), false)));
         }
         SimpleSpinnerAdapter adapter = new SimpleSpinnerAdapter(mContext);
         adapter.setColor(Color.WHITE);

mobile/src/main/java/ocgcore/StringManager.java

@@ -252,12 +252,27 @@ public class StringManager implements Closeable {
         return getSystemString(value.getLanguageIndex(), value.name());
     }
 
-    public String getOtString(int ot) {
-        CardOt value = CardOt.valueOf(ot);
-        if(value == null){
-            return String.valueOf(ot);
+    public String getOtString(int ot, boolean full) {
+        if(!full || ot == 0){
+            CardOt value = CardOt.valueOf(ot);
+            if(value == null){
+                return String.valueOf(ot);
+            }
+            return getSystemString(value.getLanguageIndex(), value.name());
         }
-        return getSystemString(value.getLanguageIndex(), value.name());
+        StringBuilder stringBuilder = new StringBuilder();
+        boolean first = true;
+        for(CardOt _ot : CardOt.values()){
+            if((_ot.getId() & ot) != 0){
+                if(first){
+                    first = false;
+                } else {
+                    stringBuilder.append("|");
+                }
+                stringBuilder.append(getSystemString(_ot.getLanguageIndex(), _ot.name()));
+            }
+        }
+        return stringBuilder.toString();
     }
 
     public String getCategoryString(long id) {

mobile/src/main/java/ocgcore/enums/CardOt.java

@@ -3,12 +3,12 @@ package ocgcore.enums;
 import androidx.annotation.Nullable;
 
 public enum CardOt {
-    ALL(0),
-    OCG(1, 1240),
-    TCG(2, 1241),
-    NO_EXCLUSIVE(3, 1242),
-    CUSTOM(4, 1243),
-    SC_OCG(8);
+    ALL(0, 1486),
+    OCG(1, 1481),
+    TCG(2, 1482),
+    CUSTOM(4, 1484),
+    SC_OCG(8, 1483),
+    NO_EXCLUSIVE(3, 1485);
 
     private final int value;
     //1240