Skip to content

Y
YGOMobile
Commit 993f5474 authored by fallenstardust's avatar fallenstardust
Browse files
Options

不显示卡包展示时，未分类卡组的值应为1

parent d3c6a367
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
Classes/gframe/duelclient.cpp
View file @ 993f5474
...@@ -501,7 +501,7 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, unsigned int len) { ...@@ -501,7 +501,7 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, unsigned int len) {
mainGame->deckBuilder.prev_deck = mainGame->cbDeckSelect->getSelected(); mainGame->deckBuilder.prev_deck = mainGame->cbDeckSelect->getSelected();
wchar_t cate[256]; wchar_t cate[256];
wchar_t cate_deck[256]; wchar_t cate_deck[256];
myswprintf(cate, L"%ls%ls", (mainGame->cbCategorySelect->getSelected())==2 ? L"" : mainGame->cbCategorySelect->getItem(mainGame->cbCategorySelect->getSelected()), (mainGame->cbCategorySelect->getSelected())==2 ? L"" : L"|"); myswprintf(cate, L"%ls%ls", (mainGame->cbCategorySelect->getSelected())==1 ? L"" : mainGame->cbCategorySelect->getItem(mainGame->cbCategorySelect->getSelected()), (mainGame->cbCategorySelect->getSelected())==1 ? L"" : L"|");
myswprintf(cate_deck, L"%ls%ls", cate, mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected())); myswprintf(cate_deck, L"%ls%ls", cate, mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected()));
mainGame->btnHostDeckSelect->setText(cate_deck); mainGame->btnHostDeckSelect->setText(cate_deck);
if(!mainGame->chkIgnore1->isChecked()) if(!mainGame->chkIgnore1->isChecked())
......
Classes/gframe/game.cpp
View file @ 993f5474
...@@ -1631,7 +1631,7 @@ void Game::RefreshCategoryDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGU ...@@ -1631,7 +1631,7 @@ void Game::RefreshCategoryDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGU
cbCategory->addItem(name); cbCategory->addItem(name);
} }
}); });
if (cbCategory != mainGame->cbCategorySelect) { if (cbCategory == mainGame->cbCategorySelect) {
cbCategory->setSelected(1); cbCategory->setSelected(1);
} else { } else {
cbCategory->setSelected(2); cbCategory->setSelected(2);
......
Classes/gframe/menu_handler.cpp
View file @ 993f5474
...@@ -35,6 +35,10 @@ void UpdateDeck() { ...@@ -35,6 +35,10 @@ void UpdateDeck() {
} }
void ShowHostPrepareDeckManage() { void ShowHostPrepareDeckManage() {
mainGame->RefreshCategoryDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect, false);
mainGame->cbCategorySelect->setSelected(mainGame->deckBuilder.prev_category);
mainGame->RefreshDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect);
mainGame->cbDeckSelect->setSelected(mainGame->deckBuilder.prev_deck);
irr::gui::IGUIListBox* lstCategories = mainGame->lstCategories; irr::gui::IGUIListBox* lstCategories = mainGame->lstCategories;
lstCategories->clear(); lstCategories->clear();
lstCategories->addItem(dataManager.GetSysString(1451)); lstCategories->addItem(dataManager.GetSysString(1451));
...@@ -625,7 +629,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -625,7 +629,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
ChangeHostPrepareDeckCategory(catesel); ChangeHostPrepareDeckCategory(catesel);
wchar_t cate[256]; wchar_t cate[256];
wchar_t cate_deck[256]; wchar_t cate_deck[256];
myswprintf(cate, L"%ls%ls", (mainGame->lstCategories->getSelected())==2 ? L"" : mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()), (mainGame->lstCategories->getSelected())==2 ? L"" : L"|"); myswprintf(cate, L"%ls%ls", (mainGame->lstCategories->getSelected())==1 ? L"" : mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()), (mainGame->lstCategories->getSelected())==1 ? L"" : L"|");
myswprintf(cate_deck, L"%ls%ls", cate, mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected())); myswprintf(cate_deck, L"%ls%ls", cate, mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected()));
mainGame->btnHostDeckSelect->setText(cate_deck); mainGame->btnHostDeckSelect->setText(cate_deck);
break; break;
...@@ -641,7 +645,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -641,7 +645,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
break; break;
wchar_t cate[256]; wchar_t cate[256];
wchar_t cate_deck[256]; wchar_t cate_deck[256];
myswprintf(cate, L"%ls%ls", (mainGame->lstCategories->getSelected())==2 ? L"" : mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()), (mainGame->lstCategories->getSelected())==2 ? L"" : L"|"); myswprintf(cate, L"%ls%ls", (mainGame->lstCategories->getSelected())==1 ? L"" : mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()), (mainGame->lstCategories->getSelected())==1 ? L"" : L"|");
myswprintf(cate_deck, L"%ls%ls", cate, mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected())); myswprintf(cate_deck, L"%ls%ls", cate, mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected()));
mainGame->btnHostDeckSelect->setText(cate_deck); mainGame->btnHostDeckSelect->setText(cate_deck);
mainGame->deckBuilder.RefreshPackListScroll(); mainGame->deckBuilder.RefreshPackListScroll();
......
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