添加创建主机时的genesys禁卡表选择

添加切换genesys时的保存
为genesys禁卡表添加N/A

Classes/gframe/deck_con.cpp

@@ -214,7 +214,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			(mainGame->wQuery->isVisible() && id != BUTTON_YES && id != BUTTON_NO) ||
 			(mainGame->wLinkMarks->isVisible() && id != BUTTON_MARKERS_OK) ||
 			(mainGame->wDMQuery->isVisible() && id != BUTTON_DM_OK && id != BUTTON_DM_CANCEL) ||
-			(mainGame->wDeckManage->isVisible() && !(id >= WINDOW_DECK_MANAGE && id < COMBOBOX_LFLIST)))
+			(mainGame->wDeckManage->isVisible() && !(id >= WINDOW_DECK_MANAGE && (id < COMBOBOX_LFLIST) || id < COMBOBOX_GENESYS_LFLIST)))
 			&& event.GUIEvent.EventType != irr::gui::EGET_LISTBOX_CHANGED
 			&& event.GUIEvent.EventType != irr::gui::EGET_COMBO_BOX_CHANGED) {
 			if(mainGame->wDMQuery->isVisible())

Classes/gframe/deck_manager.cpp

@@ -320,6 +320,7 @@ void DeckManager::LoadLFList(irr::android::InitOptions *options) {
 	nolimit.listName = L"N/A";
 	nolimit.hash = 0;
 	_lfList.push_back(nolimit);
+	_genesys_lfList.push_back(nolimit);
 }
 const wchar_t* DeckManager::GetLFListName(unsigned int lfhash) {
     // 在_lfList中搜索

Classes/gframe/event_handler.cpp

@@ -2148,6 +2148,15 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
 				return true;
 				break;
 			}
+            case COMBOBOX_GENESYS_LFLIST: {
+                mainGame->gameConf.default_genesys_lflist = mainGame->cbGenesysLFlist->getSelected();
+                mainGame->cbHostLFlist->setSelected(mainGame->gameConf.default_genesys_lflist);
+                // 保存最后使用的禁卡表名称
+                BufferIO::CopyWideString(mainGame->cbGenesysLFlist->getItem(mainGame->gameConf.default_genesys_lflist), mainGame->gameConf.last_genesys_limit_list_name);
+                mainGame->deckBuilder.filterList = &deckManager._lfList[mainGame->gameConf.default_genesys_lflist];
+                return true;
+                break;
+            }
 			}
 			break;
 		}

Classes/gframe/game.cpp

