Skip to content

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

放大手卡操作按钮 

右移tab滚动条
简化变量
parent 26fe4f43
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 52 deletions
Classes/gframe/client_field.cpp
View file @ b3f64b31
...@@ -12,18 +12,13 @@ namespace ygo { ...@@ -12,18 +12,13 @@ namespace ygo {
ClientField::ClientField() { ClientField::ClientField() {
panel = 0; panel = 0;
//drag cardtext //drag tab
is_dragging_cardtext = false; is_dragging_cardtext = false;
dragging_cardtext_start_pos = 0;
dragging_cardtext_start_y = 0;
//drag tabHelper
is_dragging_tabHelper = false; is_dragging_tabHelper = false;
dragging_tabHelper_start_pos = 0;
dragging_tabHelper_start_y = 0;
//drag tabSystem
is_dragging_tabSystem = false; is_dragging_tabSystem = false;
dragging_tabSystem_start_pos = 0; dragging_tab_start_pos = 0;
dragging_tabSystem_start_y = 0; dragging_tab_start_y = 0;
hovered_card = 0; hovered_card = 0;
clicked_card = 0; clicked_card = 0;
highlighting_card = 0; highlighting_card = 0;
......
Classes/gframe/client_field.h
View file @ b3f64b31
...@@ -119,14 +119,10 @@ public: ...@@ -119,14 +119,10 @@ public:
irr::gui::IGUIElement* panel; irr::gui::IGUIElement* panel;
bool is_dragging_cardtext; bool is_dragging_cardtext;
int dragging_cardtext_start_pos; bool is_dragging_tabHelper;
int dragging_cardtext_start_y; bool is_dragging_tabSystem;
bool is_dragging_tabHelper; int dragging_tab_start_pos;
int dragging_tabHelper_start_pos; int dragging_tab_start_y;
int dragging_tabHelper_start_y;
bool is_dragging_tabSystem;
int dragging_tabSystem_start_pos;
int dragging_tabSystem_start_y;
std::vector<int> ancard; std::vector<int> ancard;
int hovered_controler; int hovered_controler;
int hovered_location; int hovered_location;
......
Classes/gframe/event_handler.cpp
View file @ b3f64b31
...@@ -1983,17 +1983,17 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -1983,17 +1983,17 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
break; break;
} }
is_dragging_cardtext = true; is_dragging_cardtext = true;
dragging_cardtext_start_pos = mainGame->scrCardText->getPos(); dragging_tab_start_pos = mainGame->scrCardText->getPos();
dragging_cardtext_start_y = event.MouseInput.Y; dragging_tab_start_y = event.MouseInput.Y;
return true; return true;
} }
if(root->getElementFromPoint(mousepos) == mainGame->tabHelper){ if(root->getElementFromPoint(mousepos) == mainGame->tabHelper){
if(!mainGame->scrTabHelper->isVisible()) { if(!mainGame->scrTabHelper->isVisible()) {
break; break;
} }
is_dragging_tabHelper = true; is_dragging_tabHelper = true;
dragging_tabHelper_start_pos = mainGame->scrTabHelper->getPos(); dragging_tab_start_pos = mainGame->scrTabHelper->getPos();
dragging_tabHelper_start_y = event.MouseInput.Y; dragging_tab_start_y = event.MouseInput.Y;
return true; return true;
} }
if(root->getElementFromPoint(mousepos) == mainGame->tabSystem){ if(root->getElementFromPoint(mousepos) == mainGame->tabSystem){
...@@ -2001,8 +2001,8 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -2001,8 +2001,8 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
break; break;
} }
is_dragging_tabSystem = true; is_dragging_tabSystem = true;
dragging_tabSystem_start_pos = mainGame->scrTabSystem->getPos(); dragging_tab_start_pos = mainGame->scrTabSystem->getPos();
dragging_tabSystem_start_y = event.MouseInput.Y; dragging_tab_start_y = event.MouseInput.Y;
return true; return true;
} }
break; break;
...@@ -2016,8 +2016,8 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -2016,8 +2016,8 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
break; break;
}//touch the pic of detail to refresh textfonts }//touch the pic of detail to refresh textfonts
is_dragging_cardtext = false; is_dragging_cardtext = false;
is_dragging_tabHelper = false; is_dragging_tabHelper = false;
is_dragging_tabSystem = false; is_dragging_tabSystem = false;
break; break;
} }
case irr::EMIE_MOUSE_MOVED: { case irr::EMIE_MOUSE_MOVED: {
...@@ -2027,7 +2027,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -2027,7 +2027,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
break; break;
} }
int step = mainGame->guiFont->getDimension(L"A").Height + mainGame->guiFont->getKerningHeight(); int step = mainGame->guiFont->getDimension(L"A").Height + mainGame->guiFont->getKerningHeight();
int pos = dragging_cardtext_start_pos + (dragging_cardtext_start_y - event.MouseInput.Y) / step; int pos = dragging_tab_start_pos + (dragging_tab_start_y - event.MouseInput.Y) / step;
int max = mainGame->scrCardText->getMax(); int max = mainGame->scrCardText->getMax();
if(pos < 0) pos = 0; if(pos < 0) pos = 0;
if(pos > max) pos = max; if(pos > max) pos = max;
...@@ -2040,7 +2040,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -2040,7 +2040,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
break; break;
} }
rect<s32> tabHelperpos = mainGame->tabHelper->getRelativePosition(); rect<s32> tabHelperpos = mainGame->tabHelper->getRelativePosition();
int pos = dragging_tabHelper_start_pos + (dragging_tabHelper_start_y - event.MouseInput.Y); int pos = dragging_tab_start_pos + (dragging_tab_start_y - event.MouseInput.Y);
int max = mainGame->scrTabHelper->getMax(); int max = mainGame->scrTabHelper->getMax();
if(pos < 0) pos = 0; if(pos < 0) pos = 0;
if(pos > max) pos = max; if(pos > max) pos = max;
...@@ -2053,7 +2053,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -2053,7 +2053,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
break; break;
} }
rect<s32> tabSystempos = mainGame->tabSystem->getRelativePosition(); rect<s32> tabSystempos = mainGame->tabSystem->getRelativePosition();
int pos = dragging_tabSystem_start_pos + (dragging_tabSystem_start_y - event.MouseInput.Y); int pos = dragging_tab_start_pos + (dragging_tab_start_y - event.MouseInput.Y);
int max = mainGame->scrTabSystem->getMax(); int max = mainGame->scrTabSystem->getMax();
if(pos < 0) pos = 0; if(pos < 0) pos = 0;
if(pos > max) pos = max; if(pos > max) pos = max;
...@@ -2271,28 +2271,28 @@ void ClientField::ShowMenu(int flag, int x, int y) { ...@@ -2271,28 +2271,28 @@ void ClientField::ShowMenu(int flag, int x, int y) {
mainGame->btnActivate->setVisible(true); mainGame->btnActivate->setVisible(true);
mainGame->btnActivate->setRelativePosition(position2di(1, height)); mainGame->btnActivate->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnActivate->setVisible(false); } else mainGame->btnActivate->setVisible(false);
if(flag & COMMAND_SUMMON) { if(flag & COMMAND_SUMMON) {
mainGame->btnSummon->setVisible(true); mainGame->btnSummon->setVisible(true);
mainGame->btnSummon->setRelativePosition(position2di(1, height)); mainGame->btnSummon->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnSummon->setVisible(false); } else mainGame->btnSummon->setVisible(false);
if(flag & COMMAND_SPSUMMON) { if(flag & COMMAND_SPSUMMON) {
mainGame->btnSPSummon->setVisible(true); mainGame->btnSPSummon->setVisible(true);
mainGame->btnSPSummon->setRelativePosition(position2di(1, height)); mainGame->btnSPSummon->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnSPSummon->setVisible(false); } else mainGame->btnSPSummon->setVisible(false);
if(flag & COMMAND_MSET) { if(flag & COMMAND_MSET) {
mainGame->btnMSet->setVisible(true); mainGame->btnMSet->setVisible(true);
mainGame->btnMSet->setRelativePosition(position2di(1, height)); mainGame->btnMSet->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnMSet->setVisible(false); } else mainGame->btnMSet->setVisible(false);
if(flag & COMMAND_SSET) { if(flag & COMMAND_SSET) {
...@@ -2303,7 +2303,7 @@ void ClientField::ShowMenu(int flag, int x, int y) { ...@@ -2303,7 +2303,7 @@ void ClientField::ShowMenu(int flag, int x, int y) {
mainGame->btnSSet->setVisible(true); mainGame->btnSSet->setVisible(true);
mainGame->btnSSet->setRelativePosition(position2di(1, height)); mainGame->btnSSet->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnSSet->setVisible(false); } else mainGame->btnSSet->setVisible(false);
if(flag & COMMAND_REPOS) { if(flag & COMMAND_REPOS) {
...@@ -2316,35 +2316,35 @@ void ClientField::ShowMenu(int flag, int x, int y) { ...@@ -2316,35 +2316,35 @@ void ClientField::ShowMenu(int flag, int x, int y) {
mainGame->btnRepos->setVisible(true); mainGame->btnRepos->setVisible(true);
mainGame->btnRepos->setRelativePosition(position2di(1, height)); mainGame->btnRepos->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnRepos->setVisible(false); } else mainGame->btnRepos->setVisible(false);
if(flag & COMMAND_ATTACK) { if(flag & COMMAND_ATTACK) {
mainGame->btnAttack->setVisible(true); mainGame->btnAttack->setVisible(true);
mainGame->btnAttack->setRelativePosition(position2di(1, height)); mainGame->btnAttack->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnAttack->setVisible(false); } else mainGame->btnAttack->setVisible(false);
if(flag & COMMAND_LIST) { if(flag & COMMAND_LIST) {
mainGame->btnShowList->setVisible(true); mainGame->btnShowList->setVisible(true);
mainGame->btnShowList->setRelativePosition(position2di(1, height)); mainGame->btnShowList->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnShowList->setVisible(false); } else mainGame->btnShowList->setVisible(false);
if(flag & COMMAND_OPERATION) { if(flag & COMMAND_OPERATION) {
mainGame->btnOperation->setVisible(true); mainGame->btnOperation->setVisible(true);
mainGame->btnOperation->setRelativePosition(position2di(1, height)); mainGame->btnOperation->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnOperation->setVisible(false); } else mainGame->btnOperation->setVisible(false);
if(flag & COMMAND_RESET) { if(flag & COMMAND_RESET) {
mainGame->btnReset->setVisible(true); mainGame->btnReset->setVisible(true);
mainGame->btnReset->setRelativePosition(position2di(1, height)); mainGame->btnReset->setRelativePosition(position2di(1, height));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
height += 51 * mainGame->yScale; height += 61 * mainGame->yScale;
#endif #endif
} else mainGame->btnReset->setVisible(false); } else mainGame->btnReset->setVisible(false);
panel = mainGame->wCmdMenu; panel = mainGame->wCmdMenu;
......
Classes/gframe/game.cpp
View file @ b3f64b31
...@@ -658,16 +658,16 @@ bool Game::Initialize() { ...@@ -658,16 +658,16 @@ bool Game::Initialize() {
wCmdMenu->setDrawTitlebar(false); wCmdMenu->setDrawTitlebar(false);
wCmdMenu->setVisible(false); wCmdMenu->setVisible(false);
wCmdMenu->getCloseButton()->setVisible(false); wCmdMenu->getCloseButton()->setVisible(false);
btnActivate = env->addButton(rect<s32>(1 * xScale, 1 * yScale, 105 * xScale, 51 * yScale), wCmdMenu, BUTTON_CMD_ACTIVATE, dataManager.GetSysString(1150)); btnActivate = env->addButton(rect<s32>(1 * xScale, 1 * yScale, 105 * xScale, 61 * yScale), wCmdMenu, BUTTON_CMD_ACTIVATE, dataManager.GetSysString(1150));
btnSummon = env->addButton(rect<s32>(1 * xScale, 52 * yScale, 105 * xScale, 102 * yScale), wCmdMenu, BUTTON_CMD_SUMMON, dataManager.GetSysString(1151)); btnSummon = env->addButton(rect<s32>(1 * xScale, 62 * yScale, 105 * xScale, 122 * yScale), wCmdMenu, BUTTON_CMD_SUMMON, dataManager.GetSysString(1151));
btnSPSummon = env->addButton(rect<s32>(1 * xScale, 103 * yScale, 105 * xScale, 153 * yScale), wCmdMenu, BUTTON_CMD_SPSUMMON, dataManager.GetSysString(1152)); btnSPSummon = env->addButton(rect<s32>(1 * xScale, 123 * yScale, 105 * xScale, 183 * yScale), wCmdMenu, BUTTON_CMD_SPSUMMON, dataManager.GetSysString(1152));
btnMSet = env->addButton(rect<s32>(1 * xScale, 154 * yScale, 105 * xScale, 204 * yScale), wCmdMenu, BUTTON_CMD_MSET, dataManager.GetSysString(1153)); btnMSet = env->addButton(rect<s32>(1 * xScale, 184 * yScale, 105 * xScale, 244 * yScale), wCmdMenu, BUTTON_CMD_MSET, dataManager.GetSysString(1153));
btnSSet = env->addButton(rect<s32>(1 * xScale, 205 * yScale, 105 * xScale, 255 * yScale), wCmdMenu, BUTTON_CMD_SSET, dataManager.GetSysString(1153)); btnSSet = env->addButton(rect<s32>(1 * xScale, 245 * yScale, 105 * xScale, 305 * yScale), wCmdMenu, BUTTON_CMD_SSET, dataManager.GetSysString(1153));
btnRepos = env->addButton(rect<s32>(1 * xScale, 256 * yScale, 105 * xScale, 306 * yScale), wCmdMenu, BUTTON_CMD_REPOS, dataManager.GetSysString(1154)); btnRepos = env->addButton(rect<s32>(1 * xScale, 306 * yScale, 105 * xScale, 366 * yScale), wCmdMenu, BUTTON_CMD_REPOS, dataManager.GetSysString(1154));
btnAttack = env->addButton(rect<s32>(1 * xScale, 307 * yScale, 105 * xScale, 357 * yScale), wCmdMenu, BUTTON_CMD_ATTACK, dataManager.GetSysString(1157)); btnAttack = env->addButton(rect<s32>(1 * xScale, 367 * yScale, 105 * xScale, 427 * yScale), wCmdMenu, BUTTON_CMD_ATTACK, dataManager.GetSysString(1157));
btnShowList = env->addButton(rect<s32>(1 * xScale, 358 * yScale, 105 * xScale, 408 * yScale), wCmdMenu, BUTTON_CMD_SHOWLIST, dataManager.GetSysString(1158)); btnShowList = env->addButton(rect<s32>(1 * xScale, 428 * yScale, 105 * xScale, 488 * yScale), wCmdMenu, BUTTON_CMD_SHOWLIST, dataManager.GetSysString(1158));
btnOperation = env->addButton(rect<s32>(1 * xScale, 409 * yScale, 105 * xScale, 459 * yScale), wCmdMenu, BUTTON_CMD_ACTIVATE, dataManager.GetSysString(1161)); btnOperation = env->addButton(rect<s32>(1 * xScale, 489 * yScale, 105 * xScale, 549 * yScale), wCmdMenu, BUTTON_CMD_ACTIVATE, dataManager.GetSysString(1161));
btnReset = env->addButton(rect<s32>(1 * xScale, 460 * yScale , 105 * xScale, 510 * yScale), wCmdMenu, BUTTON_CMD_RESET, dataManager.GetSysString(1162)); btnReset = env->addButton(rect<s32>(1 * xScale, 550 * yScale , 105 * xScale, 610 * yScale), wCmdMenu, BUTTON_CMD_RESET, dataManager.GetSysString(1162));
//deck edit //deck edit
wDeckEdit = env->addStaticText(L"", rect<s32>(309 * xScale, 1 * yScale, 605 * xScale, 130 * yScale), true, false, 0, -1, true); wDeckEdit = env->addStaticText(L"", rect<s32>(309 * xScale, 1 * yScale, 605 * xScale, 130 * yScale), true, false, 0, -1, true);
wDeckEdit->setVisible(false); wDeckEdit->setVisible(false);
...@@ -1617,14 +1617,14 @@ void Game::ShowCardInfo(int code) { ...@@ -1617,14 +1617,14 @@ void Game::ShowCardInfo(int code) {
stDataInfo->setText(formatBuffer); stDataInfo->setText(formatBuffer);
stSetName->setRelativePosition(rect<s32>(15 * xScale, 83 * yScale, 296 * xScale, 106 * yScale)); stSetName->setRelativePosition(rect<s32>(15 * xScale, 83 * yScale, 296 * xScale, 106 * yScale));
stText->setRelativePosition(rect<s32>(15 * xScale, (83 + offset) * yScale, 287 * xScale, 324 * yScale)); stText->setRelativePosition(rect<s32>(15 * xScale, (83 + offset) * yScale, 287 * xScale, 324 * yScale));
scrCardText->setRelativePosition(rect<s32>(267 * xScale, (83 + offset) * yScale, 287 * xScale, 324 * yScale)); scrCardText->setRelativePosition(rect<s32>(277 * xScale, (83 + offset) * yScale, 297 * xScale, 324 * 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>(15 * xScale, 60 * yScale, 296 * xScale, 83 * yScale)); stSetName->setRelativePosition(rect<s32>(15 * xScale, 60 * yScale, 296 * xScale, 83 * yScale));
stText->setRelativePosition(rect<s32>(15 * xScale, (60 + offset) * yScale, 287 * xScale, 324 * yScale)); stText->setRelativePosition(rect<s32>(15 * xScale, (60 + offset) * yScale, 287 * xScale, 324 * yScale));
scrCardText->setRelativePosition(rect<s32>(267 * xScale, (60 + offset) * yScale, 287 * xScale, 324 * yScale)); scrCardText->setRelativePosition(rect<s32>(277 * xScale, (60 + offset) * yScale, 297 * xScale, 324 * yScale));
} }
showingtext = dataManager.GetText(code); showingtext = dataManager.GetText(code);
const auto& tsize = stText->getRelativePosition(); const auto& tsize = stText->getRelativePosition();
......
mobile/assets/changelog.html
View file @ b3f64b31
...@@ -47,7 +47,9 @@ ...@@ -47,7 +47,9 @@
怪兽-魔法-陷阱顺序排列； 怪兽-魔法-陷阱顺序排列；
8.搜索结果布局微调； 8.搜索结果布局微调；
9.常用设置提前 9.常用设置提前
（启用拓展卡包，决斗助手等） （启用拓展卡包，决斗助手等）；
10.现为点击效果文字区域消除黑块；
11.增大手卡操作按钮；
</pre> </pre>
<h3 style="color:#ff0000">注意</h3> <h3 style="color:#ff0000">注意</h3>
<pre> <pre>
......
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