整理保存设置&可开关场地背景

Classes/gframe/event_handler.cpp

@@ -1807,9 +1807,12 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
 				return true;
 				break;
 			}
-//			case CHECKBOX_QUICK_ANIMATION: {
-//				mainGame->gameConf.quick_animation = mainGame->chkQuickAnimation->isChecked() ? 1 : 0;
-// 			}
+			case CHECKBOX_QUICK_ANIMATION: {
+				mainGame->gameConf.quick_animation = mainGame->chkQuickAnimation->isChecked() ? 1 : 0;
+ 			}
+ 			case CHECKBOX_DRAW_FIELD_SPELL: {
+ 			    mainGame->gameConf.draw_field_spell = mainGame->chkDrawFieldSpell->isChecked() ? 1 : 0;
+ 			}
 			}
 			break;
 		}

Classes/gframe/game.cpp

@@ -448,6 +448,9 @@ bool Game::Initialize() {
 	chkWaitChain = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, -1, dataManager.GetSysString(1277));
 	chkWaitChain->setChecked(gameConf.chkWaitChain != 0);
 	posY += 60;
+    chkDrawFieldSpell = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_DRAW_FIELD_SPELL, dataManager.GetSysString(1277));
+    chkDrawFieldSpell->setChecked(gameConf.draw_field_spell != 0);
+	posY += 60;
  	chkQuickAnimation = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_QUICK_ANIMATION, dataManager.GetSysString(1299));
  	chkQuickAnimation->setChecked(gameConf.quick_animation != 0);
 	//system
