drag 宣言卡名与卡牌选择列表

可在准备界面刷新黑块

Classes/gframe/client_field.cpp

@@ -15,13 +15,17 @@ ClientField::ClientField() {
 	//drag cardtext and lists
 	is_dragging_cardtext = false;
 	is_dragging_lstLog = false;
-	is_dragging_tabHelper = false;
-	is_dragging_tabSystem = false;
 	is_dragging_lstReplayList = false;
 	is_dragging_lstSinglePlayList = false;
 	is_dragging_lstBotList = false;
 	is_dragging_lstDecks = false;
+	is_dragging_lstANCard = false;
+	is_dragging_CardSelect = false;
+	is_dragging_CardDisplay = false;
+	is_dragging_tabHelper = false;
+	is_dragging_tabSystem = false;
 	dragging_tab_start_pos = 0;
+    dragging_tab_start_x = 0;
 	dragging_tab_start_y = 0;
 
 	hovered_card = 0;

Classes/gframe/client_field.h

@@ -120,13 +120,17 @@ public:
 	irr::gui::IGUIElement* panel;
 	bool is_dragging_cardtext;
 	bool is_dragging_lstLog;
-	bool is_dragging_tabHelper;
-	bool is_dragging_tabSystem;
 	bool is_dragging_lstReplayList;
 	bool is_dragging_lstSinglePlayList;
 	bool is_dragging_lstBotList;
 	bool is_dragging_lstDecks;
-	int dragging_tab_start_pos;
+	bool is_dragging_lstANCard;
+    bool is_dragging_CardSelect;
+    bool is_dragging_CardDisplay;
+    bool is_dragging_tabHelper;
+    bool is_dragging_tabSystem;
+    int dragging_tab_start_pos;
+    int dragging_tab_start_x;
 	int dragging_tab_start_y;
     std::vector<int> ancard;
 	int hovered_controler;

Classes/gframe/game.cpp

@@ -893,7 +893,7 @@ bool Game::Initialize() {
 		chkBotHand = env->addCheckBox(false, rect<s32>(360 * xScale, 140 * yScale, 560 * xScale, 170 * yScale), tabBot, -1, dataManager.GetSysString(1384));
 		chkBotNoCheckDeck = env->addCheckBox(false, rect<s32>(360 * xScale, 180 * yScale, 560 * xScale, 210 * yScale), tabBot, -1, dataManager.GetSysString(1229));
 		chkBotNoShuffleDeck = env->addCheckBox(false, rect<s32>(360 * xScale, 220 * yScale, 560 * xScale, 250 * yScale), tabBot, -1, dataManager.GetSysString(1230));
-	} else { // avoid null pointer
+	} else { // avoid null object reference
 		btnStartBot = env->addButton(rect<s32>(0, 0, 0, 0), wSinglePlay);
 		btnBotCancel = env->addButton(rect<s32>(0, 0, 0, 0), wSinglePlay);
 		btnStartBot->setVisible(false);