Skip to content

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

Merge branch 'master' of https://gitee.com/bdnh/hippo

parents f31b1c40 e8623897
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 9 deletions
Classes/gframe/drawing.cpp
View file @ a6adaf53
...@@ -519,14 +519,20 @@ void Game::DrawMisc() { ...@@ -519,14 +519,20 @@ void Game::DrawMisc() {
DrawSelectionLine(btnCancelOrFinish, 4, 0xff00ff00); DrawSelectionLine(btnCancelOrFinish, 4, 0xff00ff00);
//lp bar //lp bar
if((dInfo.turn % 2 && dInfo.isFirst) || (!(dInfo.turn % 2) && !dInfo.isFirst)) { if((dInfo.turn % 2 && dInfo.isFirst) || (!(dInfo.turn % 2) && !dInfo.isFirst)) {
driver->draw2DRectangle(0xa0000000, recti(327 * mainGame->xScale, 8 * mainGame->yScale, 630 * mainGame->xScale, 51 * mainGame->yScale)); driver->draw2DImage(imageManager.tLPBarFrame, recti(327 * mainGame->xScale, 8 * mainGame->yScale, 630 * mainGame->xScale, 51 * mainGame->yScale), recti(0, 0, 305, 70), 0, 0, true);
driver->draw2DRectangleOutline(recti(327 * mainGame->xScale, 8 * mainGame->yScale, 630 * mainGame->xScale, 51 * mainGame->yScale), 0xffff8080); driver->draw2DImage(imageManager.tLPBarFrame, recti(689 * mainGame->xScale, 8 * mainGame->yScale, 991 * mainGame->xScale, 51 * mainGame->yScale), recti(0, 210, 305, 280), 0, 0, true);
//driver->draw2DRectangle(0xa0000000, recti(327 * mainGame->xScale, 8 * mainGame->yScale, 630 * mainGame->xScale, 51 * mainGame->yScale));
//driver->draw2DRectangleOutline(recti(327 * mainGame->xScale, 8 * mainGame->yScale, 630 * mainGame->xScale, 51 * mainGame->yScale), 0xffff8080);
} else { } else {
driver->draw2DRectangle(0xa0000000, recti(689 * mainGame->xScale, 8 * mainGame->yScale, 991 * mainGame->xScale, 51 * mainGame->yScale)); driver->draw2DImage(imageManager.tLPBarFrame, recti(327 * mainGame->xScale, 8 * mainGame->yScale, 630 * mainGame->xScale, 51 * mainGame->yScale), recti(0, 70, 305, 140), 0, 0, true);
driver->draw2DRectangleOutline(recti(689 * mainGame->xScale, 8 * mainGame->yScale, 991 * mainGame->xScale, 51 * mainGame->yScale), 0xffff8080); driver->draw2DImage(imageManager.tLPBarFrame, recti(689 * mainGame->xScale, 8 * mainGame->yScale, 991 * mainGame->xScale, 51 * mainGame->yScale), recti(0, 140, 305, 210), 0, 0, true);
} //driver->draw2DRectangle(0xa0000000, recti(689 * mainGame->xScale, 8 * mainGame->yScale, 991 * mainGame->xScale, 51 * mainGame->yScale));
driver->draw2DImage(imageManager.tLPFrame, recti(330 * mainGame->xScale, 10 * mainGame->yScale, 629 * mainGame->xScale, 30 * mainGame->yScale), recti(0, 0, 200, 20), 0, 0, true); //driver->draw2DRectangleOutline(recti(689 * mainGame->xScale, 8 * mainGame->yScale, 991 * mainGame->xScale, 51 * mainGame->yScale), 0xffff8080);
driver->draw2DImage(imageManager.tLPFrame, recti(691 * mainGame->xScale, 10 * mainGame->yScale, 990 * mainGame->xScale, 30 * mainGame->yScale), recti(0, 0, 200, 20), 0, 0, true); }
driver->draw2DImage(imageManager.tAvatar[0], recti(330 * mainGame->xScale, 10 * mainGame->yScale, 398 * mainGame->xScale, 78 * mainGame->yScale), recti(0, 0, 68, 68), 0, 0, true);
driver->draw2DImage(imageManager.tAvatar[1], recti(922 * mainGame->xScale, 10 * mainGame->yScale, 990 * mainGame->xScale, 78 * mainGame->yScale), recti(0, 0, 68, 68), 0, 0, true);
driver->draw2DImage(imageManager.tLPFrame, recti(400 * mainGame->xScale, 10 * mainGame->yScale, 629 * mainGame->xScale, 30 * mainGame->yScale), recti(0, 0, 200, 20), 0, 0, true);
driver->draw2DImage(imageManager.tLPFrame, recti(691 * mainGame->xScale, 10 * mainGame->yScale, 920 * mainGame->xScale, 30 * mainGame->yScale), recti(0, 0, 200, 20), 0, 0, true);
if(dInfo.lp[0] >= 8000) if(dInfo.lp[0] >= 8000)
driver->draw2DImage(imageManager.tLPBar, recti(335 * mainGame->xScale, 12 * mainGame->yScale, 625 * mainGame->xScale, 28 * mainGame->yScale), recti(0, 0, 16, 16), 0, 0, true); driver->draw2DImage(imageManager.tLPBar, recti(335 * mainGame->xScale, 12 * mainGame->yScale, 625 * mainGame->xScale, 28 * mainGame->yScale), recti(0, 0, 16, 16), 0, 0, true);
else driver->draw2DImage(imageManager.tLPBar, recti(335 * mainGame->xScale, 12 * mainGame->yScale, (335 + 290 * dInfo.lp[0] / 8000) * mainGame->xScale, 28 * mainGame->yScale), recti(0, 0, 16, 16), 0, 0, true); else driver->draw2DImage(imageManager.tLPBar, recti(335 * mainGame->xScale, 12 * mainGame->yScale, (335 + 290 * dInfo.lp[0] / 8000) * mainGame->xScale, 28 * mainGame->yScale), recti(0, 0, 16, 16), 0, 0, true);
......
Classes/gframe/image_manager.cpp
View file @ a6adaf53
...@@ -30,6 +30,9 @@ bool ImageManager::Initial(const path dir) { ...@@ -30,6 +30,9 @@ bool ImageManager::Initial(const path dir) {
tBackGround = driver->getTexture((dir + path("/textures/bg.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()); tBackGround_menu = driver->getTexture((dir + path("/textures/bg_menu.jpg")).c_str());
tCardType = driver->getTexture((dir + path("/textures/cardtype.png")).c_str()); tCardType = driver->getTexture((dir + path("/textures/cardtype.png")).c_str());
tAvatar[0] = driver->getTexture((dir + path("/textures/me.jpg")).c_str());
tAvatar[1] = driver->getTexture((dir + path("/textures/opponent.jpg")).c_str());
tLPBarFrame = driver->getTexture((dir + path("/textures/lpbarf.png")).c_str());
if(!tBackGround_menu) if(!tBackGround_menu)
tBackGround_menu = tBackGround; tBackGround_menu = tBackGround;
tBackGround_deck = driver->getTexture((dir + path("/textures/bg_deck.jpg")).c_str()); tBackGround_deck = driver->getTexture((dir + path("/textures/bg_deck.jpg")).c_str());
......
Classes/gframe/image_manager.h
View file @ a6adaf53
...@@ -51,6 +51,8 @@ public: ...@@ -51,6 +51,8 @@ public:
irr::video::ITexture* tLScale[14]; irr::video::ITexture* tLScale[14];
irr::video::ITexture* tClock; irr::video::ITexture* tClock;
irr::video::ITexture* tCardType; irr::video::ITexture* tCardType;
irr::video::ITexture* tAvatar[2];
irr::video::ITexture* tLPBarFrame;
std::list<std::string> support_types; std::list<std::string> support_types;
}; };
......
mobile/build.gradle
View file @ a6adaf53
...@@ -8,8 +8,8 @@ android { ...@@ -8,8 +8,8 @@ android {
applicationId "cn.garymb.ygomobile" applicationId "cn.garymb.ygomobile"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 22 targetSdkVersion 22
versionCode 33020701 versionCode 33030706
versionName "3.3.2" versionName "3.3.3"
flavorDimensions "versionCode" flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
ndk { ndk {
......
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