@@ -1366,6 +1369,7 @@ void Game::LoadConfig() {
 	gameConf.chkRandomPos = android::getIntSetting(appMain, "chkRandomPos", 0);
 	gameConf.chkAutoChain = android::getIntSetting(appMain, "chkAutoChain", 0);
 	gameConf.chkWaitChain = android::getIntSetting(appMain, "chkWaitChain", 0);
+	gameConf.draw_field_spell = android::getIntSetting(appMain, "draw_field_spell", 0);
 	gameConf.quick_animation = android::getIntSetting(appMain, "quick_animation", 0);
 	//system
 	gameConf.chkIgnore1 = android::getIntSetting(appMain, "chkIgnore1", 0);
@@ -1382,69 +1386,36 @@ void Game::LoadConfig() {
 }
 
 void Game::SaveConfig() {
-	//char linebuf[256];	
-	//BufferIO::EncodeUTF8(gameConf.lastdeck, linebuf);
-	//android::setLastDeck(appMain, linebuf);
-	int cur;
 	//helper
-	cur = chkMAutoPos->isChecked()?1:0;
-	if(cur != gameConf.chkMAutoPos){
-		gameConf.chkMAutoPos = cur;
-		 android::saveIntSetting(appMain, "chkMAutoPos", gameConf.chkMAutoPos);
-	}
-	cur = chkSTAutoPos->isChecked()?1:0;
-	if(cur != gameConf.chkSTAutoPos){
-		gameConf.chkSTAutoPos = cur;
-		 android::saveIntSetting(appMain, "chkSTAutoPos", gameConf.chkSTAutoPos);
-	}
-	cur = chkRandomPos->isChecked()?1:0;
-	if(cur != gameConf.chkRandomPos){
-		gameConf.chkRandomPos = cur;
-		 android::saveIntSetting(appMain, "chkRandomPos", gameConf.chkRandomPos);
-	}
-	cur = chkAutoChain->isChecked()?1:0;
-	if(cur != gameConf.chkAutoChain){
-		gameConf.chkAutoChain = cur;
-		 android::saveIntSetting(appMain, "chkAutoChain", gameConf.chkAutoChain);
-	}
-	cur = chkWaitChain->isChecked()?1:0;
-    if(cur != gameConf.chkWaitChain){
-    	gameConf.chkWaitChain = cur;
-    	 android::saveIntSetting(appMain, "chkWaitChain", gameConf.chkWaitChain);
-    }
-	cur = chkQuickAnimation->isChecked()?1:0;
-    if(cur != gameConf.quick_animation){
-        gameConf.quick_animation = cur;
-         android::saveIntSetting(appMain, "quick_animation", gameConf.quick_animation);
-    }
+	gameConf.chkMAutoPos = chkMAutoPos->isChecked() ? 1 : 0;
+	    android::saveIntSetting(appMain, "chkMAutoPos", gameConf.chkMAutoPos);
+	gameConf.chkSTAutoPos = chkSTAutoPos->isChecked() ? 1 : 0;
+		android::saveIntSetting(appMain, "chkSTAutoPos", gameConf.chkSTAutoPos);
+	gameConf.chkRandomPos = chkRandomPos->isChecked() ? 1 : 0;
+		android::saveIntSetting(appMain, "chkRandomPos", gameConf.chkRandomPos);
+	gameConf.chkAutoChain = chkAutoChain->isChecked() ? 1 : 0;
+		android::saveIntSetting(appMain, "chkAutoChain", gameConf.chkAutoChain);
+    gameConf.chkWaitChain = chkWaitChain->isChecked() ? 1 : 0;
+    	android::saveIntSetting(appMain, "chkWaitChain", gameConf.chkWaitChain);
+    gameConf.draw_field_spell = chkDrawFieldSpell->isChecked() ? 1 : 0;
+        android::saveIntSetting(appMain, "draw_field_spell", gameConf.draw_field_spell);
+    gameConf.quick_animation = chkQuickAnimation->isChecked() ? 1 : 0;
+        android::saveIntSetting(appMain, "quick_animation", gameConf.quick_animation);
+
 	//system
-	cur = chkIgnore1->isChecked()?1:0;
-	if(cur != gameConf.chkIgnore1){
-		gameConf.chkIgnore1 = cur;
-		 android::saveIntSetting(appMain, "chkIgnore1", gameConf.chkIgnore1);
-	}
-	cur = chkIgnore2->isChecked()?1:0;
-	if(cur != gameConf.chkIgnore2){
-		gameConf.chkIgnore2 = cur;
-		 android::saveIntSetting(appMain, "chkIgnore2", gameConf.chkIgnore2);
-	}
-	cur = chkHideSetname->isChecked()?1:0;
-	if(cur != gameConf.chkHideSetname){
-		gameConf.chkHideSetname = cur;
-		 android::saveIntSetting(appMain, "chkHideSetname", gameConf.chkHideSetname);
-	}
-	cur = chkIgnoreDeckChanges->isChecked()?1:0;
-	if(cur != gameConf.chkIgnoreDeckChanges){
-		gameConf.chkIgnoreDeckChanges = cur;
-		 android::saveIntSetting(appMain, "chkIgnoreDeckChanges", gameConf.chkIgnoreDeckChanges);
-	}
+	gameConf.chkIgnore1 = chkIgnore1->isChecked() ? 1 : 0;
+		android::saveIntSetting(appMain, "chkIgnore1", gameConf.chkIgnore1);
+	gameConf.chkIgnore2 = chkIgnore2->isChecked() ? 1 : 0;
+		android::saveIntSetting(appMain, "chkIgnore2", gameConf.chkIgnore2);
+	gameConf.chkHideSetname = chkHideSetname->isChecked() ? 1 : 0;
+		android::saveIntSetting(appMain, "chkHideSetname", gameConf.chkHideSetname);
+	gameConf.chkIgnoreDeckChanges = chkIgnoreDeckChanges->isChecked() ? 1 : 0;
+		android::saveIntSetting(appMain, "chkIgnoreDeckChanges", gameConf.chkIgnoreDeckChanges);
 
 //gameConf.defaultOT = defaultOT->isChecked()?1:0;
 //    android::saveIntSetting(appMain, "defaultOT", gameConf.defaultOT);
 //gameConf.control_mode = control_mode->isChecked()?1:0;
 //	  android::saveIntSetting(appMain, "control_mode", gameConf.control_mode);
-//gameConf.draw_field_spell = draw_field_spell->isChecked()?1:0;
-//	  android::saveIntSetting(appMain, "draw_field_spell", gameConf.draw_field_spell);
 //gameConf.separate_clear_button = separate_clear_button->isChecked()?1:0;
 //	  android::saveIntSetting(appMain, "separate_clear_button", gameConf.separate_clear_button);
 //TEST BOT MODE

Classes/gframe/game.h

@@ -240,6 +240,7 @@ public:
 	irr::gui::IGUICheckBox* chkRandomPos;
 	irr::gui::IGUICheckBox* chkAutoChain;
 	irr::gui::IGUICheckBox* chkWaitChain;
+	irr::gui::IGUICheckBox* chkDrawFieldSpell;
 	irr::gui::IGUICheckBox* chkQuickAnimation;
 	irr::gui::IGUICheckBox* chkHideSetname;
 	irr::gui::IGUICheckBox* chkHideHintButton;
@@ -639,6 +640,7 @@ extern Game* mainGame;
 #define BUTTON_CANCEL_SINGLEPLAY	352
 #define CHECKBOX_AUTO_SEARCH		360
 #define CHECKBOX_DISABLE_CHAT		364
+#define CHECKBOX_DRAW_FIELD_SPELL	368
 #define CHECKBOX_QUICK_ANIMATION	369
 #define COMBOBOX_SORTTYPE			370
 #define COMBOBOX_LIMIT				371

mobile/assets/changelog.html

@@ -22,8 +22,10 @@
 <pre>
     更新：
     1.更新ygo内核；
-    2.系统设定中支持加速模式；
     3.新卡SR07+VJ；
+    优化：
+    1.辅助功能中支持加速模式；
+    2.辅助功能中支持开关场地背景；
 </pre>
 </body>
 </html>
\ No newline at end of file

mobile/assets/data/conf/strings.conf

@@ -308,6 +308,7 @@
 !system 1276 自动排列连锁顺序
 !system 1277 没有可连锁的卡时延迟回应
 !system 1278 自动选择魔法/陷阱卡位置
+!system 1279 显示场地背景
 !system 1290 停用聊天功能
 !system 1291 忽略观战者发言
 !system 1292 □忽略时点

mobile/assets_en/data/conf/strings.conf

@@ -308,6 +308,7 @@
 !system 1276 Auto Chain order
 !system 1277 No delay for Chain
 !system 1278 Auto spell/trap placing
+!system 1279 Drawing field spell
 !system 1290 Disable Chatting
 !system 1291 Mute spectators
 !system 1292 Ignore chain

mobile/assets_ko/data/conf/strings.conf

@@ -308,6 +308,7 @@
 !system 1276 자동 체인
 !system 1277 딜레이 없이 체인
 !system 1278 카드 위치 자동 (마법&함정)
+!system 1279 전시 회장 배경
 !system 1290 상대방 메시지 무시
 !system 1291 관전자 메시지 무시
 !system 1292 체인 무시

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 33060926
+        versionCode 330601001
         versionName "3.3.6"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true