Skip to content

Y
YGOMobile
Commit 93187ab5 authored by fallenstardust's avatar fallenstardust
Browse files
Options

移动到drawing绘制genesys计分板 

添加注释
parent 49ca46ba
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 14 deletions
Classes/gframe/deck_con.cpp
View file @ 93187ab5
...@@ -221,7 +221,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -221,7 +221,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
switch(id) { switch(id) {
case BUTTON_CLEAR_DECK: { case BUTTON_CLEAR_DECK: {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->SetStaticText(mainGame->stQMessage, 370, mainGame->guiFont, dataManager.GetSysString(1339)); mainGame->SetStaticText(mainGame->stQMessage, 370, mainGame->guiFont, dataManager.GetSysString(1339)/*是否清空正在编辑的卡组？*/);
mainGame->PopupElement(mainGame->wQuery); mainGame->PopupElement(mainGame->wQuery);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
prev_operation = id; prev_operation = id;
...@@ -295,7 +295,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -295,7 +295,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break; break;
mainGame->gMutex.lock(); mainGame->gMutex.lock();
wchar_t textBuffer[256]; wchar_t textBuffer[256];
myswprintf(textBuffer, L"%ls\n%ls", mainGame->cbDBDecks->getItem(sel), dataManager.GetSysString(1337)); myswprintf(textBuffer, L"%ls\n%ls", mainGame->cbDBDecks->getItem(sel), dataManager.GetSysString(1337)/*是否删除这个卡组？*/);
mainGame->SetStaticText(mainGame->stQMessage, 370 * mainGame->xScale, mainGame->guiFont, textBuffer); mainGame->SetStaticText(mainGame->stQMessage, 370 * mainGame->xScale, mainGame->guiFont, textBuffer);
mainGame->PopupElement(mainGame->wQuery); mainGame->PopupElement(mainGame->wQuery);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
...@@ -307,7 +307,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -307,7 +307,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
case BUTTON_LEAVE_GAME: { case BUTTON_LEAVE_GAME: {
if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) { if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->SetStaticText(mainGame->stQMessage, 370 * mainGame->xScale, mainGame->guiFont, dataManager.GetSysString(1356)); mainGame->SetStaticText(mainGame->stQMessage, 370 * mainGame->xScale, mainGame->guiFont, dataManager.GetSysString(1356)/*此操作将放弃对当前卡组的修改，是否继续？*/);
mainGame->PopupElement(mainGame->wQuery); mainGame->PopupElement(mainGame->wQuery);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
prev_operation = id; prev_operation = id;
...@@ -926,7 +926,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -926,7 +926,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
} }
if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) { if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->SetStaticText(mainGame->stQMessage, 370 * mainGame->xScale, mainGame->guiFont, dataManager.GetSysString(1356)); mainGame->SetStaticText(mainGame->stQMessage, 370 * mainGame->xScale, mainGame->guiFont, dataManager.GetSysString(1356)/*此操作将放弃对当前卡组的修改，是否继续？*/);
mainGame->PopupElement(mainGame->wQuery); mainGame->PopupElement(mainGame->wQuery);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
prev_operation = id; prev_operation = id;
...@@ -942,7 +942,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -942,7 +942,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
} }
if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) { if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->SetStaticText(mainGame->stQMessage, 370 * mainGame-> xScale, mainGame->guiFont, dataManager.GetSysString(1356)); mainGame->SetStaticText(mainGame->stQMessage, 370 * mainGame-> xScale, mainGame->guiFont, dataManager.GetSysString(1356)/*此操作将放弃对当前卡组的修改，是否继续？*/);
mainGame->PopupElement(mainGame->wQuery); mainGame->PopupElement(mainGame->wQuery);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
prev_operation = id; prev_operation = id;
......
Classes/gframe/drawing.cpp
View file @ 93187ab5
...@@ -1637,6 +1637,21 @@ void Game::DrawDeckBd() { ...@@ -1637,6 +1637,21 @@ void Game::DrawDeckBd() {
driver->draw2DImage(imageManager.tCardType, Resize(745, 136, 745+14+3/8, 156), irr::core::recti(46, 0, 69, 32), 0, 0, true); driver->draw2DImage(imageManager.tCardType, Resize(745, 136, 745+14+3/8, 156), irr::core::recti(46, 0, 69, 32), 0, 0, true);
DrawShadowText(numFont, dataManager.GetNumString(deckManager.TypeCount(deckManager.current_deck.main, TYPE_TRAP)), Resize(770, 137, 790, 157), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false); DrawShadowText(numFont, dataManager.GetNumString(deckManager.TypeCount(deckManager.current_deck.main, TYPE_TRAP)), Resize(770, 137, 790, 157), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false);
// 显示“限”的文字图标
auto it = deckBuilder.filterList->credit_limits.find(L"genesys");
if (it != deckBuilder.filterList->credit_limits.end()) {
uint32_t value = it->second;
DrawShadowText(guiFont, &L""[value], Resize(475, 136, 500, 156), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true,true);
DrawShadowText(guiFont, L"限", Resize(450, 136, 470, 156), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true,true);
// Genesys计分板背景
driver->draw2DRectangle(Resize(450, 137, 600, 157), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
// Genesys计分板外框
driver->draw2DRectangleOutline(Resize(450, 136, 600, 157));
}
DrawShadowText(numFont, dataManager.GetNumString(deckManager.TypeCount(deckManager.current_deck.main, TYPE_MONSTER)), Resize(670, 137, 690, 157), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false);
// 计算主卡组每行显示的列数和间距 // 计算主卡组每行显示的列数和间距
int lx; // 每行显示的列数 int lx; // 每行显示的列数
int dy = 68; // 每行之间的垂直间距，默认为68像素 int dy = 68; // 每行之间的垂直间距，默认为68像素
...@@ -1674,7 +1689,7 @@ void Game::DrawDeckBd() { ...@@ -1674,7 +1689,7 @@ void Game::DrawDeckBd() {
driver->draw2DRectangleOutline(Resize(309, 439, 410, 460)); driver->draw2DRectangleOutline(Resize(309, 439, 410, 460));
// 显示“额外卡组”标题 // 显示“额外卡组”标题
DrawShadowText(guiFont, dataManager.GetSysString(1331), Resize(300, 439, 395, 459), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0); DrawShadowText(guiFont, dataManager.GetSysString(1331), Resize(310, 439, 395, 459), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
// 显示额外卡组数量 // 显示额外卡组数量
DrawShadowText(numFont, dataManager.GetNumString(deckManager.current_deck.extra.size()), Resize(360, 440, 420, 460), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0); DrawShadowText(numFont, dataManager.GetNumString(deckManager.current_deck.extra.size()), Resize(360, 440, 420, 460), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
......
Classes/gframe/game.cpp
View file @ 93187ab5
...@@ -1005,14 +1005,6 @@ bool Game::Initialize(ANDROID_APP app, irr::android::InitOptions *options) { ...@@ -1005,14 +1005,6 @@ bool Game::Initialize(ANDROID_APP app, irr::android::InitOptions *options) {
ChangeToIGUIImageWindow(wDeckEdit, &bgDeckEdit, imageManager.tDialog_L); ChangeToIGUIImageWindow(wDeckEdit, &bgDeckEdit, imageManager.tDialog_L);
btnManageDeck = env->addButton(Resize(10, 35, 220, 75), wDeckEdit, BUTTON_MANAGE_DECK, dataManager.GetSysString(1460)/*卡组管理（其实它实际会显示分类名\n卡组名）*/); btnManageDeck = env->addButton(Resize(10, 35, 220, 75), wDeckEdit, BUTTON_MANAGE_DECK, dataManager.GetSysString(1460)/*卡组管理（其实它实际会显示分类名\n卡组名）*/);
stGenesysLimit = env->addStaticText(L"限", Resize_Y(25, 5, 50, 30), true, false, wDeckEdit, -1,true);
stGenesysLimit_Num = env->addStaticText(L"000", Resize_Y(55, 5, 85, 30), false, false, wDeckEdit, -1,true);
stGenesysCount = env->addStaticText(L"计", Resize_Y(90, 5, 115, 30), true, false, wDeckEdit, -1,true);
stGenesysCount_Num = env->addStaticText(L"000", Resize_Y(120, 5, 150, 30), false, false, wDeckEdit, -1,true);
stGenesysRemain = env->addStaticText(L"余", Resize_Y(155, 5, 180, 30), true, false, wDeckEdit, -1,true);
stGenesysRemain_Num = env->addStaticText(L"000", Resize_Y(185, 5, 215, 30), false, false, wDeckEdit, -1,true);
stGenesysSignal = env->addStaticText(L"GENESYS", Resize_Y(220, 5, 290, 30), true, false, wDeckEdit, -1,true);
//deck manage //deck manage
wDeckManage = env->addWindow(Resize(530, 10, 920, 460), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE); wDeckManage = env->addWindow(Resize(530, 10, 920, 460), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE);
wDeckManage->setVisible(false); wDeckManage->setVisible(false);
......
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