Skip to content

Y
YGOMobile
Commit 1606cb4c authored by fallenstardust's avatar fallenstardust
Browse files
Options

移动wDeckEdit的按钮，使得更容易点击

parent c56aeac1
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 16 deletions
Classes/gframe/deck_con.cpp
View file @ 1606cb4c
...@@ -57,6 +57,10 @@ void DeckBuilder::Initialize() { ...@@ -57,6 +57,10 @@ void DeckBuilder::Initialize() {
mainGame->btnLeaveGame->setVisible(true); mainGame->btnLeaveGame->setVisible(true);
mainGame->btnLeaveGame->setText(dataManager.GetSysString(1306)); mainGame->btnLeaveGame->setText(dataManager.GetSysString(1306));
mainGame->wPallet->setVisible(true); mainGame->wPallet->setVisible(true);
mainGame->btnDeleteDeck->setVisible(true);
mainGame->btnShuffleDeck->setVisible(true);
mainGame->btnSortDeck->setVisible(true);
mainGame->btnClearDeck->setVisible(true);
mainGame->imgChat->setVisible(false); mainGame->imgChat->setVisible(false);
mainGame->imgQuickAnimation->setVisible(false); mainGame->imgQuickAnimation->setVisible(false);
mainGame->btnSideOK->setVisible(false); mainGame->btnSideOK->setVisible(false);
...@@ -77,6 +81,11 @@ void DeckBuilder::Initialize() { ...@@ -77,6 +81,11 @@ void DeckBuilder::Initialize() {
prev_category = mainGame->cbDBCategory->getSelected(); prev_category = mainGame->cbDBCategory->getSelected();
RefreshReadonly(prev_category); RefreshReadonly(prev_category);
RefreshPackListScroll(); RefreshPackListScroll();
wchar_t cate[256];
wchar_t cate_deck[256];
myswprintf(cate, L"%ls%ls", (mainGame->cbDBCategory->getSelected())==2 ? L"" : mainGame->cbDBCategory->getItem(mainGame->cbDBCategory->getSelected()), (mainGame->cbDBCategory->getSelected())==2 ? L"" : L"\n");
myswprintf(cate_deck, L"%ls%ls", cate, mainGame->cbDBDecks->getItem(mainGame->cbDBDecks->getSelected()));
mainGame->btnManageDeck->setText(cate_deck);
prev_operation = 0; prev_operation = 0;
prev_sel = -1; prev_sel = -1;
is_modified = false; is_modified = false;
...@@ -93,6 +102,10 @@ void DeckBuilder::Terminate() { ...@@ -93,6 +102,10 @@ void DeckBuilder::Terminate() {
mainGame->wInfos->setVisible(false); mainGame->wInfos->setVisible(false);
mainGame->btnLeaveGame->setVisible(false); mainGame->btnLeaveGame->setVisible(false);
mainGame->wPallet->setVisible(false); mainGame->wPallet->setVisible(false);
mainGame->btnDeleteDeck->setVisible(false);
mainGame->btnShuffleDeck->setVisible(false);
mainGame->btnSortDeck->setVisible(false);
mainGame->btnClearDeck->setVisible(false);
mainGame->imgChat->setVisible(true); mainGame->imgChat->setVisible(true);
mainGame->imgQuickAnimation->setVisible(true); mainGame->imgQuickAnimation->setVisible(true);
mainGame->wSettings->setVisible(false); mainGame->wSettings->setVisible(false);
...@@ -1020,6 +1033,11 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -1020,6 +1033,11 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->lstDecks->setSelected(0); mainGame->lstDecks->setSelected(0);
mainGame->cbDBCategory->setSelected(catesel); mainGame->cbDBCategory->setSelected(catesel);
ChangeCategory(catesel); ChangeCategory(catesel);
wchar_t cate[256];
wchar_t cate_deck[256];
myswprintf(cate, L"%ls%ls", (mainGame->cbDBCategory->getSelected())==2 ? L"" : mainGame->cbDBCategory->getItem(mainGame->cbDBCategory->getSelected()), (mainGame->cbDBCategory->getSelected())==2 ? L"" : L"\n");
myswprintf(cate_deck, L"%ls%ls", cate, mainGame->cbDBDecks->getItem(mainGame->cbDBDecks->getSelected()));
mainGame->btnManageDeck->setText(cate_deck);
break; break;
} }
case LISTBOX_DECKS: { case LISTBOX_DECKS: {
...@@ -1038,6 +1056,11 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -1038,6 +1056,11 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
deckManager.LoadDeck(filepath, showing_pack); deckManager.LoadDeck(filepath, showing_pack);
RefreshPackListScroll(); RefreshPackListScroll();
prev_deck = decksel; prev_deck = decksel;
wchar_t cate[256];
wchar_t cate_deck[256];
myswprintf(cate, L"%ls%ls", (mainGame->cbDBCategory->getSelected())==2 ? L"" : mainGame->cbDBCategory->getItem(mainGame->cbDBCategory->getSelected()), (mainGame->cbDBCategory->getSelected())==2 ? L"" : L"\n");
myswprintf(cate_deck, L"%ls%ls", cate, mainGame->cbDBDecks->getItem(mainGame->cbDBDecks->getSelected()));
mainGame->btnManageDeck->setText(cate_deck);
break; break;
} }
} }
......
Classes/gframe/game.cpp
View file @ 1606cb4c
...@@ -883,13 +883,12 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -883,13 +883,12 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
btnReset = env->addButton(rect<s32>(0, 540 * yScale , 150 * xScale, 600 * yScale), wCmdMenu, BUTTON_CMD_RESET, dataManager.GetSysString(1162)); btnReset = env->addButton(rect<s32>(0, 540 * yScale , 150 * xScale, 600 * yScale), wCmdMenu, BUTTON_CMD_RESET, dataManager.GetSysString(1162));
ChangeToIGUIImageButton(btnReset, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnReset, imageManager.tButton_S, imageManager.tButton_S_pressed);
//deck edit //deck edit
wDeckEdit = env->addWindow(rect<s32>(309 * xScale, 1 * yScale, 605 * xScale, 130 * yScale), false, L""); wDeckEdit = env->addWindow(rect<s32>(309 * xScale, 1 * yScale, 519 * xScale, 130 * yScale), false, L"");
wDeckEdit->getCloseButton()->setVisible(false); wDeckEdit->getCloseButton()->setVisible(false);
wDeckEdit->setDrawTitlebar(false); wDeckEdit->setDrawTitlebar(false);
wDeckEdit->setVisible(false); wDeckEdit->setVisible(false);
ChangeToIGUIImageWindow(wDeckEdit, &bgDeckEdit, imageManager.tDialog_L); ChangeToIGUIImageWindow(wDeckEdit, &bgDeckEdit, imageManager.tDialog_L);
btnManageDeck = env->addButton(rect<s32>(225 * xScale, 5 * yScale, 290 * xScale, 30 * yScale), wDeckEdit, BUTTON_MANAGE_DECK, dataManager.GetSysString(1460)); btnManageDeck = env->addButton(rect<s32>(10 * xScale, 35 * yScale, 140 * xScale, 75 * yScale), wDeckEdit, BUTTON_MANAGE_DECK, dataManager.GetSysString(1460));
ChangeToIGUIImageButton(btnManageDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
//deck manage //deck manage
wDeckManage = env->addWindow(rect<s32>(530 * xScale, 10 * yScale, 920 * xScale, 460 * yScale), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE); wDeckManage = env->addWindow(rect<s32>(530 * xScale, 10 * yScale, 920 * xScale, 460 * yScale), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE);
wDeckManage->setVisible(false); wDeckManage->setVisible(false);
...@@ -941,26 +940,29 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -941,26 +940,29 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
scrPackCards->setSmallStep(1); scrPackCards->setSmallStep(1);
scrPackCards->setVisible(false); scrPackCards->setVisible(false);
ChangeToIGUIImageButton(btnDMCancel, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnDMCancel, imageManager.tButton_S, imageManager.tButton_S_pressed);
stDBCategory = env->addStaticText(dataManager.GetSysString(1300), rect<s32>(10 * xScale, 9 * yScale, 100 * xScale, 29 * yScale), false, false, wDeckEdit); stDBCategory = env->addStaticText(dataManager.GetSysString(1300), rect<s32>(10 * xScale, 10 * yScale, 60 * xScale, 50 * yScale), false, false, wDeckEdit);
cbDBCategory = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(80 * xScale, 5 * yScale, 220 * xScale, 30 * yScale), wDeckEdit, COMBOBOX_DBCATEGORY); cbDBCategory = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(0, 0, 0, 0), wDeckEdit, COMBOBOX_DBCATEGORY);
cbDBCategory->setMaxSelectionRows(15); cbDBCategory->setMaxSelectionRows(15);
stDeck = env->addStaticText(dataManager.GetSysString(1301), rect<s32>(10 * xScale, 39 * yScale, 100 * xScale, 59 * yScale), false, false, wDeckEdit); cbDBDecks = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(0, 0, 0, 0), wDeckEdit, COMBOBOX_DBDECKS);
cbDBDecks = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(80 * xScale, 35 * yScale, 220 * xScale, 60 * yScale), wDeckEdit, COMBOBOX_DBDECKS);
cbDBDecks->setMaxSelectionRows(15); cbDBDecks->setMaxSelectionRows(15);
btnSaveDeck = env->addButton(rect<s32>(225 * xScale, 35 * yScale, 290 * xScale, 60 * yScale), wDeckEdit, BUTTON_SAVE_DECK, dataManager.GetSysString(1302)); btnSaveDeck = env->addButton(rect<s32>(145 * xScale, 35 * yScale, 200 * xScale, 75 * yScale), wDeckEdit, BUTTON_SAVE_DECK, dataManager.GetSysString(1302));
ChangeToIGUIImageButton(btnSaveDeck, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnSaveDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
ebDeckname = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(80 * xScale, 65 * yScale, 220 * xScale, 90 * yScale), wDeckEdit, -1); ebDeckname = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(10 * xScale, 80 * yScale, 140 * xScale, 120 * yScale), wDeckEdit, -1);
ebDeckname->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); ebDeckname->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
btnSaveDeckAs = env->addButton(rect<s32>(225 * xScale, 65 * yScale, 290 * xScale, 90 * yScale), wDeckEdit, BUTTON_SAVE_DECK_AS, dataManager.GetSysString(1303)); btnSaveDeckAs = env->addButton(rect<s32>(145 * xScale, 80 * yScale, 200 * xScale, 120 * yScale), wDeckEdit, BUTTON_SAVE_DECK_AS, dataManager.GetSysString(1303));
ChangeToIGUIImageButton(btnSaveDeckAs, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnSaveDeckAs, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnDeleteDeck = env->addButton(rect<s32>(10 * xScale, 95 * yScale, 70 * xScale, 116 * yScale), wDeckEdit, BUTTON_DELETE_DECK, dataManager.GetSysString(1308)); btnDeleteDeck = env->addButton(rect<s32>((3 + CARD_IMG_WIDTH) * yScale, 245 * yScale, 310 * yScale, 285 * yScale), 0, BUTTON_DELETE_DECK, dataManager.GetSysString(1308));
ChangeToIGUIImageButton(btnDeleteDeck, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnDeleteDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnShuffleDeck = env->addButton(rect<s32>(130 * xScale, 95 * yScale, 180 * xScale, 116 * yScale), wDeckEdit, BUTTON_SHUFFLE_DECK, dataManager.GetSysString(1307)); btnShuffleDeck = env->addButton(rect<s32>((3 + CARD_IMG_WIDTH) * yScale, 70 * yScale, 310 * yScale, 110 * yScale), 0, BUTTON_SHUFFLE_DECK, dataManager.GetSysString(1307));
ChangeToIGUIImageButton(btnShuffleDeck, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnShuffleDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnSortDeck = env->addButton(rect<s32>(185 * xScale, 95 * yScale, 235 * xScale, 116 * yScale), wDeckEdit, BUTTON_SORT_DECK, dataManager.GetSysString(1305)); btnSortDeck = env->addButton(rect<s32>((3 + CARD_IMG_WIDTH) * yScale, 115 * yScale, 310 * yScale, 155 * yScale), 0, BUTTON_SORT_DECK, dataManager.GetSysString(1305));
ChangeToIGUIImageButton(btnSortDeck, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnSortDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnClearDeck = env->addButton(rect<s32>(240 * xScale, 95 * yScale, 290 * xScale, 116 * yScale), wDeckEdit, BUTTON_CLEAR_DECK, dataManager.GetSysString(1304)); btnClearDeck = env->addButton(rect<s32>((3 + CARD_IMG_WIDTH) * yScale, 160 * yScale, 310 * yScale, 200 * yScale), 0, BUTTON_CLEAR_DECK, dataManager.GetSysString(1304));
ChangeToIGUIImageButton(btnClearDeck, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnClearDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnDeleteDeck->setVisible(false);
btnShuffleDeck->setVisible(false);
btnSortDeck->setVisible(false);
btnClearDeck->setVisible(false);
btnSideOK = env->addButton(rect<s32>(510 * xScale, 40 * yScale, 820 * xScale, 80 * yScale), 0, BUTTON_SIDE_OK, dataManager.GetSysString(1334)); btnSideOK = env->addButton(rect<s32>(510 * xScale, 40 * yScale, 820 * xScale, 80 * yScale), 0, BUTTON_SIDE_OK, dataManager.GetSysString(1334));
ChangeToIGUIImageButton(btnSideOK, imageManager.tButton_L, imageManager.tButton_L_pressed); ChangeToIGUIImageButton(btnSideOK, imageManager.tButton_L, imageManager.tButton_L_pressed);
btnSideOK->setVisible(false); btnSideOK->setVisible(false);
......
mobile/assets/data/conf/strings.conf
View file @ 1606cb4c
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
!system 1297 洗切手卡 !system 1297 洗切手卡
!system 1298 辅助功能 !system 1298 辅助功能
!system 1299 加快动画效果 !system 1299 加快动画效果
!system 1300 卡组分类： !system 1300 卡组：
!system 1301 卡组列表： !system 1301 卡组列表：
!system 1302 保存 !system 1302 保存
!system 1303 另存 !system 1303 另存
......
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