Skip to content

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

图形化分类展示

parent e618f125
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 23 deletions
Classes/gframe/drawing.cpp
View file @ 2a8e941c
......@@ -1172,23 +1172,17 @@ void Game::DrawDeckBd() {
driver->draw2DRectangle(recti(310 * mainGame->xScale, 160 * mainGame->yScale, 797 * mainGame->xScale, 436 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(309 * mainGame->xScale, 159 * mainGame->yScale, 797 * mainGame->xScale, 436 * mainGame->yScale));
//type count 2DRectangle
driver->draw2DRectangle(recti(555 * mainGame->xScale, 137 * mainGame->yScale, 797 * mainGame->xScale, 157 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(554 * mainGame->xScale, 136 * mainGame->yScale, 797 * mainGame->xScale, 157 * mainGame->yScale));
driver->draw2DRectangle(recti(638 * mainGame->xScale, 137 * mainGame->yScale, 797 * mainGame->xScale, 157 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(637 * mainGame->xScale, 136 * mainGame->yScale, 797 * mainGame->xScale, 157 * mainGame->yScale));
//monster count
textFont->draw(dataManager.GetSysString(1312), recti(557 * mainGame->xScale, 136 * mainGame->yScale, 612 * mainGame->xScale, 156 * mainGame->yScale), 0xfffa5b00, false, true);
textFont->draw(dataManager.GetSysString(1312), recti(556 * mainGame->xScale, 137 * mainGame->yScale, 611 * mainGame->xScale, 157 * mainGame->yScale), 0xffffffff, false, true);
numFont->draw(dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_MONSTER)], recti(612 * mainGame->xScale, 137 * mainGame->yScale, 637 * mainGame->xScale, 157 * mainGame->yScale), 0xff000000, false, true);
numFont->draw(dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_MONSTER)], recti(611 * mainGame->xScale, 138 * mainGame->yScale, 636 * mainGame->xScale, 158 * mainGame->yScale), 0xffffffff, false, true);
driver->draw2DImage(imageManager.tMonster, recti(645 * mainGame->xScale, 136 * mainGame->yScale, 665 * mainGame->xScale, 156 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_MONSTER)], recti(670 * mainGame->xScale, 137 * mainGame->yScale, 690 * mainGame->xScale, 157 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
//spell count
textFont->draw(dataManager.GetSysString(1313), recti(637 * mainGame->xScale, 136 * mainGame->yScale, 692 * mainGame->xScale, 156 * mainGame->yScale), 0xff00fa99, false, true);
textFont->draw(dataManager.GetSysString(1313), recti(636 * mainGame->xScale, 137 * mainGame->yScale, 691 * mainGame->xScale, 157 * mainGame->yScale), 0xffffffff, false, true);
numFont->draw(dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_SPELL)], recti(692 * mainGame->xScale, 137 * mainGame->yScale, 717 * mainGame->xScale, 157 * mainGame->yScale), 0xff000000, false, true);
numFont->draw(dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_SPELL)], recti(691 * mainGame->xScale, 138 * mainGame->yScale, 716 * mainGame->xScale, 158 * mainGame->yScale), 0xffffffff, false, true);
driver->draw2DImage(imageManager.tSpell, recti(695 * mainGame->xScale, 136 * mainGame->yScale, 715 * mainGame->xScale, 156 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_SPELL)], recti(720 * mainGame->xScale, 138 * mainGame->yScale, 740 * mainGame->xScale, 158 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
//trap count
textFont->draw(dataManager.GetSysString(1314), recti(720 * mainGame->xScale, 136 * mainGame->yScale, 740 * mainGame->xScale, 156 * mainGame->yScale), 0xfff41898, false, true);
textFont->draw(dataManager.GetSysString(1314), recti(719 * mainGame->xScale, 137 * mainGame->yScale, 739 * mainGame->xScale, 157 * mainGame->yScale), 0xffffffff, false, true);
numFont->draw(dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_TRAP)], recti(770 * mainGame->xScale, 137 * mainGame->yScale, 790 * mainGame->xScale, 157 * mainGame->yScale), 0xff000000, false, true);
numFont->draw(dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_TRAP)], recti(769 * mainGame->xScale, 138 * mainGame->yScale, 789 * mainGame->xScale, 158 * mainGame->yScale), 0xffffffff, false, true);
driver->draw2DImage(imageManager.tTrap, recti(745 * mainGame->xScale, 136 * mainGame->yScale, 765 * mainGame->xScale, 156 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_TRAP)], recti(770 * mainGame->xScale, 137 * mainGame->yScale, 790 * mainGame->xScale, 157 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
int lx;
float dx;
if(deckManager.current_deck.main.size() <= 40) {
......@@ -1206,16 +1200,27 @@ void Game::DrawDeckBd() {
//extra deck
driver->draw2DRectangle(recti(310 * mainGame->xScale, 440 * mainGame->yScale, 410 * mainGame->xScale, 460 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(309 * mainGame->xScale, 439 * mainGame->yScale, 410 * mainGame->xScale, 460 * mainGame->yScale));
//type count 2DRectangle
driver->draw2DRectangle(recti(610 * mainGame->xScale, 440 * mainGame->yScale, 797 * mainGame->xScale, 460 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(609 * mainGame->xScale, 439 * mainGame->yScale, 797 * mainGame->xScale, 460 * mainGame->yScale));
textFont->draw(dataManager.GetSysString(1331), recti(314 * mainGame->xScale, 439 * mainGame->yScale, 409 * mainGame->xScale, 459 * mainGame->yScale), 0xff000000, false, true);
textFont->draw(dataManager.GetSysString(1331), recti(315 * mainGame->xScale, 440 * mainGame->yScale, 410 * mainGame->xScale, 460 * mainGame->yScale), 0xffffffff, false, true);
numFont->draw(dataManager.numStrings[deckManager.current_deck.extra.size()], recti(379 * mainGame->xScale, 440 * mainGame->yScale, 439 * mainGame->xScale, 460 * mainGame->yScale), 0xff000000, false, true);
numFont->draw(dataManager.numStrings[deckManager.current_deck.extra.size()], recti(380 * mainGame->xScale, 441 * mainGame->yScale, 440 * mainGame->xScale, 461 * mainGame->yScale), 0xffffffff, false, true);
driver->draw2DRectangle(recti(310 * mainGame->xScale, 463 * mainGame->yScale, 797 * mainGame->xScale, 533 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(309 * mainGame->xScale, 462 * mainGame->yScale, 797 * mainGame->xScale, 533 * mainGame->yScale));
//type count 2DRectangle
driver->draw2DRectangle(recti(582 * mainGame->xScale, 440 * mainGame->yScale, 797 * mainGame->xScale, 460 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(581 * mainGame->xScale, 439 * mainGame->yScale, 797 * mainGame->xScale, 460 * mainGame->yScale));
//fusion count
driver->draw2DImage(imageManager.tFusion, recti(595 * mainGame->xScale, 440 * mainGame->yScale, 615 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.extra, TYPE_FUSION)], recti(620 * mainGame->xScale, 440 * mainGame->yScale, 640 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
//synchro count
driver->draw2DImage(imageManager.tSynchro, recti(645 * mainGame->xScale, 440 * mainGame->yScale, 665 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.extra, TYPE_SYNCHRO)], recti(670 * mainGame->xScale, 440 * mainGame->yScale, 690 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
//XYZ count
driver->draw2DImage(imageManager.tXyz, recti(695 * mainGame->xScale, 440 * mainGame->yScale, 715 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.extra, TYPE_XYZ)], recti(720 * mainGame->xScale, 440 * mainGame->yScale, 740 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
//link count
driver->draw2DImage(imageManager.tLink, recti(745 * mainGame->xScale, 440 * mainGame->yScale, 765 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.extra, TYPE_LINK)], recti(770 * mainGame->xScale, 440 * mainGame->yScale, 790 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
if(deckManager.current_deck.extra.size() <= 10)
dx = 436.0f / 9;
else dx = 436.0f / (deckManager.current_deck.extra.size() - 1);
......@@ -1227,16 +1232,24 @@ void Game::DrawDeckBd() {
//side deck
driver->draw2DRectangle(recti(310 * mainGame->xScale, 537 * mainGame->yScale, 410 * mainGame->xScale, 557 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(309 * mainGame->xScale, 536 * mainGame->yScale, 410 * mainGame->xScale, 557 * mainGame->yScale));
//type count 2DRectangle
driver->draw2DRectangle(recti(610 * mainGame->xScale, 537 * mainGame->yScale, 797 * mainGame->xScale, 557 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(609 * mainGame->xScale, 536 * mainGame->yScale, 797 * mainGame->xScale, 557 * mainGame->yScale));
textFont->draw(dataManager.GetSysString(1332), recti(314 * mainGame->xScale, 536 * mainGame->yScale, 409 * mainGame->xScale, 556 * mainGame->yScale), 0xff000000, false, true);
textFont->draw(dataManager.GetSysString(1332), recti(315 * mainGame->xScale, 537 * mainGame->yScale, 410 * mainGame->xScale, 557 * mainGame->yScale), 0xffffffff, false, true);
numFont->draw(dataManager.numStrings[deckManager.current_deck.side.size()], recti(379 * mainGame->xScale, 537 * mainGame->yScale, 439 * mainGame->xScale, 557 * mainGame->yScale), 0xff000000, false, true);
numFont->draw(dataManager.numStrings[deckManager.current_deck.side.size()], recti(380 * mainGame->xScale, 538 * mainGame->yScale, 440 * mainGame->xScale, 558 * mainGame->yScale), 0xffffffff, false, true);
driver->draw2DRectangle(recti(310 * mainGame->xScale, 560 * mainGame->yScale, 797 * mainGame->xScale, 630 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(309 * mainGame->xScale, 559 * mainGame->yScale, 797 * mainGame->xScale, 630 * mainGame->yScale));
//type count 2DRectangle
driver->draw2DRectangle(recti(638 * mainGame->xScale, 537 * mainGame->yScale, 797 * mainGame->xScale, 557 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
driver->draw2DRectangleOutline(recti(637 * mainGame->xScale, 536 * mainGame->yScale, 797 * mainGame->xScale, 557 * mainGame->yScale));
//monster count
driver->draw2DImage(imageManager.tMonster, recti(645 * mainGame->xScale, 537 * mainGame->yScale, 665 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.side, TYPE_MONSTER)], recti(670 * mainGame->xScale, 537 * mainGame->yScale, 690 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
//spell count
driver->draw2DImage(imageManager.tSpell, recti(695 * mainGame->xScale, 537 * mainGame->yScale, 715 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.side, TYPE_SPELL)], recti(720 * mainGame->xScale, 537 * mainGame->yScale, 740 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
//trap count
driver->draw2DImage(imageManager.tTrap, recti(745 * mainGame->xScale, 537 * mainGame->yScale, 765 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.side, TYPE_TRAP)], recti(770 * mainGame->xScale, 537 * mainGame->yScale, 790 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
if(deckManager.current_deck.side.size() <= 10)
dx = 436.0f / 9;
else dx = 436.0f / (deckManager.current_deck.side.size() - 1);
......
Classes/gframe/image_manager.cpp
View file @ 2a8e941c
......@@ -29,6 +29,13 @@ bool ImageManager::Initial(const path dir) {
tHand[2] = driver->getTexture((dir + path("/textures/f3.jpg")).c_str());
tBackGround = driver->getTexture((dir + path("/textures/bg.jpg")).c_str());
tBackGround_menu = driver->getTexture((dir + path("/textures/bg_menu.jpg")).c_str());
tMonster = driver->getTexture((dir + path("/textures/card/monster.png")).c_str());
tSpell = driver->getTexture((dir + path("/textures/card/spell.png")).c_str());
tTrap = driver->getTexture((dir + path("/textures/card/trap.png")).c_str());
tFusion = driver->getTexture((dir + path("/textures/card/fusion.png")).c_str());
tSynchro = driver->getTexture((dir + path("/textures/card/synchro.png")).c_str());
tXyz = driver->getTexture((dir + path("/textures/card/xyz.png")).c_str());
tLink = driver->getTexture((dir + path("/textures/card/link.png")).c_str());
if(!tBackGround_menu)
tBackGround_menu = tBackGround;
tBackGround_deck = driver->getTexture((dir + path("/textures/bg_deck.jpg")).c_str());
......
Classes/gframe/image_manager.h
View file @ 2a8e941c
......@@ -50,6 +50,13 @@ public:
irr::video::ITexture* tRScale[14];
irr::video::ITexture* tLScale[14];
irr::video::ITexture* tClock;
irr::video::ITexture* tMonster;
irr::video::ITexture* tSpell;
irr::video::ITexture* tTrap;
irr::video::ITexture* tFusion;
irr::video::ITexture* tSynchro;
irr::video::ITexture* tXyz;
irr::video::ITexture* tLink;
std::list<std::string> support_types;
};
......
mobile/build.gradle
View file @ 2a8e941c
......@@ -8,7 +8,7 @@ android {
applicationId "cn.garymb.ygomobile"
minSdkVersion 16
targetSdkVersion 22
versionCode 33020615
versionCode 33020616
versionName "3.3.2"
flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true
......
mobile/src/mycard/java/cn/garymb/ygomobile/ui/plus/X5WebView.java
View file @ 2a8e941c
......@@ -54,6 +54,13 @@ public class X5WebView extends WebView {
// this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
// settings 的设计
webSetting.setSaveFormData(true);
webSetting.setDatabaseEnabled(true);
webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);
setHorizontalScrollBarEnabled(false);
webSetting.setAllowContentAccess(true);
webSetting.setMixedContentMode(WebSettings.LOAD_NORMAL);
}
@Override
......
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