test quick animation

Classes/gframe/drawing.cpp

@@ -1118,7 +1118,7 @@ void Game::PopupElement(irr::gui::IGUIElement * element, int hideframe) {
 }
 void Game::WaitFrameSignal(int frame) {
 	frameSignal.Reset();
-	signalFrame = frame;
+	signalFrame = (gameConf.quick_animation && frame >= 12) ? 12 : frame;
 	frameSignal.Wait();
 }
 void Game::DrawThumb(code_pointer cp, position2di pos, std::unordered_map<int, int>* lflist) {

Classes/gframe/event_handler.cpp

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

Classes/gframe/game.cpp

@@ -447,6 +447,9 @@ bool Game::Initialize() {
 	posY += 60;
 	chkWaitChain = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 25 * yScale), tabHelper, -1, dataManager.GetSysString(1277));
 	chkWaitChain->setChecked(gameConf.chkWaitChain != 0);
+	posY += 60;
+ 	chkQuickAnimation = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 25 * yScale), tabHelper, CHECKBOX_QUICK_ANIMATION, dataManager.GetSysString(1299));
+ 	chkQuickAnimation->setChecked(gameConf.quick_animation != 0);
 	//system
 	irr::gui::IGUITab* tabSystem = wInfos->addTab(dataManager.GetSysString(1273));
 	posY = 20 * xScale;
@@ -1377,6 +1380,7 @@ void Game::LoadConfig() {
 	gameConf.defaultOT = android::getIntSetting(appMain, "defaultOT", 1);
 	//TEST BOT MODE
 	gameConf.enable_bot_mode = 1;
+	gameConf.quick_animation = 0;
 }
 
 void Game::SaveConfig() {
@@ -1439,6 +1443,12 @@ void Game::SaveConfig() {
 		 android::saveIntSetting(appMain, "auto_search_limit", gameConf.auto_search_limit);
 	}
 
+	cur = chkQuickAnimation->isChecked()?1:0;
+    if(cur != gameConf.quick_animation){
+        gameConf.quick_animation = cur;
+         android::saveIntSetting(appMain, "quick_animation", gameConf.quick_animation);
+    }
+
 //gameConf.defaultOT = defaultOT->isChecked()?1:0;
 //    android::saveIntSetting(appMain, "defaultOT", gameConf.defaultOT);
 //gameConf.control_mode = control_mode->isChecked()?1:0;

Classes/gframe/game.h

@@ -44,6 +44,7 @@ struct Config {
 	int chkIgnoreDeckChanges;
 	int defaultOT;
 	int enable_bot_mode;
+	int quick_animation;
 };
 
 struct DuelInfo {
@@ -239,6 +240,7 @@ public:
 	irr::gui::IGUICheckBox* chkRandomPos;
 	irr::gui::IGUICheckBox* chkAutoChain;
 	irr::gui::IGUICheckBox* chkWaitChain;
+	irr::gui::IGUICheckBox* chkQuickAnimation;
 	irr::gui::IGUICheckBox* chkHideSetname;
 	irr::gui::IGUICheckBox* chkHideHintButton;
 	irr::gui::IGUICheckBox* chkIgnoreDeckChanges;
@@ -637,6 +639,7 @@ extern Game* mainGame;
 #define BUTTON_CANCEL_SINGLEPLAY	352
 #define CHECKBOX_AUTO_SEARCH		360
 #define CHECKBOX_DISABLE_CHAT		364
+#define CHECKBOX_QUICK_ANIMATION	369
 #define COMBOBOX_SORTTYPE			370
 #define COMBOBOX_LIMIT				371
 

mobile/assets/data/conf/strings.conf

@@ -317,6 +317,7 @@
 !system 1296 √完成选择
 !system 1297 ※切洗手卡
 !system 1298 辅助功能
+!system 1299 加快动画效果
 !system 1300 禁限卡表：
 !system 1301 卡组列表：
 !system 1302 保存

mobile/build.gradle

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