Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 495c5da8 authored by fallenstardust's avatar fallenstardust
Browse files
Options

卡组管理的退出按钮

parent 16bccfc7
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 5 deletions
Classes/gframe/deck_con.cpp
View file @ 495c5da8
...@@ -704,6 +704,10 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -704,6 +704,10 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->cbDMCategory->setVisible(false); mainGame->cbDMCategory->setVisible(false);
break; break;
} }
case BUTTON_CLOSE_DECKMANAGER: {
mainGame->HideElement(mainGame->wDeckManage);
break;
}
case BUTTON_SIDE_OK: { case BUTTON_SIDE_OK: {
mainGame->soundEffectPlayer->doPressButton(); mainGame->soundEffectPlayer->doPressButton();
if(deckManager.current_deck.main.size() != pre_mainc || deckManager.current_deck.extra.size() != pre_extrac if(deckManager.current_deck.main.size() != pre_mainc || deckManager.current_deck.extra.size() != pre_extrac
......
Classes/gframe/game.cpp
View file @ 495c5da8
...@@ -631,14 +631,15 @@ bool Game::Initialize() { ...@@ -631,14 +631,15 @@ bool Game::Initialize() {
//deck edit //deck edit
wDeckEdit = env->addStaticText(L"", rect<s32>(309 * xScale, 8 * yScale, 605 * xScale, 130 * yScale), true, false, 0, -1, true); wDeckEdit = env->addStaticText(L"", rect<s32>(309 * xScale, 8 * yScale, 605 * xScale, 130 * yScale), true, false, 0, -1, true);
wDeckEdit->setVisible(false); wDeckEdit->setVisible(false);
btnManageDeck = env->addButton(rect<s32>(225 * xScale, 5 * yScale, 290 * xScale, 30 * yScale), wDeckEdit, BUTTON_MANAGE_DECK, dataManager.GetSysString(1328)); btnManageDeck = env->addButton(rect<s32>(225 * xScale, 5 * yScale, 290 * xScale, 30 * yScale), wDeckEdit, BUTTON_MANAGE_DECK, dataManager.GetSysString(1460));
//deck manage //deck manage
wDeckManage = env->addWindow(rect<s32>(510 * xScale, 100 * yScale, 970 * xScale, 600 * yScale), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE); wDeckManage = env->addWindow(rect<s32>(510 * xScale, 100 * yScale, 970 * xScale, 600 * yScale), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE);
wDeckManage->setVisible(false); wDeckManage->setVisible(false);
lstCategories = env->addListBox(rect<s32>(10 * xScale, 30 * yScale, 140 * xScale, 480 * yScale), wDeckManage, LISTBOX_CATEGORIES, true); wDeckManage->getCloseButton()->setVisible(false);
lstCategories->setItemHeight(22 * yScale); lstCategories = env->addListBox(rect<s32>(10 * xScale, 30 * yScale, 140 * xScale, 530 * yScale), wDeckManage, LISTBOX_CATEGORIES, true);
lstDecks = env->addListBox(rect<s32>(150 * xScale, 30 * yScale, 340 * xScale, 480 * yScale), wDeckManage, LISTBOX_DECKS, true); lstCategories->setItemHeight(25 * yScale);
lstCategories->setItemHeight(22 * yScale); lstDecks = env->addListBox(rect<s32>(150 * xScale, 30 * yScale, 340 * xScale, 530 * yScale), wDeckManage, LISTBOX_DECKS, true);
lstCategories->setItemHeight(25 * yScale);
posY = 30; posY = 30;
btnNewCategory = env->addButton(rect<s32>(350 * xScale, posY * yScale, 450 * xScale, (posY + 40) * yScale), wDeckManage, BUTTON_NEW_CATEGORY, dataManager.GetSysString(1461)); btnNewCategory = env->addButton(rect<s32>(350 * xScale, posY * yScale, 450 * xScale, (posY + 40) * yScale), wDeckManage, BUTTON_NEW_CATEGORY, dataManager.GetSysString(1461));
posY += 50; posY += 50;
...@@ -659,6 +660,8 @@ bool Game::Initialize() { ...@@ -659,6 +660,8 @@ bool Game::Initialize() {
cbLFList = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(350 * xScale, posY * yScale, 450 * xScale, (posY + 40) * yScale), wDeckManage, COMBOBOX_LFLIST); cbLFList = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(350 * xScale, posY * yScale, 450 * xScale, (posY + 40) * yScale), wDeckManage, COMBOBOX_LFLIST);
for(unsigned int i = 0; i < deckManager._lfList.size(); ++i) for(unsigned int i = 0; i < deckManager._lfList.size(); ++i)
cbLFList->addItem(deckManager._lfList[i].listName); cbLFList->addItem(deckManager._lfList[i].listName);
posY += 50;
btnCloseDM = env->addButton(rect<s32>(350 * xScale, posY * yScale, 450 * xScale, (posY + 40) * yScale), wDeckManage, BUTTON_CLOSE_DECKMANAGER, dataManager.GetSysString(1211));
//deck manage query //deck manage query
wDMQuery = env->addWindow(rect<s32>(490 * xScale, 180 * yScale, 840 * xScale, 340 * yScale), false, dataManager.GetSysString(1460)); wDMQuery = env->addWindow(rect<s32>(490 * xScale, 180 * yScale, 840 * xScale, 340 * yScale), false, dataManager.GetSysString(1460));
wDMQuery->getCloseButton()->setVisible(false); wDMQuery->getCloseButton()->setVisible(false);
......
Classes/gframe/game.h
View file @ 495c5da8
...@@ -469,6 +469,7 @@ public: ...@@ -469,6 +469,7 @@ public:
irr::gui::IGUIButton* btnDMDeleteDeck; irr::gui::IGUIButton* btnDMDeleteDeck;
irr::gui::IGUIButton* btnMoveDeck; irr::gui::IGUIButton* btnMoveDeck;
irr::gui::IGUIButton* btnCopyDeck; irr::gui::IGUIButton* btnCopyDeck;
irr::gui::IGUIButton* btnCloseDM;
irr::gui::IGUIWindow* wDMQuery; irr::gui::IGUIWindow* wDMQuery;
irr::gui::IGUIStaticText* stDMMessage; irr::gui::IGUIStaticText* stDMMessage;
irr::gui::IGUIStaticText* stDMMessage2; irr::gui::IGUIStaticText* stDMMessage2;
...@@ -716,6 +717,7 @@ extern Game* mainGame; ...@@ -716,6 +717,7 @@ extern Game* mainGame;
#define LISTBOX_DECKS 340 #define LISTBOX_DECKS 340
#define BUTTON_DM_OK 341 #define BUTTON_DM_OK 341
#define BUTTON_DM_CANCEL 342 #define BUTTON_DM_CANCEL 342
#define BUTTON_CLOSE_DECKMANAGER 343
#define COMBOBOX_LFLIST 349 #define COMBOBOX_LFLIST 349
#define CHECKBOX_AUTO_SEARCH 360 #define CHECKBOX_AUTO_SEARCH 360
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment