fix

Classes/gframe/deck_con.cpp

@@ -1453,8 +1453,8 @@ void DeckBuilder::FilterCards() {
 			}
 			if(filter_scltype) {
 				if((filter_scltype == 1 && data.lscale != filter_scl) || (filter_scltype == 2 && data.lscale < filter_scl)
-				        || (filter_scltype == 3 && data.lscale <= filter_scl) || (filter_scltype == 4 && (data.lscale > filter_scl || data.lscale == 0))
-				        || (filter_scltype == 5 && (data.lscale >= filter_scl || data.lscale == 0)) || filter_scltype == 6
+				        || (filter_scltype == 3 && data.lscale <= filter_scl) || (filter_scltype == 4 && (data.lscale > filter_scl))
+				        || (filter_scltype == 5 && (data.lscale >= filter_scl)) || filter_scltype == 6
 				        || !(data.type & TYPE_PENDULUM))
 					continue;
 			}

Classes/ocgcore/card.cpp

@@ -1903,7 +1903,11 @@ void card::reset(uint32 id, uint32 reset_type) {
 			}
 		}
 		if(id & RESET_TURN_SET) {
+#ifdef _IRR_ANDROID_PLATFORM_
 			effect* peffect = std::get<1>(refresh_control_status());
+#else
+			effect* peffect = std::get<effect*>(refresh_control_status());
+#endif
 			if(peffect && (!(peffect->type & EFFECT_TYPE_SINGLE) || peffect->condition)) {
 				effect* new_effect = pduel->new_effect();
 				new_effect->id = peffect->id;

Classes/ocgcore/field.cpp

@@ -523,7 +523,11 @@ void field::swap_card(card* pcard1, card* pcard2) {
 	return swap_card(pcard1, pcard2, pcard1->current.sequence, pcard2->current.sequence);
 }
 void field::set_control(card* pcard, uint8 playerid, uint16 reset_phase, uint8 reset_count) {
+#ifdef _IRR_ANDROID_PLATFORM_
 	if((core.remove_brainwashing && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING)) || std::get<0>(pcard->refresh_control_status()) == playerid)
+#else
+	if((core.remove_brainwashing && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING)) || std::get<uint8>(pcard->refresh_control_status()) == playerid)
+#endif
 		return;
 	effect* peffect = pduel->new_effect();
 	if(core.reason_effect)

Classes/ocgcore/processor.cpp

@@ -4852,8 +4852,13 @@ int32 field::adjust_step(uint16 step) {
 				if(!pcard) continue;
 				uint8 cur = pcard->current.controler;
 				auto res = pcard->refresh_control_status();
+#ifdef _IRR_ANDROID_PLATFORM_
 				uint8 ref = std::get<0>(res);
 				effect* peffect = std::get<1>(res);
+#else
+				uint8 ref = std::get<uint8>(res);
+				effect* peffect = std::get<effect*>(res);
+#endif
 				if(cur != ref && pcard->is_capable_change_control()) {
 					core.control_adjust_set[p].insert(pcard);
 					if(peffect && (!(peffect->type & EFFECT_TYPE_SINGLE) || peffect->condition))

mobile/assets/changelog.html

@@ -3,7 +3,7 @@
     <meta http-equiv=Content-Type content="text/html;charset=utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style type="text/css">
-         pre {color: #01fcf3; padding: 0.2em; white-space: pre-wrap; }
+         pre {color: #ffffff; padding: 0.2em; white-space: pre-wrap; }
 
     </style>
 </head>
@@ -20,13 +20,15 @@
 <pre>
     更新：
     1.更新ygo内核；
-    2.新卡T1011+MG06+YO01+VJ；
+    2.新卡T1011+SR10+MG06+YO01+VJ；
     新增：
     1.怪兽分类可搜索“效果以外”
     修复：
     1.关键词1和2分别包含于卡名和效果时无法查找的问题；
     2.偶尔高清卡图下载损坏的问题；
     3.一些情况下启用扩展卡包闪退的问题；
+    4.高清卡图显示偏小的问题；
+    5.若干卡图错误；
     </pre>
 <h3 style="color:#ff0000">注意</h3>
 <pre>

mobile/assets/data/conf/strings.conf

@@ -1017,3 +1017,4 @@
 !setname 0x13c 代码破坏者	コードブレイカー
 !setname 0x13d 星义	ネメシス
 !setname 0x13e 巴巴罗斯	バルバロス
+!setname 0x13f 巡掠海魔	Plunder Patroll
\ No newline at end of file

mobile/assets_en/data/conf/strings.conf

@@ -1010,3 +1010,4 @@
 !setname 0x13c Codebreaker
 !setname 0x13d Nemesis
 !setname 0x13e Barbaros
+!setname 0x13f Plunder Patroll
\ No newline at end of file

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 360300223
+        versionCode 360300224
         versionName "3.6.3"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

mobile/src/main/res/layout/dialog_photo.xml

@@ -3,8 +3,8 @@
     android:layout_width="match_parent">
 
     <ImageView
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
         android:id="@+id/photoView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

mobile/src/main/res/values/dimens.xml

@@ -47,7 +47,7 @@
     <dimen name="item_menu_width">80dp</dimen>
     <dimen name="item_menu_height">80dp</dimen>
     <dimen name="brower_arrow_width">20dp</dimen>
-    <dimen name="brower_arrow_height">150dp</dimen>
+    <dimen name="brower_arrow_height">100dp</dimen>
     <dimen name="menu_text_size">6dp</dimen>
     <dimen name="menu_text_top">-5dp</dimen>
 </resources>