Commit 89c82a6b authored by fallenstardust's avatar fallenstardust

打开ygopro的卡组编辑时根据是否启用genesys模式设置适用的禁卡表

parent 5a0ebe18
......@@ -94,18 +94,31 @@ void DeckBuilder::Initialize() {
mainGame->btnSideShuffle->setVisible(false);
mainGame->btnSideSort->setVisible(false);
mainGame->btnSideReload->setVisible(false);
if (mainGame->gameConf.use_lflist) {
if (mainGame->gameConf.default_lflist >= 0 && mainGame->gameConf.default_lflist < (int)deckManager._lfList.size()) {
filterList = &deckManager._lfList[mainGame->gameConf.default_lflist];
}
else {
mainGame->gameConf.default_lflist = 0;
filterList = &deckManager._lfList.front();
}
}
else {
filterList = &deckManager._lfList.back();
}
if (mainGame->gameConf.enable_genesys_mode) {
if (mainGame->gameConf.use_genesys_lflist) {
if (mainGame->gameConf.default_genesys_lflist >= 0 && mainGame->gameConf.default_genesys_lflist < (int)deckManager._genesys_lfList.size()) {
filterList = &deckManager._genesys_lfList[mainGame->gameConf.default_genesys_lflist];
} else {
mainGame->gameConf.default_genesys_lflist = 0;
filterList = &deckManager._genesys_lfList.front();
}
} else {
filterList = &deckManager._genesys_lfList.back();
}
} else{
if (mainGame->gameConf.use_lflist) {
if (mainGame->gameConf.default_lflist >= 0 && mainGame->gameConf.default_lflist < (int)deckManager._lfList.size()) {
filterList = &deckManager._lfList[mainGame->gameConf.default_lflist];
}
else {
mainGame->gameConf.default_lflist = 0;
filterList = &deckManager._lfList.front();
}
} else {
filterList = &deckManager._lfList.back();
}
}
ClearSearch();
mouse_pos.set(0, 0);
hovered_code = 0;
......
......@@ -1573,7 +1573,7 @@ void Game::DrawThumb(code_pointer cp, irr::core::vector2di pos, const LFList* lf
break;
auto value = credit_entry.second;
driver->draw2DImage(imageManager.tLimit, limitloc, irr::core::recti(0, 64, 64, 128), 0, 0, true);
if (value > -10 || value < 100) {
if (value > -10 || value < 100) {//数字只两个占位符(-9~99)时用攻守数字正好,否则就用更迷你的字体
DrawBoldText(adFont, std::to_wstring(static_cast<int>(value)), limitloc, 0xff00ffff, 0xff00ffff, true, true);
} else {
DrawBoldText(miniFont, std::to_wstring(static_cast<int>(value)), limitloc, 0xff00ffff, 0xff00ffff, true, true);
......
......@@ -350,8 +350,8 @@ bool Game::Initialize(ANDROID_APP app, irr::android::InitOptions *options) {
guiFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, 18 * yScale, isAntialias, true);
titleFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, 32 * yScale, isAntialias, true);
textFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, (int)gameConf.textfontsize * yScale, isAntialias, true);
miniFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, 8 * yScale, isAntialias, true);
icFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, 14 * yScale, isAntialias, true);
miniFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, 8 * yScale, isAntialias, true);//最小的文字,用于genesys点数图标
icFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, 14 * yScale, isAntialias, true);// 图标数字,用于禁限①②的图标
// 检查字体创建是否成功
if(!numFont || !guiFont) {
ALOGW("cc game: add font fail ");
......
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