Skip to content

Y
YGOMobile
Commit 656f834f authored by fallenstardust's avatar fallenstardust
Browse files
Options

卡组管理按钮显示卡组分类名-卡组名

parent 2401731f
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 3 deletions
Classes/gframe/game.cpp
View file @ 656f834f
...@@ -474,8 +474,12 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -474,8 +474,12 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
ChangeToIGUIImageButton(btnHostPrepStart, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnHostPrepStart, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnHostPrepCancel = env->addButton(rect<s32>(440 * xScale, 350 * yScale, 550 * xScale, 390 * yScale), wHostPrepare, BUTTON_HP_CANCEL, dataManager.GetSysString(1210)); btnHostPrepCancel = env->addButton(rect<s32>(440 * xScale, 350 * yScale, 550 * xScale, 390 * yScale), wHostPrepare, BUTTON_HP_CANCEL, dataManager.GetSysString(1210));
ChangeToIGUIImageButton(btnHostPrepCancel, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnHostPrepCancel, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnHostDeckSelect = env->addButton(rect<s32>(300 * xScale, 300 * yScale, 410 * xScale, 340 * yScale), wHostPrepare, BUTTON_HP_DECK_SELECT, L"");
ChangeToIGUIImageButton(btnHostDeckSelect, imageManager.tButton_S, imageManager.tButton_S_pressed); wchar_t cate[256];
wchar_t cate_deck[256];
myswprintf(cate, L"%ls%ls", gameConf.lastcategory == dataManager.GetSysString(1452)? L"" : gameConf.lastcategory, gameConf.lastcategory == dataManager.GetSysString(1452)? L"" : L"-");
myswprintf(cate_deck, L"%ls%ls", cate, gameConf.lastdeck);
btnHostDeckSelect = env->addButton(rect<s32>(320 * xScale, 300 * yScale, 550 * xScale, 340 * yScale), wHostPrepare, BUTTON_HP_DECK_SELECT, cate_deck);
//img always use *yScale to keep proportion //img always use *yScale to keep proportion
wCardImg = env->addStaticText(L"",rect<s32>(1 * yScale, 1 * yScale, ( 2 + CARD_IMG_WIDTH) * yScale, (2 + CARD_IMG_HEIGHT) * yScale), true, false, 0, -1, true); wCardImg = env->addStaticText(L"",rect<s32>(1 * yScale, 1 * yScale, ( 2 + CARD_IMG_WIDTH) * yScale, (2 + CARD_IMG_HEIGHT) * yScale), true, false, 0, -1, true);
......
Classes/gframe/menu_handler.cpp
View file @ 656f834f
...@@ -242,12 +242,14 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -242,12 +242,14 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
DuelClient::SendPacketToServer(CTOS_HS_READY); DuelClient::SendPacketToServer(CTOS_HS_READY);
mainGame->cbCategorySelect->setEnabled(false); mainGame->cbCategorySelect->setEnabled(false);
mainGame->cbDeckSelect->setEnabled(false); mainGame->cbDeckSelect->setEnabled(false);
mainGame->btnHostDeckSelect->setEnabled(false);
break; break;
} }
case BUTTON_HP_NOTREADY: { case BUTTON_HP_NOTREADY: {
DuelClient::SendPacketToServer(CTOS_HS_NOTREADY); DuelClient::SendPacketToServer(CTOS_HS_NOTREADY);
mainGame->cbCategorySelect->setEnabled(true); mainGame->cbCategorySelect->setEnabled(true);
mainGame->cbDeckSelect->setEnabled(true); mainGame->cbDeckSelect->setEnabled(true);
mainGame->btnHostDeckSelect->setEnabled(true);
break; break;
} }
case BUTTON_HP_START: { case BUTTON_HP_START: {
...@@ -622,7 +624,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -622,7 +624,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
mainGame->cbDeckSelect->setSelected(decksel); mainGame->cbDeckSelect->setSelected(decksel);
if(decksel == -1) if(decksel == -1)
break; break;
mainGame->btnHostDeckSelect->setText(mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected())); wchar_t cate[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_deck, L"%ls%ls", cate, mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected()));
mainGame->btnHostDeckSelect->setText(cate_deck);
mainGame->deckBuilder.RefreshPackListScroll(); mainGame->deckBuilder.RefreshPackListScroll();
mainGame->deckBuilder.prev_deck = decksel; mainGame->deckBuilder.prev_deck = decksel;
break; break;
...@@ -754,10 +760,12 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -754,10 +760,12 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
DuelClient::SendPacketToServer(CTOS_HS_READY); DuelClient::SendPacketToServer(CTOS_HS_READY);
mainGame->cbCategorySelect->setEnabled(false); mainGame->cbCategorySelect->setEnabled(false);
mainGame->cbDeckSelect->setEnabled(false); mainGame->cbDeckSelect->setEnabled(false);
mainGame->btnHostDeckSelect->setEnabled(false);
} else { } else {
DuelClient::SendPacketToServer(CTOS_HS_NOTREADY); DuelClient::SendPacketToServer(CTOS_HS_NOTREADY);
mainGame->cbCategorySelect->setEnabled(true); mainGame->cbCategorySelect->setEnabled(true);
mainGame->cbDeckSelect->setEnabled(true); mainGame->cbDeckSelect->setEnabled(true);
mainGame->btnHostDeckSelect->setEnabled(true);
} }
break; break;
} }
......
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