Commit 7566f482 authored by fallenstardust's avatar fallenstardust

优化超量素材显示

parent 95f194f6
...@@ -867,7 +867,7 @@ void ClientField::GetCardLocation(ClientCard* pcard, irr::core::vector3df* t, ir ...@@ -867,7 +867,7 @@ void ClientField::GetCardLocation(ClientCard* pcard, irr::core::vector3df* t, ir
int sequence = pcard->sequence; int sequence = pcard->sequence;
int location = pcard->location; int location = pcard->location;
int rule = (mainGame->dInfo.duel_rule >= 4) ? 1 : 0; int rule = (mainGame->dInfo.duel_rule >= 4) ? 1 : 0;
const float overlay_buttom = 0.01f; const float overlay_buttom = 0.001f;
const float material_height = 0.003f; const float material_height = 0.003f;
const float mzone_buttom = 0.020f; const float mzone_buttom = 0.020f;
switch (location) { switch (location) {
......
...@@ -289,21 +289,6 @@ void Game::DrawLinkedZones(ClientCard* pcard, ClientCard* fcard) { ...@@ -289,21 +289,6 @@ void Game::DrawLinkedZones(ClientCard* pcard, ClientCard* fcard) {
} }
void Game::DrawCards() { void Game::DrawCards() {
for (auto cit = dField.overlay_cards.begin(); cit != dField.overlay_cards.end(); ++cit) {
auto pcard = (*cit);
auto olcard = pcard->overlayTarget;
if (pcard->aniFrame) {
DrawCard(pcard);
}
else if (olcard && olcard->location == LOCATION_MZONE) {
if (pcard->sequence < MAX_LAYER_COUNT) {
DrawCard(pcard);
}
}
else {
DrawCard(pcard);
}
}
for(int p = 0; p < 2; ++p) { for(int p = 0; p < 2; ++p) {
for(auto it = dField.mzone[p].begin(); it != dField.mzone[p].end(); ++it) for(auto it = dField.mzone[p].begin(); it != dField.mzone[p].end(); ++it)
if(*it) if(*it)
...@@ -322,6 +307,21 @@ void Game::DrawCards() { ...@@ -322,6 +307,21 @@ void Game::DrawCards() {
for(auto it = dField.extra[p].begin(); it != dField.extra[p].end(); ++it) for(auto it = dField.extra[p].begin(); it != dField.extra[p].end(); ++it)
DrawCard(*it); DrawCard(*it);
} }
for (auto cit = dField.overlay_cards.begin(); cit != dField.overlay_cards.end(); ++cit) {
auto pcard = (*cit);
auto olcard = pcard->overlayTarget;
if (pcard->aniFrame) {
DrawCard(pcard);
}
else if (olcard && olcard->location == LOCATION_MZONE) {
if (pcard->sequence < MAX_LAYER_COUNT) {
DrawCard(pcard);
}
}
else {
DrawCard(pcard);
}
}
} }
void Game::DrawCard(ClientCard* pcard) { void Game::DrawCard(ClientCard* pcard) {
if(pcard->aniFrame) { if(pcard->aniFrame) {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<pre> <pre>
更新: 更新:
1.更新ygopro内核; 1.更新ygopro内核;
2.新卡MZMI 2.新卡MZTM
变更: 变更:
1.为卡片错误信息添加卡名提示; 1.为卡片错误信息添加卡名提示;
2.搜索卡片可通过关键词搜索包含它的字段; 2.搜索卡片可通过关键词搜索包含它的字段;
......
...@@ -9,8 +9,8 @@ android { ...@@ -9,8 +9,8 @@ android {
minSdkVersion 25 minSdkVersion 25
//noinspection ExpiredTargetSdkVersion //noinspection ExpiredTargetSdkVersion
targetSdkVersion 29 targetSdkVersion 29
versionCode 312000001 versionCode 312000002
versionName "3.12.1" versionName "3.12.1fix1"
flavorDimensions "versionCode" flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
ndkVersion "21.3.6528147" ndkVersion "21.3.6528147"
......
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