Skip to content

Y
YGOMobile
Commit 7dfd8173 authored by fallenstardust's avatar fallenstardust
Browse files
Options

适配左侧卡片信息与按钮布局

parent 6a024908
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
Classes/gframe/game.cpp
View file @ 7dfd8173
...@@ -387,27 +387,27 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -387,27 +387,27 @@ bool Game::Initialize(ANDROID_APP app) {
btnEP->setVisible(false); btnEP->setVisible(false);
#endif #endif
//tab（changed） //tab（changed）
wInfos = env->addStaticText(L"", rect<s32>(1 * xScale, 275 * yScale, 260 * xScale, 639 * yScale), true, false, 0, -1, true); wInfos = env->addStaticText(L"", rect<s32>(1 * yScale, 275 * yScale, 305 * yScale, 639 * yScale), true, false, 0, -1, true);
wInfos->setBackgroundColor(0xab11113d); wInfos->setBackgroundColor(0xab11113d);
wInfos->setVisible(false); wInfos->setVisible(false);
//info //info
stName = env->addStaticText(L"", rect<s32>(10 * xScale, 10 * yScale, 246 * xScale, 32 * yScale), true, false, wInfos, -1, false); stName = env->addStaticText(L"", rect<s32>(10 * yScale, 10 * yScale, 295 * xScale, 32 * yScale), true, false, wInfos, -1, false);
stName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); stName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
stInfo = env->addStaticText(L"", rect<s32>(10 * xScale, 37 * yScale, 250 * xScale, 60 * yScale), false, true, wInfos, -1, false); stInfo = env->addStaticText(L"", rect<s32>(10 * yScale, 37 * yScale, 295 * yScale, 60 * yScale), false, true, wInfos, -1, false);
stInfo->setOverrideColor(SColor(255, 149, 211, 137));//255, 0, 0, 255 stInfo->setOverrideColor(SColor(255, 149, 211, 137));//255, 0, 0, 255
stDataInfo = env->addStaticText(L"", rect<s32>(10 * xScale, 60 * yScale, 250 * xScale, 83 * yScale), false, true, wInfos, -1, false); stDataInfo = env->addStaticText(L"", rect<s32>(10 * yScale, 60 * yScale, 295 * yScale, 83 * yScale), false, true, wInfos, -1, false);
stDataInfo->setOverrideColor(SColor(255, 222, 215, 100));//255, 0, 0, 255 stDataInfo->setOverrideColor(SColor(255, 222, 215, 100));//255, 0, 0, 255
stSetName = env->addStaticText(L"", rect<s32>(10 * xScale, 83 * yScale, 250 * xScale, 106 * yScale), false, true, wInfos, -1, false); stSetName = env->addStaticText(L"", rect<s32>(10 * yScale, 83 * yScale, 295 * yScale, 106 * yScale), false, true, wInfos, -1, false);
stSetName->setOverrideColor(SColor(255, 255, 152, 42));//255, 0, 0, 255 stSetName->setOverrideColor(SColor(255, 255, 152, 42));//255, 0, 0, 255
stText = env->addStaticText(L"", rect<s32>(10 * xScale, 106 * yScale, 250 * xScale, 345 * yScale), false, true, wInfos, -1, false); stText = env->addStaticText(L"", rect<s32>(10 * yScale, 106 * yScale, 295 * yScale, 345 * yScale), false, true, wInfos, -1, false);
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
scrCardText = env->addScrollBar(false, rect<s32>(235 * xScale, 106 * yScale, 255 * xScale, 345 * yScale), wInfos, SCROLL_CARDTEXT); scrCardText = env->addScrollBar(false, rect<s32>(275 * yScale, 106 * yScale, 295 * yScale, 345 * yScale), wInfos, SCROLL_CARDTEXT);
#endif #endif
scrCardText->setLargeStep(1); scrCardText->setLargeStep(1);
scrCardText->setSmallStep(1); scrCardText->setSmallStep(1);
scrCardText->setVisible(false); scrCardText->setVisible(false);
//imageButtons pallet //imageButtons pallet
wPallet = env->addWindow(rect<s32>(262 * yScale, 275 * yScale, 307 * yScale, 639 * yScale), false, L""); wPallet = env->addWindow(rect<s32>(262 * xScale, 275 * yScale, 307 * xScale, 639 * yScale), false, L"");
wPallet->getCloseButton()->setVisible(false); wPallet->getCloseButton()->setVisible(false);
wPallet->setDraggable(false); wPallet->setDraggable(false);
wPallet->setDrawTitlebar(false); wPallet->setDrawTitlebar(false);
...@@ -933,14 +933,14 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -933,14 +933,14 @@ bool Game::Initialize(ANDROID_APP app) {
btnRSYes = env->addButton(rect<s32>(70 * xScale, 100 * yScale, 160 * xScale, 150 * yScale), wReplaySave, BUTTON_REPLAY_SAVE, dataManager.GetSysString(1341)); btnRSYes = env->addButton(rect<s32>(70 * xScale, 100 * yScale, 160 * xScale, 150 * yScale), wReplaySave, BUTTON_REPLAY_SAVE, dataManager.GetSysString(1341));
btnRSNo = env->addButton(rect<s32>(180 * xScale, 100 * yScale, 270 * xScale, 150 * yScale), wReplaySave, BUTTON_REPLAY_CANCEL, dataManager.GetSysString(1212)); btnRSNo = env->addButton(rect<s32>(180 * xScale, 100 * yScale, 270 * xScale, 150 * yScale), wReplaySave, BUTTON_REPLAY_CANCEL, dataManager.GetSysString(1212));
//replay control //replay control
wReplayControl = env->addStaticText(L"", rect<s32>(205 * xScale, 48 * yScale, 295 * xScale, 273 * yScale), true, false, 0, -1, true); wReplayControl = env->addStaticText(L"", rect<s32>(200 * yScale, 43 * yScale, 305 * yScale, 273 * yScale), true, false, 0, -1, true);
wReplayControl->setVisible(false); wReplayControl->setVisible(false);
btnReplayStart = env->addButton(rect<s32>(5 * xScale, 5 * yScale, 85 * xScale, 45 * yScale), wReplayControl, BUTTON_REPLAY_START, dataManager.GetSysString(1343)); btnReplayStart = env->addButton(rect<s32>(5 * yScale, 5 * yScale, 100 * yScale, 45 * yScale), wReplayControl, BUTTON_REPLAY_START, dataManager.GetSysString(1343));
btnReplayPause = env->addButton(rect<s32>(5 * xScale, 50 * yScale, 85 * xScale, 90 * yScale), wReplayControl, BUTTON_REPLAY_PAUSE, dataManager.GetSysString(1344)); btnReplayPause = env->addButton(rect<s32>(5 * yScale, 50 * yScale, 100 * yScale, 90 * yScale), wReplayControl, BUTTON_REPLAY_PAUSE, dataManager.GetSysString(1344));
btnReplayStep = env->addButton(rect<s32>(5 * xScale, 95 * yScale, 85 * xScale, 135 * yScale), wReplayControl, BUTTON_REPLAY_STEP, dataManager.GetSysString(1345)); btnReplayStep = env->addButton(rect<s32>(5 * yScale, 95 * yScale, 100 * yScale, 135 * yScale), wReplayControl, BUTTON_REPLAY_STEP, dataManager.GetSysString(1345));
btnReplayUndo = env->addButton(rect<s32>(5 * xScale, 50 * yScale, 85 * xScale, 90 * yScale), wReplayControl, BUTTON_REPLAY_UNDO, dataManager.GetSysString(1360)); btnReplayUndo = env->addButton(rect<s32>(5 * yScale, 50 * yScale, 100 * yScale, 90 * yScale), wReplayControl, BUTTON_REPLAY_UNDO, dataManager.GetSysString(1360));
btnReplaySwap = env->addButton(rect<s32>(5 * xScale, 140 * yScale, 85 * xScale, 180 * yScale), wReplayControl, BUTTON_REPLAY_SWAP, dataManager.GetSysString(1346)); btnReplaySwap = env->addButton(rect<s32>(5 * yScale, 140 * yScale, 100 * yScale, 180 * yScale), wReplayControl, BUTTON_REPLAY_SWAP, dataManager.GetSysString(1346));
btnReplayExit = env->addButton(rect<s32>(5 * xScale, 185 * yScale, 85 * xScale, 225 * yScale), wReplayControl, BUTTON_REPLAY_EXIT, dataManager.GetSysString(1347)); btnReplayExit = env->addButton(rect<s32>(5 * yScale, 185 * yScale, 100 * yScale, 225 * yScale), wReplayControl, BUTTON_REPLAY_EXIT, dataManager.GetSysString(1347));
//chat //chat
imgChat = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(0 * yScale, 319 * yScale, 45 * yScale, 364 * yScale), wPallet, BUTTON_CHATTING); imgChat = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(0 * yScale, 319 * yScale, 45 * yScale, 364 * yScale), wPallet, BUTTON_CHATTING);
imgChat->setImageSize(core::dimension2di(28 * yScale, 28 * yScale)); imgChat->setImageSize(core::dimension2di(28 * yScale, 28 * yScale));
...@@ -956,12 +956,12 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -956,12 +956,12 @@ bool Game::Initialize(ANDROID_APP app) {
wChat->setVisible(false); wChat->setVisible(false);
ebChatInput = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(3 * xScale, 2 * yScale, 710 * xScale, 28 * yScale), wChat, EDITBOX_CHAT); ebChatInput = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(3 * xScale, 2 * yScale, 710 * xScale, 28 * yScale), wChat, EDITBOX_CHAT);
//swap //swap
btnSpectatorSwap = env->addButton(rect<s32>(200 * yScale, 100 * yScale, 307 * yScale, 135 * yScale), 0, BUTTON_REPLAY_SWAP, dataManager.GetSysString(1346)); btnSpectatorSwap = env->addButton(rect<s32>(200 * yScale, 100 * yScale, 305 * yScale, 135 * yScale), 0, BUTTON_REPLAY_SWAP, dataManager.GetSysString(1346));
btnSpectatorSwap->setVisible(false); btnSpectatorSwap->setVisible(false);
//chain buttons //chain buttons
btnChainIgnore = env->addButton(rect<s32>(200 * yScale, 100 * yScale, 307 * yScale, 135 * yScale), 0, BUTTON_CHAIN_IGNORE, dataManager.GetSysString(1292)); btnChainIgnore = env->addButton(rect<s32>(200 * yScale, 100 * yScale, 305 * yScale, 135 * yScale), 0, BUTTON_CHAIN_IGNORE, dataManager.GetSysString(1292));
btnChainAlways = env->addButton(rect<s32>(200 * yScale, 140 * yScale, 307 * yScale, 175 * yScale), 0, BUTTON_CHAIN_ALWAYS, dataManager.GetSysString(1293)); btnChainAlways = env->addButton(rect<s32>(200 * yScale, 140 * yScale, 305 * yScale, 175 * yScale), 0, BUTTON_CHAIN_ALWAYS, dataManager.GetSysString(1293));
btnChainWhenAvail = env->addButton(rect<s32>(200 * yScale, 180 * yScale, 307 * yScale, 215 * yScale), 0, BUTTON_CHAIN_WHENAVAIL, dataManager.GetSysString(1294)); btnChainWhenAvail = env->addButton(rect<s32>(200 * yScale, 180 * yScale, 305 * yScale, 215 * yScale), 0, BUTTON_CHAIN_WHENAVAIL, dataManager.GetSysString(1294));
btnChainIgnore->setIsPushButton(true); btnChainIgnore->setIsPushButton(true);
btnChainAlways->setIsPushButton(true); btnChainAlways->setIsPushButton(true);
btnChainWhenAvail->setIsPushButton(true); btnChainWhenAvail->setIsPushButton(true);
...@@ -969,10 +969,10 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -969,10 +969,10 @@ bool Game::Initialize(ANDROID_APP app) {
btnChainAlways->setVisible(false); btnChainAlways->setVisible(false);
btnChainWhenAvail->setVisible(false); btnChainWhenAvail->setVisible(false);
//shuffle //shuffle
btnShuffle = env->addButton(rect<s32>(200 * yScale, 220 * yScale, 307 * yScale, 255 * yScale), 0, BUTTON_CMD_SHUFFLE, dataManager.GetSysString(1297)); btnShuffle = env->addButton(rect<s32>(200 * yScale, 220 * yScale, 305 * yScale, 255 * yScale), 0, BUTTON_CMD_SHUFFLE, dataManager.GetSysString(1297));
btnShuffle->setVisible(false); btnShuffle->setVisible(false);
//cancel or finish //cancel or finish
btnCancelOrFinish = env->addButton(rect<s32>(200 * yScale, 220 * yScale, 307 * yScale, 275 * yScale), 0, BUTTON_CANCEL_OR_FINISH, dataManager.GetSysString(1295)); btnCancelOrFinish = env->addButton(rect<s32>(200 * yScale, 220 * yScale, 305 * yScale, 275 * yScale), 0, BUTTON_CANCEL_OR_FINISH, dataManager.GetSysString(1295));
btnCancelOrFinish->setVisible(false); btnCancelOrFinish->setVisible(false);
soundManager = Utils::make_unique<SoundManager>(); soundManager = Utils::make_unique<SoundManager>();
if(!soundManager->Init((double)gameConf.sound_volume / 100, (double)gameConf.music_volume / 100, gameConf.enable_sound, gameConf.enable_music, nullptr)) { if(!soundManager->Init((double)gameConf.sound_volume / 100, (double)gameConf.music_volume / 100, gameConf.enable_sound, gameConf.enable_music, nullptr)) {
...@@ -989,7 +989,7 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -989,7 +989,7 @@ bool Game::Initialize(ANDROID_APP app) {
} }
#endif #endif
//leave/surrender/exit //leave/surrender/exit
btnLeaveGame = env->addButton(rect<s32>(200 * yScale, 1 * yScale, 307 * yScale, 80 * yScale), 0, BUTTON_LEAVE_GAME, L""); btnLeaveGame = env->addButton(rect<s32>(200 * yScale, 1 * yScale, 305 * yScale, 80 * yScale), 0, BUTTON_LEAVE_GAME, L"");
btnLeaveGame->setVisible(false); btnLeaveGame->setVisible(false);
//tip //tip
stTip = env->addStaticText(L"", rect<s32>(0, 0, 150 * xScale, 150 * yScale), false, true, 0, -1, true); stTip = env->addStaticText(L"", rect<s32>(0, 0, 150 * xScale, 150 * yScale), false, true, 0, -1, true);
...@@ -997,7 +997,7 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -997,7 +997,7 @@ bool Game::Initialize(ANDROID_APP app) {
stTip->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); stTip->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
stTip->setVisible(false); stTip->setVisible(false);
//tip for cards in select / display list //tip for cards in select / display list
stCardListTip = env->addStaticText(L"", rect<s32>(0, 0, 150, 150), false, true, wCardSelect, TEXT_CARD_LIST_TIP, true); stCardListTip = env->addStaticText(L"", rect<s32>(0, 0, 150 * xScale, 150 * yScale), false, true, wCardSelect, TEXT_CARD_LIST_TIP, true);
stCardListTip->setBackgroundColor(0x6011113d); stCardListTip->setBackgroundColor(0x6011113d);
stCardListTip->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); stCardListTip->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
stCardListTip->setVisible(false); stCardListTip->setVisible(false);
...@@ -1626,16 +1626,16 @@ void Game::ShowCardInfo(int code) { ...@@ -1626,16 +1626,16 @@ void Game::ShowCardInfo(int code) {
wcscat(formatBuffer, scaleBuffer); wcscat(formatBuffer, scaleBuffer);
} }
stDataInfo->setText(formatBuffer); stDataInfo->setText(formatBuffer);
stSetName->setRelativePosition(rect<s32>(10 * xScale, 83 * yScale, 255 * xScale, 106 * yScale)); stSetName->setRelativePosition(rect<s32>(10 * yScale, 83 * yScale, 295 * yScale, 106 * yScale));
stText->setRelativePosition(rect<s32>(10 * xScale, (83 + offset) * yScale, 255 * xScale, 345 * yScale)); stText->setRelativePosition(rect<s32>(10 * yScale, (83 + offset) * yScale, 295 * yScale, 345 * yScale));
scrCardText->setRelativePosition(rect<s32>(235 * xScale, (83 + offset) * yScale, 255 * xScale, 345 * yScale)); scrCardText->setRelativePosition(rect<s32>(277 * yScale, (83 + offset) * yScale, 302 * yScale, 345 * yScale));
} else { } else {
myswprintf(formatBuffer, L"[%ls]", dataManager.FormatType(cd.type)); myswprintf(formatBuffer, L"[%ls]", dataManager.FormatType(cd.type));
stInfo->setText(formatBuffer); stInfo->setText(formatBuffer);
stDataInfo->setText(L""); stDataInfo->setText(L"");
stSetName->setRelativePosition(rect<s32>(10 * xScale, 60 * yScale, 255 * xScale, 83 * yScale)); stSetName->setRelativePosition(rect<s32>(10 * yScale, 60 * yScale, 295 * yScale, 106 * yScale));
stText->setRelativePosition(rect<s32>(10 * xScale, (60 + offset) * yScale, 255 * xScale, 345 * yScale)); stText->setRelativePosition(rect<s32>(10 * yScale, (60 + offset) * yScale, 295 * yScale, 345 * yScale));
scrCardText->setRelativePosition(rect<s32>(235 * xScale, (60 + offset) * yScale, 255 * xScale, 345 * yScale)); scrCardText->setRelativePosition(rect<s32>(277 * yScale, (60 + offset) * yScale, 302 * yScale, 345 * yScale));
} }
showingtext = dataManager.GetText(code); showingtext = dataManager.GetText(code);
const auto& tsize = stText->getRelativePosition(); const auto& tsize = stText->getRelativePosition();
......
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