Commit bfd96bd6 authored by fallenstardust's avatar fallenstardust

刷新bot decks

parent 50bc82ef
...@@ -1146,6 +1146,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -1146,6 +1146,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
cbBotDeck = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(310 * xScale, 130 * yScale, 530 * xScale, 160 * yScale), tabBot); cbBotDeck = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(310 * xScale, 130 * yScale, 530 * xScale, 160 * yScale), tabBot);
cbBotDeck->setVisible(false); cbBotDeck->setVisible(false);
btnBotDeckSelect = env->addButton(rect<s32>(310 * xScale, 40 * yScale, 530 * xScale, 80 * yScale), tabBot, BUTTON_BOT_DECK_SELECT, L""); btnBotDeckSelect = env->addButton(rect<s32>(310 * xScale, 40 * yScale, 530 * xScale, 80 * yScale), tabBot, BUTTON_BOT_DECK_SELECT, L"");
btnBotDeckSelect->setVisible(false);
cbBotRule = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(310 * xScale, 170 * yScale, 530 * xScale, 200 * yScale), tabBot, COMBOBOX_BOT_RULE); cbBotRule = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(310 * xScale, 170 * yScale, 530 * xScale, 200 * yScale), tabBot, COMBOBOX_BOT_RULE);
cbBotRule->addItem(dataManager.GetSysString(1262)); cbBotRule->addItem(dataManager.GetSysString(1262));
cbBotRule->addItem(dataManager.GetSysString(1263)); cbBotRule->addItem(dataManager.GetSysString(1263));
...@@ -1746,6 +1747,15 @@ void Game::RefreshBot() { ...@@ -1746,6 +1747,15 @@ void Game::RefreshBot() {
SetStaticText(stBotInfo, 200, guiFont, dataManager.GetSysString(1385)); SetStaticText(stBotInfo, 200, guiFont, dataManager.GetSysString(1385));
} else { } else {
RefreshCategoryDeck(cbBotDeckCategory, cbBotDeck); RefreshCategoryDeck(cbBotDeckCategory, cbBotDeck);
wchar_t cate[256];
wchar_t cate_deck[256];
myswprintf(cate, L"%ls%ls", (cbBotDeckCategory->getSelected())==1 ? L"" : cbBotDeckCategory->getItem(cbBotDeckCategory->getSelected()), (cbBotDeckCategory->getSelected())==1 ? L"" : L"|");
if (cbBotDeck->getItemCount() != 0) {
myswprintf(cate_deck, L"%ls%ls", cate, cbBotDeckCategory->getItem(cbBotDeckCategory->getSelected()));
} else {
myswprintf(cate_deck, L"%ls%ls", cate, dataManager.GetSysString(1301));
}
mainGame->btnHostDeckSelect->setText(cate_deck);
} }
} }
void Game::LoadConfig() { void Game::LoadConfig() {
......
...@@ -574,6 +574,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -574,6 +574,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
mainGame->deckBuilder.RefreshDeckList(false); mainGame->deckBuilder.RefreshDeckList(false);
mainGame->lstDecks->setSelected(0); mainGame->lstDecks->setSelected(0);
mainGame->cbCategorySelect->setSelected(catesel); mainGame->cbCategorySelect->setSelected(catesel);
mainGame->cbBotDeckCategory->setSelected(catesel);
ChangeHostPrepareDeckCategory(catesel); ChangeHostPrepareDeckCategory(catesel);
reSetCategoryDeckNameOnButton(mainGame->btnHostDeckSelect, L"|"); reSetCategoryDeckNameOnButton(mainGame->btnHostDeckSelect, L"|");
break; break;
...@@ -585,6 +586,8 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -585,6 +586,8 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
} }
int decksel = mainGame->lstDecks->getSelected(); int decksel = mainGame->lstDecks->getSelected();
mainGame->cbDeckSelect->setSelected(decksel); mainGame->cbDeckSelect->setSelected(decksel);
mainGame->cbBotDeck->setSelected(decksel);
if(decksel == -1) if(decksel == -1)
break; break;
reSetCategoryDeckNameOnButton(mainGame->btnHostDeckSelect, L"|"); reSetCategoryDeckNameOnButton(mainGame->btnHostDeckSelect, L"|");
...@@ -645,13 +648,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -645,13 +648,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
wchar_t fname[256]; wchar_t fname[256];
myswprintf(fname, L"./single/%ls", name); myswprintf(fname, L"./single/%ls", name);
FILE *fp; FILE *fp;
#ifdef _WIN32
fp = _wfopen(fname, L"rb");
#else
char filename[256]; char filename[256];
BufferIO::EncodeUTF8(fname, filename); BufferIO::EncodeUTF8(fname, filename);
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
#endif
if(!fp) { if(!fp) {
mainGame->stSinglePlayInfo->setText(L""); mainGame->stSinglePlayInfo->setText(L"");
break; break;
...@@ -694,6 +695,16 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -694,6 +695,16 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
mainGame->SetStaticText(mainGame->stBotInfo, 200 * mainGame->xScale, mainGame->guiFont, mainGame->botInfo[sel].desc); mainGame->SetStaticText(mainGame->stBotInfo, 200 * mainGame->xScale, mainGame->guiFont, mainGame->botInfo[sel].desc);
mainGame->cbBotDeckCategory->setVisible(mainGame->botInfo[sel].select_deckfile); mainGame->cbBotDeckCategory->setVisible(mainGame->botInfo[sel].select_deckfile);
mainGame->cbBotDeck->setVisible(mainGame->botInfo[sel].select_deckfile); mainGame->cbBotDeck->setVisible(mainGame->botInfo[sel].select_deckfile);
mainGame->btnBotDeckSelect->setVisible(mainGame->botInfo[sel].select_deckfile);
wchar_t cate[256];
wchar_t cate_deck[256];
myswprintf(cate, L"%ls%ls", (mainGame->cbBotDeckCategory->getSelected())==1 ? L"" : mainGame->cbBotDeckCategory->getItem(mainGame->cbBotDeckCategory->getSelected()), (mainGame->cbBotDeckCategory->getSelected())==1 ? L"" : L"|");
if (mainGame->cbBotDeck->getItemCount() != 0) {
myswprintf(cate_deck, L"%ls%ls", cate, mainGame->cbBotDeck->getItem(mainGame->cbBotDeck->getSelected()));
} else {
myswprintf(cate_deck, L"%ls%ls", cate, dataManager.GetSysString(1301));
}
mainGame->btnBotDeckSelect->setText(cate_deck);
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