Skip to content

Y
ygopro
Commit 5f669889 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents be5c4051 6185a8fa
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 31 deletions
.ci/exec-macos-platform.sh
View file @ 5f669889
...@@ -7,7 +7,7 @@ TARGET_YGOPRO_BINARY_PATH=./ygopro-platforms/ygopro-platform-$TARGET_PLATFORM ...@@ -7,7 +7,7 @@ TARGET_YGOPRO_BINARY_PATH=./ygopro-platforms/ygopro-platform-$TARGET_PLATFORM
export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
export EVENT_LIB_DIR=$PWD/libevent-stable/lib export EVENT_LIB_DIR=$PWD/libevent-stable/lib
export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include
export IRRLICHT_LIB_DIR=$PWD/irrlicht export IRRLICHT_LIB_DIR=$PWD/irrlicht/lib/$(arch)
./.ci/libevent-prebuild.sh ./.ci/libevent-prebuild.sh
......
.ci/upload-packager.sh
View file @ 5f669889
...@@ -10,11 +10,7 @@ token=$(echo $loginInfo | jq '.token' | sed 's/"//g') ...@@ -10,11 +10,7 @@ token=$(echo $loginInfo | jq '.token' | sed 's/"//g')
header="Authorization: $token" header="Authorization: $token"
echo "Login succeeded." echo "Login succeeded."
<<<<<<< HEAD
appName="koishipro" appName="koishipro"
=======
appName="ygopro"
>>>>>>> 71a8c15521cc6fe09e774c7fa2a62aeb20a0e017
handleErrorMessage() { handleErrorMessage() {
rawJsonInput="$1" rawJsonInput="$1"
......
gframe/client_field.cpp
View file @ 5f669889
...@@ -753,7 +753,6 @@ void ClientField::ReplaySwap() { ...@@ -753,7 +753,6 @@ void ClientField::ReplaySwap() {
mainGame->dInfo.isReplaySwapped = !mainGame->dInfo.isReplaySwapped; mainGame->dInfo.isReplaySwapped = !mainGame->dInfo.isReplaySwapped;
std::swap(mainGame->dInfo.lp[0], mainGame->dInfo.lp[1]); std::swap(mainGame->dInfo.lp[0], mainGame->dInfo.lp[1]);
std::swap(mainGame->dInfo.strLP[0], mainGame->dInfo.strLP[1]); std::swap(mainGame->dInfo.strLP[0], mainGame->dInfo.strLP[1]);
std::swap(mainGame->dInfo.start_lp[0], mainGame->dInfo.start_lp[1]);
std::swap(mainGame->dInfo.hostname, mainGame->dInfo.clientname); std::swap(mainGame->dInfo.hostname, mainGame->dInfo.clientname);
std::swap(mainGame->dInfo.hostname_tag, mainGame->dInfo.clientname_tag); std::swap(mainGame->dInfo.hostname_tag, mainGame->dInfo.clientname_tag);
RefreshCardCountDisplay(); RefreshCardCountDisplay();
......
gframe/deck_con.cpp
View file @ 5f669889
...@@ -118,6 +118,7 @@ void DeckBuilder::Terminate() { ...@@ -118,6 +118,7 @@ void DeckBuilder::Terminate() {
mainGame->showingcode = 0; mainGame->showingcode = 0;
mainGame->scrFilter->setVisible(false); mainGame->scrFilter->setVisible(false);
mainGame->scrPackCards->setVisible(false); mainGame->scrPackCards->setVisible(false);
mainGame->scrPackCards->setPos(0);
int catesel = mainGame->cbDBCategory->getSelected(); int catesel = mainGame->cbDBCategory->getSelected();
if(catesel >= 0) if(catesel >= 0)
BufferIO::CopyWStr(mainGame->cbDBCategory->getItem(catesel), mainGame->gameConf.lastcategory, 64); BufferIO::CopyWStr(mainGame->cbDBCategory->getItem(catesel), mainGame->gameConf.lastcategory, 64);
...@@ -1679,6 +1680,7 @@ void DeckBuilder::RefreshPackListScroll() { ...@@ -1679,6 +1680,7 @@ void DeckBuilder::RefreshPackListScroll() {
} }
} else { } else {
mainGame->scrPackCards->setVisible(false); mainGame->scrPackCards->setVisible(false);
mainGame->scrPackCards->setPos(0);
} }
} }
void DeckBuilder::ChangeCategory(int catesel) { void DeckBuilder::ChangeCategory(int catesel) {
......
gframe/drawing.cpp
View file @ 5f669889
...@@ -556,16 +556,31 @@ void Game::DrawMisc() { ...@@ -556,16 +556,31 @@ void Game::DrawMisc() {
} }
driver->draw2DImage(imageManager.tLPFrame, Resize(330, 10, 629, 30), recti(0, 0, 200, 20), 0, 0, true); driver->draw2DImage(imageManager.tLPFrame, Resize(330, 10, 629, 30), recti(0, 0, 200, 20), 0, 0, true);
driver->draw2DImage(imageManager.tLPFrame, Resize(691, 10, 990, 30), recti(0, 0, 200, 20), 0, 0, true); driver->draw2DImage(imageManager.tLPFrame, Resize(691, 10, 990, 30), recti(0, 0, 200, 20), 0, 0, true);
if(!dInfo.start_lp[0]) if(dInfo.start_lp) {
driver->draw2DImage(imageManager.tLPBar, Resize(335, 12, 335, 28), recti(0, 0, 16, 16), 0, 0, true); auto maxLP = dInfo.isTag ? dInfo.start_lp / 2 : dInfo.start_lp;
else if(dInfo.lp[0] >= dInfo.start_lp[0]) if(dInfo.lp[0] >= maxLP) {
driver->draw2DImage(imageManager.tLPBar, Resize(335, 12, 625, 28), recti(0, 0, 16, 16), 0, 0, true); auto layerCount = dInfo.lp[0] / maxLP;
else driver->draw2DImage(imageManager.tLPBar, Resize(335, 12, 335 + 290 * dInfo.lp[0] / dInfo.start_lp[0], 28), recti(0, 0, 16, 16), 0, 0, true); auto partialLP = dInfo.lp[0] % maxLP;
if(!dInfo.start_lp[1]) auto bgColorPos = (layerCount - 1) % 5;
driver->draw2DImage(imageManager.tLPBar, Resize(986, 12, 986, 28), recti(0, 0, 16, 16), 0, 0, true); auto fgColorPos = layerCount % 5;
else if(dInfo.lp[1] >= dInfo.start_lp[1]) driver->draw2DImage(imageManager.tLPBar, Resize(335 + 290 * partialLP / maxLP, 12, 625, 28), recti(0, bgColorPos * 16, 16, (bgColorPos + 1) * 16), 0, 0, true);
driver->draw2DImage(imageManager.tLPBar, Resize(696, 12, 986, 28), recti(0, 0, 16, 16), 0, 0, true); if(partialLP > 0) {
else driver->draw2DImage(imageManager.tLPBar, Resize(986 - 290 * dInfo.lp[1] / dInfo.start_lp[1], 12, 986, 28), recti(0, 0, 16, 16), 0, 0, true); driver->draw2DImage(imageManager.tLPBar, Resize(335, 12, 335 + 290 * partialLP / maxLP, 28), recti(0, fgColorPos * 16, 16, (fgColorPos + 1) * 16), 0, 0, true);
}
}
else driver->draw2DImage(imageManager.tLPBar, Resize(335, 12, 335 + 290 * dInfo.lp[0] / maxLP, 28), recti(0, 0, 16, 16), 0, 0, true);
if(dInfo.lp[1] >= maxLP) {
auto layerCount = dInfo.lp[1] / maxLP;
auto partialLP = dInfo.lp[1] % maxLP;
auto bgColorPos = (layerCount - 1) % 5;
auto fgColorPos = layerCount % 5;
driver->draw2DImage(imageManager.tLPBar, Resize(696, 12, 986 - 290 * partialLP / maxLP, 28), recti(0, bgColorPos * 16, 16, (bgColorPos + 1) * 16), 0, 0, true);
if(partialLP > 0) {
driver->draw2DImage(imageManager.tLPBar, Resize(986 - 290 * partialLP / maxLP, 12, 986, 28), recti(0, fgColorPos * 16, 16, (fgColorPos + 1) * 16), 0, 0, true);
}
}
else driver->draw2DImage(imageManager.tLPBar, Resize(986 - 290 * dInfo.lp[1] / dInfo.start_lp, 12, 986, 28), recti(0, 0, 16, 16), 0, 0, true);
}
if(lpframe) { if(lpframe) {
dInfo.lp[lpplayer] -= lpd; dInfo.lp[lpplayer] -= lpd;
myswprintf(dInfo.strLP[lpplayer], L"%d", dInfo.lp[lpplayer]); myswprintf(dInfo.strLP[lpplayer], L"%d", dInfo.lp[lpplayer]);
...@@ -762,10 +777,10 @@ void Game::DrawStatus(ClientCard* pcard, int x1, int y1, int x2, int y2) { ...@@ -762,10 +777,10 @@ void Game::DrawStatus(ClientCard* pcard, int x1, int y1, int x2, int y2) {
} }
} }
void Game::DrawGUI() { void Game::DrawGUI() {
if(imageLoading.size()) { while (imageLoading.size()) {
for(auto mit = imageLoading.begin(); mit != imageLoading.end(); ++mit) auto mit = imageLoading.cbegin();
mit->first->setImage(imageManager.GetTexture(mit->second)); mit->first->setImage(imageManager.GetTexture(mit->second));
imageLoading.clear(); imageLoading.erase(mit);
} }
for(auto fit = fadingList.begin(); fit != fadingList.end();) { for(auto fit = fadingList.begin(); fit != fadingList.end();) {
auto fthis = fit++; auto fthis = fit++;
......
gframe/duelclient.cpp
View file @ 5f669889
...@@ -598,6 +598,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) { ...@@ -598,6 +598,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
mainGame->wChat->setVisible(true); mainGame->wChat->setVisible(true);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
mainGame->dInfo.duel_rule = pkt->info.duel_rule; mainGame->dInfo.duel_rule = pkt->info.duel_rule;
mainGame->dInfo.start_lp = pkt->info.start_lp;
watching = 0; watching = 0;
connect_state |= 0x4; connect_state |= 0x4;
break; break;
...@@ -684,8 +685,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) { ...@@ -684,8 +685,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
mainGame->dInfo.isFinished = false; mainGame->dInfo.isFinished = false;
mainGame->dInfo.lp[0] = 0; mainGame->dInfo.lp[0] = 0;
mainGame->dInfo.lp[1] = 0; mainGame->dInfo.lp[1] = 0;
mainGame->dInfo.start_lp[0] = 0;
mainGame->dInfo.start_lp[1] = 0;
mainGame->dInfo.strLP[0][0] = 0; mainGame->dInfo.strLP[0][0] = 0;
mainGame->dInfo.strLP[1][0] = 0; mainGame->dInfo.strLP[1][0] = 0;
mainGame->dInfo.turn = 0; mainGame->dInfo.turn = 0;
...@@ -1364,8 +1363,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1364,8 +1363,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->dInfo.duel_rule = BufferIO::ReadInt8(pbuf); mainGame->dInfo.duel_rule = BufferIO::ReadInt8(pbuf);
mainGame->dInfo.lp[mainGame->LocalPlayer(0)] = BufferIO::ReadInt32(pbuf); mainGame->dInfo.lp[mainGame->LocalPlayer(0)] = BufferIO::ReadInt32(pbuf);
mainGame->dInfo.lp[mainGame->LocalPlayer(1)] = BufferIO::ReadInt32(pbuf); mainGame->dInfo.lp[mainGame->LocalPlayer(1)] = BufferIO::ReadInt32(pbuf);
mainGame->dInfo.start_lp[0] = mainGame->dInfo.lp[0];
mainGame->dInfo.start_lp[1] = mainGame->dInfo.lp[1];
myswprintf(mainGame->dInfo.strLP[0], L"%d", mainGame->dInfo.lp[0]); myswprintf(mainGame->dInfo.strLP[0], L"%d", mainGame->dInfo.lp[0]);
myswprintf(mainGame->dInfo.strLP[1], L"%d", mainGame->dInfo.lp[1]); myswprintf(mainGame->dInfo.strLP[1], L"%d", mainGame->dInfo.lp[1]);
int deckc = BufferIO::ReadInt16(pbuf); int deckc = BufferIO::ReadInt16(pbuf);
......
gframe/game.h
View file @ 5f669889
...@@ -87,7 +87,7 @@ struct DuelInfo { ...@@ -87,7 +87,7 @@ struct DuelInfo {
bool is_swapped; bool is_swapped;
bool tag_player[2]; bool tag_player[2];
int lp[2]; int lp[2];
int start_lp[2]; int start_lp;
int card_count[2]; int card_count[2];
int total_attack[2]; int total_attack[2];
int duel_rule; int duel_rule;
......
gframe/replay_mode.cpp
View file @ 5f669889
...@@ -177,8 +177,7 @@ bool ReplayMode::StartDuel() { ...@@ -177,8 +177,7 @@ bool ReplayMode::StartDuel() {
set_player_info(pduel, 1, start_lp, start_hand, draw_count); set_player_info(pduel, 1, start_lp, start_hand, draw_count);
mainGame->dInfo.lp[0] = start_lp; mainGame->dInfo.lp[0] = start_lp;
mainGame->dInfo.lp[1] = start_lp; mainGame->dInfo.lp[1] = start_lp;
mainGame->dInfo.start_lp[0] = start_lp; mainGame->dInfo.start_lp = start_lp;
mainGame->dInfo.start_lp[1] = start_lp;
myswprintf(mainGame->dInfo.strLP[0], L"%d", mainGame->dInfo.lp[0]); myswprintf(mainGame->dInfo.strLP[0], L"%d", mainGame->dInfo.lp[0]);
myswprintf(mainGame->dInfo.strLP[1], L"%d", mainGame->dInfo.lp[1]); myswprintf(mainGame->dInfo.strLP[1], L"%d", mainGame->dInfo.lp[1]);
mainGame->dInfo.turn = 0; mainGame->dInfo.turn = 0;
......
gframe/single_mode.cpp
View file @ 5f669889
...@@ -46,8 +46,7 @@ int SingleMode::SinglePlayThread() { ...@@ -46,8 +46,7 @@ int SingleMode::SinglePlayThread() {
set_player_info(pduel, 1, start_lp, start_hand, draw_count); set_player_info(pduel, 1, start_lp, start_hand, draw_count);
mainGame->dInfo.lp[0] = start_lp; mainGame->dInfo.lp[0] = start_lp;
mainGame->dInfo.lp[1] = start_lp; mainGame->dInfo.lp[1] = start_lp;
mainGame->dInfo.start_lp[0] = start_lp; mainGame->dInfo.start_lp = start_lp;
mainGame->dInfo.start_lp[1] = start_lp;
myswprintf(mainGame->dInfo.strLP[0], L"%d", mainGame->dInfo.lp[0]); myswprintf(mainGame->dInfo.strLP[0], L"%d", mainGame->dInfo.lp[0]);
myswprintf(mainGame->dInfo.strLP[1], L"%d", mainGame->dInfo.lp[1]); myswprintf(mainGame->dInfo.strLP[1], L"%d", mainGame->dInfo.lp[1]);
BufferIO::CopyWStr(mainGame->ebNickName->getText(), mainGame->dInfo.hostname, 20); BufferIO::CopyWStr(mainGame->ebNickName->getText(), mainGame->dInfo.hostname, 20);
......
ocgcore @ 5fd550f1
Subproject commit ac7997c0e493373c30f3485c136d4093e2f14ccd Subproject commit 5fd550f14051a0ace579dc26870d320119ab1e96
script @ bc8393dd
Subproject commit 78d3d7b81c2b147f548261fb2eedfd48fb3d2dc1 Subproject commit bc8393dd04d46a500b05d89497556905edfadb86
textures/lp.png
View replaced file @ be5c4051 View file @ 5f669889
textures/lp.png

967 Bytes | W: | H:

textures/lp.png

2.05 KB | W: | H:

textures/lp.png
textures/lp.png
textures/lp.png
textures/lp.png
  • 2-up
  • Swipe
  • Onion skin
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