3.7.7LOG-O

sync ocgcore
update strings.conf

Classes/ocgcore/operations.cpp

@@ -1039,13 +1039,16 @@ int32 field::swap_control(uint16 step, effect* reason_effect, uint8 reason_playe
 		uint8 s1 = pcard1->current.sequence;
 		uint32 flag;
 		get_useable_count(NULL, p1, LOCATION_MZONE, reason_player, LOCATION_REASON_CONTROL, 0xff, &flag);
-		flag = (flag & ~(1 << s1) & 0xff) | ~0x1f;
+		if(reason_player == p1)
+			flag = (flag & ~(1 << s1) & 0xff) | ~0x1f;
+		else
+			flag = ((flag & ~(1 << s1)) << 16 & 0xff0000) | ~0x1f0000;
 		card* pcard2 = *targets2->it;
 		pduel->write_buffer8(MSG_HINT);
 		pduel->write_buffer8(HINT_SELECTMSG);
-		pduel->write_buffer8(p1);
+		pduel->write_buffer8(reason_player);
 		pduel->write_buffer32(pcard2->data.code);
-		add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, p1, flag, 1);
+		add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, reason_player, flag, 1);
 		return FALSE;
 	}
 	case 2: {
@@ -1055,13 +1058,16 @@ int32 field::swap_control(uint16 step, effect* reason_effect, uint8 reason_playe
 		uint8 s2 = pcard2->current.sequence;
 		uint32 flag;
 		get_useable_count(NULL, p2, LOCATION_MZONE, reason_player, LOCATION_REASON_CONTROL, 0xff, &flag);
-		flag = (flag & ~(1 << s2) & 0xff) | ~0x1f;
+		if(reason_player == p2)
+			flag = (flag & ~(1 << s2) & 0xff) | ~0x1f;
+		else
+			flag = ((flag & ~(1 << s2)) << 16 & 0xff0000) | ~0x1f0000;
 		card* pcard1 = *targets1->it;
 		pduel->write_buffer8(MSG_HINT);
 		pduel->write_buffer8(HINT_SELECTMSG);
-		pduel->write_buffer8(p2);
+		pduel->write_buffer8(reason_player);
 		pduel->write_buffer32(pcard1->data.code);
-		add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, p2, flag, 1);
+		add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, reason_player, flag, 1);
 		return FALSE;
 	}
 	case 3: {

mobile/assets/changelog.html

@@ -16,18 +16,20 @@
     特别感谢： 菜菜,尸体,废话多,大毛,龙道香姐,晓L,幻兽L 的支持与努力.
 </pre>
 <ul>
-    <li style="color:#ffff00">3.7.6</li>
+    <li style="color:#ffff00">3.7.7</li>
 </ul>
 <pre>
     更新：
     1.更新ygo内核；
-    2.新卡SR11+MP20+YO+VJ；
+    2.新卡DBGI+VJ；
+    3.2020.10.1OCG禁卡表；
+    4.2020.9TCG禁卡表
     变更：
-    1.恢复卡片选择窗口提示文字；
-    2.微调UI；
-    修复：
-    1.部分手机无法备份还原卡组的问题；
-    2.部分手机选择头像卡背背景等无法显示预览图的问题；
+    1.不再在初运行时申请权限；
+    2.只在需要使用相应权限时弹出申请；
+    3.移除READ_PHONE_STATE权限请求；
+	修复：
+	1.覆盖安装新版本会重置收藏夹记录的问题；
 </pre>
 <h3 style="color:#ff0000">注意</h3>
 <pre>

mobile/assets/data/conf/strings.conf

@@ -1056,3 +1056,10 @@
 !setname 0x14e 电脑堺	電脳堺
 !setname 0x114e 电脑堺门	電脳堺門
 !setname 0x14f 双天
+!setname 0x150 大贤者	マギストス
+#setname 0x151 双子	Twin
+!setname 0x1151 直播☆双子	Live☆Twin
+!setname 0x2151 邪恶★双子	Evil★Twin
+!setname 0x152 姬丝基勒	キスキル
+!setname 0x153 璃拉	リィラ
+!setname 0x154 龙辉巧	ドライトロン

mobile/assets_en/data/conf/strings.conf

@@ -80,7 +80,7 @@
 !system 222 Activate Trigger Effect?
 !system 223 and Ask other Trigger Effect activate later
 !system 224 First Special Summoned by own Condition
-!system 225 Overlaid with [%ls](%d)
+!system 225 Overlayed under [%ls](%d)
 !system 500 Select a monster to tribute
 !system 501 Select a card to discard
 !system 502 Select a card to destroy
@@ -1048,4 +1048,11 @@
 !setname 0x14d Tribrigade
 !setname 0x14e Datascape
 !setname 0x114e Datascape Gate
-!setname 0x14f Souten
\ No newline at end of file
+!setname 0x14f Souten
+!setname 0x150 Magistus
+#setname 0x151 Twin
+!setname 0x1151 Live☆Twin
+!setname 0x2151 Evil★Twin
+!setname 0x152 Kisikil
+!setname 0x153 Lilla
+!setname 0x154 Draitron

mobile/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 370600830
-        versionName "3.7.6"
+        versionCode 370700930
+        versionName "3.7.7"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true
         ndk {