添加加速动画快捷按钮

调整效果文字边距
放大左侧卡图

Classes/gframe/deck_con.cpp

@@ -75,6 +75,7 @@ void DeckBuilder::Initialize() {
 	mainGame->btnLeaveGame->setText(dataManager.GetSysString(1306));
 	mainGame->wPallet->setVisible(true);
 	mainGame->imgChat->setVisible(false);
+	mainGame->imgQuickAnimation->setVisible(false);
 	mainGame->btnSideOK->setVisible(false);
 	mainGame->btnSideShuffle->setVisible(false);
 	mainGame->btnSideSort->setVisible(false);
@@ -110,6 +111,7 @@ void DeckBuilder::Terminate() {
 	mainGame->btnLeaveGame->setVisible(false);
     mainGame->wPallet->setVisible(false);
     mainGame->imgChat->setVisible(true);
+    mainGame->imgQuickAnimation->setVisible(true);
     mainGame->wSettings->setVisible(false);
     mainGame->wLogs->setVisible(false);
 	mainGame->PopupElement(mainGame->wMainMenu);

Classes/gframe/event_handler.cpp

@@ -209,6 +209,18 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
                 mainGame->soundManager->EnableMusic(mainGame->chkEnableMusic->isChecked());
 				break;
 			}
+            case BUTTON_QUICK_ANIMIATION: {
+                mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
+                if (mainGame->gameConf.quick_animation) {
+                        mainGame->gameConf.quick_animation = false;
+                        mainGame->imgQuickAnimation->setImage(imageManager.tDoubleX);
+				} else {
+					mainGame->gameConf.quick_animation = true;
+					mainGame->imgQuickAnimation->setImage(imageManager.tOneX);
+				}
+				mainGame->chkQuickAnimation->setChecked(mainGame->gameConf.quick_animation);
+				break;
+            }
 			case BUTTON_CHATTING: {
 			    mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
 				if (mainGame->gameConf.chkIgnore1) {
@@ -2098,7 +2110,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
 					break;
 				}
 				u32 pos = mainGame->scrCardText->getPos();
-				mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth() - 15, mainGame->textFont, mainGame->showingtext, pos);
+				mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth(), mainGame->textFont, mainGame->showingtext, pos);
 				return true;
 				break;
 			}
@@ -2287,7 +2299,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
 	                if(pos < 0) pos = 0;
 	                if(pos > max) pos = max;
 	                mainGame->scrCardText->setPos(pos);
-	                mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth() - 15, mainGame->textFont, mainGame->showingtext, pos);
+	                mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth(), mainGame->textFont, mainGame->showingtext, pos);
 	            }
                 if(is_dragging_lstLog) {
                     if(!mainGame->lstLog->getVerticalScrollBar()->isVisible()) {

Classes/gframe/game.h

@@ -272,7 +272,7 @@ public:
 	irr::gui::CGUITTFont* titleFont;
 	std::map<irr::gui::CGUIImageButton*, int> imageLoading;
 	//card image
-	irr::gui::IGUIImage* wCardImg;
+	irr::gui::IGUIStaticText* wCardImg;
 	irr::gui::IGUIImage* imgCard;
 	//imageButtons pallet
 	irr::gui::IGUIWindow* wPallet;
@@ -285,6 +285,8 @@ public:
 	irr::gui::IGUIButton* btnCloseLog;//
 	//imageButton BGM
 	irr::gui::CGUIImageButton* imgVol;
+    //imageButton Quick Animation
+    irr::gui::CGUIImageButton* imgQuickAnimation;
 	//imageButton Chatting
     irr::gui::CGUIImageButton* imgChat;
 	//Settings
@@ -700,8 +702,8 @@ extern Game* mainGame;
 
 }
 
-#define CARD_IMG_WIDTH		177
-#define CARD_IMG_HEIGHT		254
+#define CARD_IMG_WIDTH		200
+#define CARD_IMG_HEIGHT		290
 #define CARD_THUMB_WIDTH	44
 #define CARD_THUMB_HEIGHT	64
 
@@ -907,6 +909,7 @@ extern Game* mainGame;
 #define CHECKBOX_PREFER_EXPANSION	373
 #define CHECKBOX_DRAW_SINGLE_CHAIN	374
 #define CHECKBOX_LFLIST				375
+#define BUTTON_QUICK_ANIMIATION	    376
 #define BUTTON_BIG_CARD_CLOSE		380
 #define BUTTON_BIG_CARD_ZOOM_IN		381
 #define BUTTON_BIG_CARD_ZOOM_OUT	382

Classes/gframe/image_manager.cpp

@@ -49,6 +49,8 @@ bool ImageManager::Initial(const path dir) {
 	tMute = driver->getTexture((dir + path("/textures/extra/tmute.png")).c_str());
 	tPlay = driver->getTexture((dir + path("/textures/extra/tplay.png")).c_str());
 	tTalk = driver->getTexture((dir + path("/textures/extra/ttalk.png")).c_str());
+	tOneX = driver->getTexture((dir + path("/textures/extra/tonex.png")).c_str());
+	tDoubleX = driver->getTexture((dir + path("/textures/extra/tdoublex.png")).c_str());
 	tShut = driver->getTexture((dir + path("/textures/extra/tshut.png")).c_str());
 	tClose = driver->getTexture((dir + path("/textures/extra/tclose.png")).c_str());
     tTitleBar = driver->getTexture((dir + path("/textures/extra/stitlebar.png")).c_str());

Classes/gframe/image_manager.h

@@ -64,6 +64,8 @@ public:
     irr::video::ITexture* tMute;
     irr::video::ITexture* tPlay;
 	irr::video::ITexture* tTalk;
+	irr::video::ITexture* tOneX;
+	irr::video::ITexture* tDoubleX;
 	irr::video::ITexture* tShut;
 	irr::video::ITexture* tClose;
     irr::video::ITexture* tTitleBar;

mobile/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 21
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
-        versionCode 310090944
+        versionCode 310090945
         versionName "3.10.9"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true