@@ -459,7 +459,7 @@ bool Game::Initialize(ANDROID_APP app, irr::android::InitOptions *options) {
         ChangeToIGUIImageWindow(wCreateHost, &bgCreateHost, imageManager.tWindow);
     env->addStaticText(dataManager.GetSysString(1226)/*禁限卡表：*/, Resize(20, 30, 90, 65), false, false, wCreateHost);
     // 局域网建主的禁卡表选择combobox
-    cbHostLFlist = irr::gui::CAndroidGUIComboBox::addAndroidComboBox(env, Resize(110, 25, 260, 65), wCreateHost);
+    cbHostLFlist = irr::gui::CAndroidGUIComboBox::addAndroidComboBox(env, Resize(110, 25, 180, 65), wCreateHost);
 	for(unsigned int i = 0; i < deckManager._lfList.size(); ++i) {
         cbHostLFlist->addItem(deckManager._lfList[i].listName.c_str(), deckManager._lfList[i].hash);
         if(!wcscmp(deckManager._lfList[i].listName.c_str(), gameConf.last_limit_list_name)) {//找到名称相同时找到对应的index值作为默认值
@@ -467,6 +467,15 @@ bool Game::Initialize(ANDROID_APP app, irr::android::InitOptions *options) {
         }
     }
     cbHostLFlist->setSelected(gameConf.use_lflist ? gameConf.default_lflist : cbHostLFlist->getItemCount() - 1);// 设置默认选中的禁限卡表
+    // 局域网建主的禁卡表选择combobox
+    cbHostGenesysLFlist = irr::gui::CAndroidGUIComboBox::addAndroidComboBox(env, Resize(185, 25, 260, 65), wCreateHost);
+	for(unsigned int i = 0; i < deckManager._genesys_lfList.size(); ++i) {
+        cbHostGenesysLFlist->addItem(deckManager._genesys_lfList[i].listName.c_str(), deckManager._genesys_lfList[i].hash);
+        if(!wcscmp(deckManager._genesys_lfList[i].listName.c_str(), gameConf.last_genesys_limit_list_name)) {//找到名称相同时找到对应的index值作为默认值
+            gameConf.default_genesys_lflist = i;
+        }
+    }
+    cbHostGenesysLFlist->setSelected(gameConf.use_genesys_lflist ? gameConf.default_genesys_lflist : cbHostGenesysLFlist->getItemCount() - 1);// 设置默认选中的禁限卡表
     // 局域网建主的卡片允许的选择combobox
 	env->addStaticText(dataManager.GetSysString(1225)/*卡片允许：*/, Resize(20, 75, 100, 110), false, false, wCreateHost);
 	cbRule = irr::gui::CAndroidGUIComboBox::addAndroidComboBox(env, Resize(110, 75, 260, 115), wCreateHost);
@@ -728,11 +737,11 @@ bool Game::Initialize(ANDROID_APP app, irr::android::InitOptions *options) {
     cbLFlist->setEnabled(gameConf.use_lflist);
     cbLFlist->setSelected(gameConf.use_lflist ? gameConf.default_lflist : cbLFlist->getItemCount() - 1);
 	posY += 40;
-    // 勾选启用禁卡表
-    chkGenesysLFlist = env->addCheckBox(false, Resize(posX, posY, posX + 100, posY + 30), wSettings, CHECKBOX_LFLIST, dataManager.GetSysString(1288));
+    // 勾选启用genesys禁卡表
+    chkGenesysLFlist = env->addCheckBox(false, Resize(posX, posY, posX + 100, posY + 30), wSettings, CHECKBOX_GENESYS_LFLIST, dataManager.GetSysString(1288));
     chkGenesysLFlist->setChecked(gameConf.use_genesys_lflist);
-    // 启用禁卡表的combobox
-    cbGenesysLFlist = irr::gui::CAndroidGUIComboBox::addAndroidComboBox(env, Resize(posX + 110, posY, posX + 230, posY + 30), wSettings, COMBOBOX_LFLIST);
+    // 启用genesys禁卡表的combobox
+    cbGenesysLFlist = irr::gui::CAndroidGUIComboBox::addAndroidComboBox(env, Resize(posX + 110, posY, posX + 230, posY + 30), wSettings, COMBOBOX_GENESYS_LFLIST);
     cbGenesysLFlist->setMaxSelectionRows(6);
     for(unsigned int i = 0; i < deckManager._genesys_lfList.size(); ++i) {
         cbGenesysLFlist->addItem(deckManager._genesys_lfList[i].listName.c_str());
@@ -740,7 +749,7 @@ bool Game::Initialize(ANDROID_APP app, irr::android::InitOptions *options) {
             gameConf.default_genesys_lflist = i;
         }
     }
-	posY += 0;
+	posY += 0;//隐藏此布局，因为决斗界面已经有快捷按钮
 	chkIgnore1 = env->addCheckBox(false, Resize(0, 0, 0, 0), wSettings, CHECKBOX_DISABLE_CHAT, dataManager.GetSysString(1290));
 	chkIgnore1->setChecked(gameConf.chkIgnore1 != 0);
 	posY += 40;

Classes/gframe/game.h

@@ -424,6 +424,7 @@ public:
 	irr::gui::IGUIWindow* wCreateHost;
 	irr::gui::IGUIImage* bgCreateHost;
 	irr::gui::IGUIComboBox* cbHostLFlist;
+	irr::gui::IGUIComboBox* cbHostGenesysLFlist;
 	irr::gui::IGUIComboBox* cbMatchMode;
 	irr::gui::IGUIComboBox* cbRule;
 	irr::gui::IGUIEditBox* ebTimeLimit;
@@ -952,6 +953,7 @@ inline std::vector<T> Game::TokenizeString(T input, const T & token) {
 #define BUTTON_DM_CANCEL			342
 #define BUTTON_CLOSE_DECKMANAGER	343
 #define COMBOBOX_LFLIST				349
+#define COMBOBOX_GENESYS_LFLIST		398//genesys禁卡表下拉菜单
 
 #define BUTTON_CLEAR_LOG			350
 #define LISTBOX_LOG					351
@@ -974,6 +976,7 @@ inline std::vector<T> Game::TokenizeString(T input, const T & token) {
 //#define CHECKBOX_PREFER_EXPANSION	373
 #define CHECKBOX_DRAW_SINGLE_CHAIN	374
 #define CHECKBOX_LFLIST				375
+#define CHECKBOX_GENESYS_LFLIST		399//genesys禁卡表勾选
 #define CHECKBOX_HIDE_PLAYER_NAME	376
 #define BUTTON_QUICK_ANIMIATION	    379
 #define BUTTON_BIG_CARD_CLOSE		380