Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 8cfec7e3 authored by fallenstardust's avatar fallenstardust
Browse files
Options

等比缩放card Select与card display 

以x = 660为中轴居中显示
parent aaed1d1c
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
Classes/gframe/client_field.cpp
View file @ 8cfec7e3
......@@ -470,7 +470,7 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) {
mainGame->imageLoading.insert(std::make_pair(mainGame->btnCardSelect[i], selectable_cards[i]->chain_code));
else
mainGame->btnCardSelect[i]->setImage(imageManager.tCover[selectable_cards[i]->controler + 2]);
mainGame->btnCardSelect[i]->setRelativePosition(mainGame->Resize(startpos + i * 125, 65, startpos + 120 + i * 125, 235));
mainGame->btnCardSelect[i]->setRelativePosition(recti((startpos + i * 125) * mainGame->yScale, 65 * mainGame->yScale, (startpos + 120 + i * 125) * mainGame->yScale, 235 * mainGame->yScale));
mainGame->btnCardSelect[i]->setPressed(false);
mainGame->btnCardSelect[i]->setVisible(true);
if(mainGame->dInfo.curMsg != MSG_SORT_CARD) {
......@@ -525,7 +525,7 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) {
mainGame->stCardPos[i]->setBackgroundColor(0xff56649f);
}
mainGame->stCardPos[i]->setVisible(true);
mainGame->stCardPos[i]->setRelativePosition(mainGame->Resize(startpos + i * 125, 40, startpos + 120 + i * 125, 60));
mainGame->stCardPos[i]->setRelativePosition(recti((startpos + 125 * i) * mainGame->yScale, 40 * mainGame->yScale, (startpos + 120 + 125 * i) * mainGame->yScale, 60 * mainGame->yScale));
}
if(selectable_cards.size() <= 5) {
for(int i = selectable_cards.size(); i < 5; ++i) {
......@@ -558,7 +558,7 @@ void ClientField::ShowChainCard() {
mainGame->imageLoading.insert(std::make_pair(mainGame->btnCardSelect[i], selectable_cards[i]->code));
else
mainGame->btnCardSelect[i]->setImage(imageManager.tCover[selectable_cards[i]->controler]);
mainGame->btnCardSelect[i]->setRelativePosition(mainGame->Resize(startpos + i * 125, 65, startpos + 120 + i * 125, 235));
mainGame->btnCardSelect[i]->setRelativePosition(recti((startpos + 125 * i) * mainGame->yScale, 65 * mainGame->yScale, (startpos + 120 + 125 * i) * mainGame->yScale, 235 * mainGame->yScale));
mainGame->btnCardSelect[i]->setPressed(false);
mainGame->btnCardSelect[i]->setVisible(true);
wchar_t formatBuffer[2048];
......@@ -577,7 +577,7 @@ void ClientField::ShowChainCard() {
else mainGame->stCardPos[i]->setBackgroundColor(0xff56649f);
}
mainGame->stCardPos[i]->setVisible(true);
mainGame->stCardPos[i]->setRelativePosition(mainGame->Resize(startpos + i * 125, 40, startpos + 120 + i * 125, 60));
mainGame->stCardPos[i]->setRelativePosition(recti((startpos + 125 * i) * mainGame->yScale, 40 * mainGame->yScale, (startpos + 120 + 125 * i) * mainGame->yScale, 60 * mainGame->yScale));
}
if(selectable_cards.size() <= 5) {
for(int i = selectable_cards.size(); i < 5; ++i) {
......@@ -613,7 +613,7 @@ void ClientField::ShowLocationCard() {
mainGame->imageLoading.insert(std::make_pair(mainGame->btnCardDisplay[i], display_cards[i]->code));
else
mainGame->btnCardDisplay[i]->setImage(imageManager.tCover[display_cards[i]->controler]);
mainGame->btnCardDisplay[i]->setRelativePosition(mainGame->Resize(startpos + i * 125, 65, startpos + 120 + i * 125, 235));
mainGame->btnCardDisplay[i]->setRelativePosition(recti((startpos + 125 * i) * mainGame->yScale, 65 * mainGame->yScale, (startpos + 120 + 125 * i) * mainGame->yScale, 235 * mainGame->yScale));
mainGame->btnCardDisplay[i]->setPressed(false);
mainGame->btnCardDisplay[i]->setVisible(true);
wchar_t formatBuffer[2048];
......@@ -646,7 +646,7 @@ void ClientField::ShowLocationCard() {
mainGame->stDisplayPos[i]->setBackgroundColor(0xff56649f);
}
mainGame->stDisplayPos[i]->setVisible(true);
mainGame->stDisplayPos[i]->setRelativePosition(mainGame->Resize(startpos + i * 125, 40, startpos + 120 + i * 125, 60));
mainGame->stDisplayPos[i]->setRelativePosition(recti((startpos + 125 * i) * mainGame->yScale, 40 * mainGame->yScale, (startpos + 120 + 125 * i) * mainGame->yScale, 60 * mainGame->yScale));
}
if(display_cards.size() <= 5) {
for(int i = display_cards.size(); i < 5; ++i) {
......
Classes/gframe/event_handler.cpp
View file @ 8cfec7e3
......@@ -969,7 +969,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->btnCardSelect[i]->setImage(imageManager.GetTexture(selectable_cards[i + pos]->chain_code));
else
mainGame->btnCardSelect[i]->setImage(imageManager.tCover[selectable_cards[i + pos]->controler]);
mainGame->btnCardSelect[i]->setRelativePosition(rect<s32>((30 + i * 125) * mainGame->xScale, 65 * mainGame->yScale, (30 + 120 + i * 125) * mainGame->xScale, 235 * mainGame->yScale));
mainGame->btnCardSelect[i]->setRelativePosition(rect<s32>((30 + i * 125) * mainGame->yScale, 65 * mainGame->yScale, (30 + 120 + i * 125) * mainGame->yScale, 235 * mainGame->yScale));
// text
wchar_t formatBuffer[2048];
if(mainGame->dInfo.curMsg == MSG_SORT_CARD) {
......@@ -1032,7 +1032,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->btnCardDisplay[i]->setImage(imageManager.GetTexture(display_cards[i + pos]->code));
else
mainGame->btnCardDisplay[i]->setImage(imageManager.tCover[display_cards[i + pos]->controler]);
mainGame->btnCardDisplay[i]->setRelativePosition(rect<s32>((30 + i * 125) * mainGame->xScale, 65 * mainGame->yScale, (30 + 120 + i * 125) * mainGame->xScale, 235 * mainGame->yScale));
mainGame->btnCardDisplay[i]->setRelativePosition(rect<s32>((30 + i * 125) * mainGame->yScale, 65 * mainGame->yScale, (30 + 120 + i * 125) * mainGame->yScale, 235 * mainGame->yScale));
wchar_t formatBuffer[2048];
if(display_cards[i + pos]->location == LOCATION_OVERLAY) {
myswprintf(formatBuffer, L"%ls[%d](%d)",
......
Classes/gframe/game.cpp
View file @ 8cfec7e3
......@@ -775,28 +775,28 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
btnPSDD->setImage(imageManager.tCover[0]);
#ifdef _IRR_ANDROID_PLATFORM_
//card select
wCardSelect = env->addWindow(Resize(320, 55, 1000, 400), false, L"");
wCardSelect = env->addWindow(recti(660 * xScale - 340 * yScale, 55 * yScale, 660 * xScale + 340 * yScale, 400 * yScale), false, L"");
wCardSelect->getCloseButton()->setVisible(false);
wCardSelect->setVisible(false);
ChangeToIGUIImageWindow(wCardSelect, &bgCardSelect, imageManager.tDialog_L);
stCardSelect = env->addStaticText(L"", Resize(20, 10, 660, 40), false, false, wCardSelect, -1, false);
stCardSelect = env->addStaticText(L"", recti(20 * yScale, 10 * yScale, 660 * yScale, 40 * yScale), false, false, wCardSelect, -1, false);
stCardSelect->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
for(int i = 0; i < 5; ++i) {
stCardPos[i] = env->addStaticText(L"", Resize(40 + 125 * i, 40, 139 + 125 * i, 60), true, false, wCardSelect, -1, true);
stCardPos[i] = env->addStaticText(L"", recti((30 + 125 * i) * yScale, 40 * yScale, (150 + 125 * i) * yScale, 60 * yScale), true, false, wCardSelect, -1, true);
stCardPos[i]->setBackgroundColor(0xffffffff);
stCardPos[i]->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
btnCardSelect[i] = irr::gui::CGUIImageButton::addImageButton(env, Resize(30 + 125 * i, 65, 150 + 125 * i, 235), wCardSelect, BUTTON_CARD_0 + i);
btnCardSelect[i] = irr::gui::CGUIImageButton::addImageButton(env, recti((30 + 125 * i) * xScale, 65 * yScale, (150 + 125 * i) * yScale, 235 * yScale), wCardSelect, BUTTON_CARD_0 + i);
btnCardSelect[i]->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.6f * yScale, CARD_IMG_HEIGHT * 0.6f * yScale));
}
scrCardList = env->addScrollBar(true, Resize(30, 245, 650, 285), wCardSelect, SCROLL_CARD_SELECT);
btnSelectOK = env->addButton(Resize(285, 295, 395, 335), wCardSelect, BUTTON_CARD_SEL_OK, dataManager.GetSysString(1211));
scrCardList = env->addScrollBar(true, recti(30 * yScale, 245 * yScale, 650 * yScale, 285 * yScale), wCardSelect, SCROLL_CARD_SELECT);
btnSelectOK = env->addButton(recti((340 - 55) * yScale, 295 * yScale, (340 + 55) * yScale, 335 * yScale), wCardSelect, BUTTON_CARD_SEL_OK, dataManager.GetSysString(1211));
ChangeToIGUIImageButton(btnSelectOK, imageManager.tButton_S, imageManager.tButton_S_pressed);
//card display
wCardDisplay = env->addWindow(Resize(320, 55, 1000, 400), false, L"");
wCardDisplay = env->addWindow(recti(660 * xScale - 340 * yScale, 55 * yScale, 660 * xScale + 340 * yScale, 400 * yScale), false, L"");
wCardDisplay->getCloseButton()->setVisible(false);
wCardDisplay->setVisible(false);
ChangeToIGUIImageWindow(wCardDisplay, &bgCardDisplay, imageManager.tDialog_L);
stCardDisplay = env->addStaticText(L"", Resize(20, 10, 660, 40), false, false, wCardDisplay, -1, false);
stCardDisplay = env->addStaticText(L"", recti(20 * yScale, 10 * yScale, 660 * yScale, 40 * yScale), false, false, wCardDisplay, -1, false);
stCardDisplay->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
for(int i = 0; i < 5; ++i) {
stDisplayPos[i] = env->addStaticText(L"", Resize(30 + 125 * i, 40, 150 + 125 * i, 60), true, false, wCardDisplay, -1, true);
......@@ -805,8 +805,8 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
btnCardDisplay[i] = irr::gui::CGUIImageButton::addImageButton(env, Resize(30 + 125 * i, 65, 150 + 125 * i, 235), wCardDisplay, BUTTON_DISPLAY_0 + i);
btnCardDisplay[i]->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.6f * yScale, CARD_IMG_HEIGHT * 0.6f * yScale));
}
scrDisplayList = env->addScrollBar(true, Resize(30, 245, 650, 285), wCardDisplay, SCROLL_CARD_DISPLAY);
btnDisplayOK = env->addButton(Resize(285, 295, 395, 335), wCardDisplay, BUTTON_CARD_DISP_OK, dataManager.GetSysString(1211));
scrDisplayList = env->addScrollBar(true, recti(30 * yScale, 245 * yScale, 650 * yScale, 285 * yScale), wCardDisplay, SCROLL_CARD_DISPLAY);
btnDisplayOK = env->addButton(recti((340 - 55) * yScale, 295 * yScale, (340 + 55) * yScale, 335 * yScale), wCardDisplay, BUTTON_CARD_DISP_OK, dataManager.GetSysString(1211));
ChangeToIGUIImageButton(btnDisplayOK, imageManager.tButton_S, imageManager.tButton_S_pressed);
#endif
//announce number
......
Classes/gframe/game.h
View file @ 8cfec7e3
......@@ -520,8 +520,8 @@ public:
irr::gui::IGUIImage* bgCardDisplay;
irr::gui::IGUIStaticText* stCardDisplay;
irr::gui::CGUIImageButton* btnCardDisplay[5];
irr::gui::IGUIStaticText *stDisplayPos[5];
irr::gui::IGUIScrollBar *scrDisplayList;
irr::gui::IGUIStaticText* stDisplayPos[5];
irr::gui::IGUIScrollBar* scrDisplayList;
irr::gui::IGUIButton* btnDisplayOK;
//announce number
irr::gui::IGUIWindow* wANNumber;
......
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