Skip to content

Y
YGOMobile
Commit 4f0abc3b authored by fallenstardust's avatar fallenstardust
Browse files
Options

添加cardSelect说明文字stCardSelect

parent 7f1d8857
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 23 deletions
Classes/gframe/duelclient.cpp
View file @ 4f0abc3b
...@@ -1505,7 +1505,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1505,7 +1505,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
select_hint = 0; select_hint = 0;
if (panelmode) { if (panelmode) {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->wCardSelect->setText(textBuffer); mainGame->stCardSelect->setText(textBuffer);
mainGame->dField.ShowSelectCard(select_ready); mainGame->dField.ShowSelectCard(select_ready);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
} else { } else {
...@@ -1585,7 +1585,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1585,7 +1585,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
select_hint = 0; select_hint = 0;
if (panelmode) { if (panelmode) {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->wCardSelect->setText(textBuffer); mainGame->stCardSelect->setText(textBuffer);
mainGame->dField.ShowSelectCard(mainGame->dField.select_cancelable); mainGame->dField.ShowSelectCard(mainGame->dField.select_cancelable);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
} else { } else {
...@@ -1934,7 +1934,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1934,7 +1934,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
else myswprintf(textBuffer, L"%ls(%d)", dataManager.GetSysString(560), mainGame->dField.select_sumval); else myswprintf(textBuffer, L"%ls(%d)", dataManager.GetSysString(560), mainGame->dField.select_sumval);
select_hint = 0; select_hint = 0;
if(mainGame->dField.select_panalmode) { if(mainGame->dField.select_panalmode) {
mainGame->wCardSelect->setText(textBuffer); mainGame->stCardSelect->setText(textBuffer);
} else { } else {
mainGame->stHintMsg->setText(textBuffer); mainGame->stHintMsg->setText(textBuffer);
mainGame->stHintMsg->setVisible(true); mainGame->stHintMsg->setVisible(true);
...@@ -1961,7 +1961,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1961,7 +1961,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->dField.selectable_cards.push_back(pcard); mainGame->dField.selectable_cards.push_back(pcard);
mainGame->dField.sort_list.push_back(0); mainGame->dField.sort_list.push_back(0);
} }
mainGame->wCardSelect->setText(dataManager.GetSysString(205)); mainGame->stCardSelect->setText(dataManager.GetSysString(205));
mainGame->dField.select_min = 0; mainGame->dField.select_min = 0;
mainGame->dField.select_max = count; mainGame->dField.select_max = count;
mainGame->dField.ShowSelectCard(); mainGame->dField.ShowSelectCard();
...@@ -2134,7 +2134,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2134,7 +2134,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->dField.selectable_cards = panel_confirm; mainGame->dField.selectable_cards = panel_confirm;
myswprintf(textBuffer, dataManager.GetSysString(208), panel_confirm.size()); myswprintf(textBuffer, dataManager.GetSysString(208), panel_confirm.size());
mainGame->wCardSelect->setText(textBuffer); mainGame->stCardSelect->setText(textBuffer);
mainGame->dField.ShowSelectCard(true); mainGame->dField.ShowSelectCard(true);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
mainGame->actionSignal.Reset(); mainGame->actionSignal.Reset();
......
Classes/gframe/event_handler.cpp
View file @ 4f0abc3b
...@@ -498,10 +498,10 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -498,10 +498,10 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
} }
} }
if(!conti_selecting) { if(!conti_selecting) {
mainGame->wCardSelect->setText(dataManager.GetSysString(566)); mainGame->stCardSelect->setText(dataManager.GetSysString(566));
list_command = COMMAND_ACTIVATE; list_command = COMMAND_ACTIVATE;
} else { } else {
mainGame->wCardSelect->setText(dataManager.GetSysString(568)); mainGame->stCardSelect->setText(dataManager.GetSysString(568));
list_command = COMMAND_OPERATION; list_command = COMMAND_OPERATION;
} }
std::sort(selectable_cards.begin(), selectable_cards.end(), ClientCard::client_card_sort); std::sort(selectable_cards.begin(), selectable_cards.end(), ClientCard::client_card_sort);
...@@ -559,7 +559,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -559,7 +559,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
} }
} }
list_command = COMMAND_SPSUMMON; list_command = COMMAND_SPSUMMON;
mainGame->wCardSelect->setText(dataManager.GetSysString(509)); mainGame->stCardSelect->setText(dataManager.GetSysString(509));
ShowSelectCard(); ShowSelectCard();
select_ready = false; select_ready = false;
ShowCancelOrFinishButton(1); ShowCancelOrFinishButton(1);
...@@ -627,7 +627,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -627,7 +627,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for(int32 i = (int32)deck[command_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)deck[command_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(deck[command_controler][i]); selectable_cards.push_back(deck[command_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[command_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[command_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_MZONE: { case LOCATION_MZONE: {
...@@ -635,28 +635,28 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -635,28 +635,28 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for(int32 i = 0; i < (int32)pcard->overlayed.size(); ++i) for(int32 i = 0; i < (int32)pcard->overlayed.size(); ++i)
selectable_cards.push_back(pcard->overlayed[i]); selectable_cards.push_back(pcard->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), pcard->overlayed.size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), pcard->overlayed.size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_GRAVE: { case LOCATION_GRAVE: {
for(int32 i = (int32)grave[command_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)grave[command_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(grave[command_controler][i]); selectable_cards.push_back(grave[command_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[command_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[command_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_REMOVED: { case LOCATION_REMOVED: {
for(int32 i = (int32)remove[command_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)remove[command_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(remove[command_controler][i]); selectable_cards.push_back(remove[command_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[command_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[command_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_EXTRA: { case LOCATION_EXTRA: {
for(int32 i = (int32)extra[command_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)extra[command_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(extra[command_controler][i]); selectable_cards.push_back(extra[command_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[command_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[command_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
} }
...@@ -1152,7 +1152,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1152,7 +1152,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for(int32 i = (int32)deck[hovered_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)deck[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(deck[hovered_controler][i]); selectable_cards.push_back(deck[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_MZONE: { case LOCATION_MZONE: {
...@@ -1161,7 +1161,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1161,7 +1161,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for(int32 i = 0; i < (int32)clicked_card->overlayed.size(); ++i) for(int32 i = 0; i < (int32)clicked_card->overlayed.size(); ++i)
selectable_cards.push_back(clicked_card->overlayed[i]); selectable_cards.push_back(clicked_card->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), clicked_card->overlayed.size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), clicked_card->overlayed.size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_GRAVE: { case LOCATION_GRAVE: {
...@@ -1170,7 +1170,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1170,7 +1170,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for(int32 i = (int32)grave[hovered_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)grave[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(grave[hovered_controler][i]); selectable_cards.push_back(grave[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_REMOVED: { case LOCATION_REMOVED: {
...@@ -1179,7 +1179,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1179,7 +1179,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for(int32 i = (int32)remove[hovered_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)remove[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(remove[hovered_controler][i]); selectable_cards.push_back(remove[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_EXTRA: { case LOCATION_EXTRA: {
...@@ -1188,7 +1188,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1188,7 +1188,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for(int32 i = (int32)extra[hovered_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)extra[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(extra[hovered_controler][i]); selectable_cards.push_back(extra[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
} }
...@@ -1207,7 +1207,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1207,7 +1207,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for(int32 i = 0; i < (int32)clicked_card->overlayed.size(); ++i) for(int32 i = 0; i < (int32)clicked_card->overlayed.size(); ++i)
selectable_cards.push_back(clicked_card->overlayed[i]); selectable_cards.push_back(clicked_card->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), clicked_card->overlayed.size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), clicked_card->overlayed.size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_GRAVE: { case LOCATION_GRAVE: {
...@@ -1216,7 +1216,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1216,7 +1216,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for(int32 i = (int32)grave[hovered_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)grave[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(grave[hovered_controler][i]); selectable_cards.push_back(grave[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_REMOVED: { case LOCATION_REMOVED: {
...@@ -1225,7 +1225,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1225,7 +1225,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for (int32 i = (int32)remove[hovered_controler].size() - 1; i >= 0; --i) for (int32 i = (int32)remove[hovered_controler].size() - 1; i >= 0; --i)
selectable_cards.push_back(remove[hovered_controler][i]); selectable_cards.push_back(remove[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_EXTRA: { case LOCATION_EXTRA: {
...@@ -1234,7 +1234,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1234,7 +1234,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
for (int32 i = (int32)extra[hovered_controler].size() - 1; i >= 0; --i) for (int32 i = (int32)extra[hovered_controler].size() - 1; i >= 0; --i)
selectable_cards.push_back(extra[hovered_controler][i]); selectable_cards.push_back(extra[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->stCardSelect->setText(formatBuffer);
break; break;
} }
} }
...@@ -1838,7 +1838,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1838,7 +1838,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
if(display_cards.size()) { if(display_cards.size()) {
wchar_t formatBuffer[2048]; wchar_t formatBuffer[2048];
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(loc_id), display_cards.size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(loc_id), display_cards.size());
mainGame->wCardDisplay->setText(formatBuffer); mainGame->stCardDisplay->setText(formatBuffer);
ShowLocationCard(); ShowLocationCard();
} }
} }
......
Classes/gframe/game.cpp
View file @ 4f0abc3b
...@@ -664,6 +664,7 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -664,6 +664,7 @@ bool Game::Initialize(ANDROID_APP app) {
btnCardSelect[i]->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.6f * xScale, CARD_IMG_HEIGHT * 0.6f * yScale)); btnCardSelect[i]->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.6f * xScale, CARD_IMG_HEIGHT * 0.6f * yScale));
} }
scrCardList = env->addScrollBar(true, rect<s32>(30 * xScale, 235 * yScale, 650 * xScale, 275 * yScale), wCardSelect, SCROLL_CARD_SELECT); scrCardList = env->addScrollBar(true, rect<s32>(30 * xScale, 235 * yScale, 650 * xScale, 275 * yScale), wCardSelect, SCROLL_CARD_SELECT);
stCardSelect = env->addStaticText(L"", rect<s32>(20 * xScale, 285 * yScale, 270 * xScale, 325 * yScale), false, false, wCardSelect, -1, false);
btnSelectOK = env->addButton(rect<s32>(285 * xScale, 285 * yScale, 395 * xScale, 325 * yScale), wCardSelect, BUTTON_CARD_SEL_OK, dataManager.GetSysString(1211)); btnSelectOK = env->addButton(rect<s32>(285 * xScale, 285 * yScale, 395 * xScale, 325 * yScale), wCardSelect, BUTTON_CARD_SEL_OK, dataManager.GetSysString(1211));
ChangeToIGUIImageButton(btnSelectOK, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnSelectOK, imageManager.tButton_S, imageManager.tButton_S_pressed);
//card display //card display
......
Classes/gframe/game.h
View file @ 4f0abc3b
...@@ -445,6 +445,7 @@ public: ...@@ -445,6 +445,7 @@ public:
//card selection //card selection
irr::gui::IGUIWindow* wCardSelect; irr::gui::IGUIWindow* wCardSelect;
irr::gui::IGUIImage* bgCardSelect; irr::gui::IGUIImage* bgCardSelect;
irr::gui::IGUIStaticText* stCardSelect;
irr::gui::CGUIImageButton* btnCardSelect[5]; irr::gui::CGUIImageButton* btnCardSelect[5];
irr::gui::IGUIStaticText *stCardPos[5]; irr::gui::IGUIStaticText *stCardPos[5];
irr::gui::IGUIScrollBar *scrCardList; irr::gui::IGUIScrollBar *scrCardList;
......
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