Skip to content

Y
YGOMobile
Commit b0899402 authored by Dark Zane's avatar Dark Zane Committed by GitHub
Browse files
Options

Merge branch 'fallenstardust:master' into master

parents ff038281 96b5da6d
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 30 deletions
Classes/gframe/game.cpp
View file @ b0899402
......@@ -1155,7 +1155,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
cbBotDeckCategory->setVisible(false);
cbBotDeck = env->addComboBox(Resize(0, 0, 0, 0), tabBot);
cbBotDeck->setVisible(false);
btnBotDeckSelect = env->addButton(Resize(310 * xScale, 110 * yScale, 530 * xScale, 150 * yScale), tabBot, BUTTON_BOT_DECK_SELECT, L"");
btnBotDeckSelect = env->addButton(Resize(310, 110, 530, 150), tabBot, BUTTON_BOT_DECK_SELECT, L"");
btnBotDeckSelect->setVisible(false);
cbBotRule = CAndroidGUIComboBox::addAndroidComboBox(env, Resize(310, 160, 530, 200), tabBot, COMBOBOX_BOT_RULE);
cbBotRule->addItem(dataManager.GetSysString(1262));
......
Classes/ocgcore/card.cpp
View file @ b0899402
......@@ -3419,9 +3419,7 @@ int32_t card::get_set_tribute_count() {
return min + (max << 16);
}
int32_t card::is_can_be_flip_summoned(uint8_t playerid) {
if(is_status(STATUS_SUMMON_TURN) || is_status(STATUS_FLIP_SUMMON_TURN) || is_status(STATUS_SPSUMMON_TURN) || is_status(STATUS_FORM_CHANGED))
return FALSE;
if(announce_count > 0)
if(is_status(STATUS_CANNOT_CHANGE_FORM))
return FALSE;
if(current.location != LOCATION_MZONE)
return FALSE;
......@@ -3949,12 +3947,10 @@ int32_t card::is_capable_attack_announce(uint8_t playerid) {
return TRUE;
}
int32_t card::is_capable_change_position(uint8_t playerid) {
if(get_status(STATUS_SUMMON_TURN | STATUS_FLIP_SUMMON_TURN | STATUS_SPSUMMON_TURN | STATUS_FORM_CHANGED))
if(is_status(STATUS_CANNOT_CHANGE_FORM))
return FALSE;
if(data.type & TYPE_LINK)
return FALSE;
if(announce_count > 0)
return FALSE;
if(is_status(STATUS_FORBIDDEN))
return FALSE;
if(is_affected_by_effect(EFFECT_CANNOT_CHANGE_POSITION))
......
Classes/ocgcore/common.h
View file @ b0899402
......@@ -189,7 +189,7 @@ inline bool check_playerid(int32_t playerid) {
#define STATUS_NO_LEVEL 0x0020
#define STATUS_BATTLE_RESULT 0x0040
#define STATUS_SPSUMMON_STEP 0x0080
#define STATUS_FORM_CHANGED 0x0100
#define STATUS_CANNOT_CHANGE_FORM 0x0100
#define STATUS_SUMMONING 0x0200
#define STATUS_EFFECT_ENABLED 0x0400
#define STATUS_SUMMON_TURN 0x0800
......
Classes/ocgcore/operations.cpp
View file @ b0899402
......@@ -1938,6 +1938,7 @@ int32_t field::summon(uint16_t step, uint8_t sumplayer, card* target, effect* pr
target->set_status(STATUS_SUMMONING, FALSE);
target->set_status(STATUS_FLIP_SUMMONING, FALSE);
target->set_status(STATUS_SUMMON_TURN, TRUE);
target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
target->enable_field_effect(true);
if(target->is_status(STATUS_DISABLED))
target->reset(RESET_DISABLE, RESET_EVENT);
......@@ -2048,6 +2049,7 @@ int32_t field::flip_summon(uint16_t step, uint8_t sumplayer, card * target, uint
if(target->is_status(STATUS_DISABLED))
target->reset(RESET_DISABLE, RESET_EVENT);
target->set_status(STATUS_FLIP_SUMMON_TURN, TRUE);
target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
return FALSE;
}
case 4: {
......@@ -2395,6 +2397,7 @@ int32_t field::mset(uint16_t step, uint8_t setplayer, card* target, effect* proc
++core.normalsummon_state_count[setplayer];
check_card_counter(target, ACTIVITY_NORMALSUMMON, setplayer);
target->set_status(STATUS_SUMMON_TURN, TRUE);
target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
pduel->write_buffer8(MSG_SET);
pduel->write_buffer32(target->data.code);
pduel->write_buffer32(target->get_info_location());
......@@ -2929,6 +2932,7 @@ int32_t field::special_summon_rule(uint16_t step, uint8_t sumplayer, card* targe
}
target->set_status(STATUS_SUMMONING, FALSE);
target->set_status(STATUS_PROC_COMPLETE | STATUS_SPSUMMON_TURN, TRUE);
target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
target->enable_field_effect(true);
if(target->is_status(STATUS_DISABLED))
target->reset(RESET_DISABLE, RESET_EVENT);
......@@ -3136,6 +3140,7 @@ int32_t field::special_summon_rule(uint16_t step, uint8_t sumplayer, card* targe
for(auto& pcard : pgroup->container) {
pcard->set_status(STATUS_SUMMONING, FALSE);
pcard->set_status(STATUS_SPSUMMON_TURN, TRUE);
pcard->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
pcard->enable_field_effect(true);
if(pcard->is_status(STATUS_DISABLED))
pcard->reset(RESET_DISABLE, RESET_EVENT);
......@@ -3352,6 +3357,7 @@ int32_t field::special_summon(uint16_t step, effect* reason_effect, uint8_t reas
for(auto& pcard : targets->container) {
pcard->set_status(STATUS_SPSUMMON_STEP, FALSE);
pcard->set_status(STATUS_SPSUMMON_TURN, TRUE);
pcard->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
if(pcard->is_position(POS_FACEUP))
pcard->enable_field_effect(true);
}
......@@ -4645,15 +4651,15 @@ int32_t field::move_to_field(uint16_t step, card* target, uint32_t enable, uint3
}
if(!(target->current.location & LOCATION_ONFIELD))
target->clear_relate_effect();
if(ret == RETURN_TEMP_REMOVE_TO_FIELD)
if(ret == RETURN_TEMP_REMOVE_TO_FIELD) {
target->current.reason &= ~REASON_TEMPORARY;
if(ret == 0 && location != target->current.location
|| ret == RETURN_TEMP_REMOVE_TO_FIELD && target->turnid != infos.turn_id) {
}
if(ret == 0 && location != target->current.location || ret == RETURN_TEMP_REMOVE_TO_FIELD) {
target->set_status(STATUS_SUMMON_TURN, FALSE);
target->set_status(STATUS_FLIP_SUMMON_TURN, FALSE);
target->set_status(STATUS_SPSUMMON_TURN, FALSE);
target->set_status(STATUS_SET_TURN, FALSE);
target->set_status(STATUS_FORM_CHANGED, FALSE);
target->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE);
}
target->temp.sequence = seq;
if(location != LOCATION_MZONE) {
......
Classes/ocgcore/processor.cpp
View file @ b0899402
......@@ -2316,7 +2316,7 @@ int32_t field::process_idle_command(uint16_t step) {
return FALSE;
} else
add_process(PROCESSOR_FLIP_SUMMON, 0, 0, (group*)target, target->current.controler, 0);
target->set_status(STATUS_FORM_CHANGED, TRUE);
target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
core.units.begin()->step = -1;
return FALSE;
}
......@@ -2375,7 +2375,7 @@ int32_t field::process_idle_command(uint16_t step) {
adjust_all();
add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, 0);
}
target->set_status(STATUS_FORM_CHANGED, TRUE);
target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
core.units.begin()->step = -1;
return FALSE;
}
......@@ -2665,6 +2665,7 @@ int32_t field::process_battle_command(uint16_t step) {
}
if(core.units.begin()->arg3) {//attack announce failed
++core.attacker->announce_count;
core.attacker->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
core.chain_attack = FALSE;
core.units.begin()->step = -1;
}
......@@ -2739,6 +2740,7 @@ int32_t field::process_battle_command(uint16_t step) {
// go to damage step
if(!core.attack_rollback) {
++core.attacker->announce_count;
core.attacker->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
core.attacker->announced_cards.addcard(core.attack_target);
attack_all_target_check();
core.units.begin()->step = 18;
......@@ -2771,6 +2773,7 @@ int32_t field::process_battle_command(uint16_t step) {
case 13: {
if(core.attacker->fieldid_r == core.pre_field[0]) {
++core.attacker->announce_count;
core.attacker->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
core.attacker->announced_cards.addcard(core.attack_target);
attack_all_target_check();
}
......@@ -3323,6 +3326,7 @@ int32_t field::process_damage_step(uint16_t step, uint32_t new_attack) {
if(core.attacker) {
core.attacker->set_status(STATUS_ATTACK_CANCELED, TRUE);
++core.attacker->announce_count;
core.attacker->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
core.attacker->announced_cards.addcard(core.attack_target);
attack_all_target_check();
}
......@@ -3674,7 +3678,7 @@ int32_t field::process_turn(uint16_t step, uint8_t turn_player) {
pcard->set_status(STATUS_FLIP_SUMMON_TURN, FALSE);
pcard->set_status(STATUS_SPSUMMON_TURN, FALSE);
pcard->set_status(STATUS_SET_TURN, FALSE);
pcard->set_status(STATUS_FORM_CHANGED, FALSE);
pcard->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE);
pcard->indestructable_effects.clear();
pcard->attack_announce_count = 0;
pcard->announce_count = 0;
......
libcore/src/main/java/cn/garymb/ygomobile/YGOMobileActivity.java
View file @ b0899402
......@@ -199,8 +199,8 @@ public class YGOMobileActivity extends GameActivity implements
float sh = app().getScreenHeight();
int w = (int) (app().getGameWidth() * xScale);
int h = (int) (app().getGameHeight() * yScale);
Log.i(IrrlichtBridge.TAG, "game size=" + app().getGameWidth() + "x" + app().getGameHeight()
+ ", surface=" + w + "x" + h
Log.i(IrrlichtBridge.TAG, "basic size=" + app().getGameWidth() + "x" + app().getGameHeight()
+ ", game size=" + w + "x" + h
+ ", screen=" + sw + "x" + sh
+ ", xScale=" + xScale + ",yScale=" + yScale);
return new Size(w, h);
......
mobile/assets/changelog.html
View file @ b0899402
......@@ -16,19 +16,21 @@
特别感谢： 尸体233,废话多,大毛, zhuhongbo, JSY1728, 幻兽L 等的支持与努力.
</pre>
<ul>
<li style="color:#ffff00">3.11.13</li>
<li style="color:#ffff00">3.11.14</li>
</ul>
<pre>
更新：
1.更新ygopro内核；
2.新卡TW02+VJ；
2.新卡QCTB+25PP+25PR+VJ；
3.2025.1 OCG禁卡表；
4.2024.12 TCG禁卡表；
变更：
1.支持萌卡论坛帖子点击保存文件；
2.帖子卡组、录像、残局、补丁、禁卡表
根据文件类型自动存放到对应位置；
3.安卓15系统自动开启沉浸式；
4.提高图片选择时的缓存大小降低闪退可能；
5.为头像、卡背、背景添加备选图片；
1.卡片详情新增OCG卡包日期名称展示；
2.为随机一卡添加卡包日期名称展示；
2.卡包日期名称点击可展示卡包收录新卡列表；
3.修正游戏背景图片裁剪尺寸比例；
4.为多关键词、单关键词搜索切换添加开关；
5.为游戏中的部分卡片显示过宽问题进行优化；
</pre>
<h3 style="color:#ff0000">注意</h3>
<pre>
......
mobile/build.gradle
View file @ b0899402
......@@ -9,8 +9,8 @@ android {
minSdkVersion 23
//noinspection ExpiredTargetSdkVersion
targetSdkVersion 29
versionCode 311130000
versionName "3.11.13"
versionCode 311140001
versionName "3.11.14fix1"
flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true
ndkVersion "21.3.6528147"
......
mobile/src/main/java/cn/garymb/ygomobile/utils/ComparisonTableUtil.java
View file @ b0899402
......@@ -440,7 +440,40 @@ public interface ComparisonTableUtil {
100227072,
100227073,
100227074,
100227075
100227075,
100231002,
100200264,
100229001,
100229002,
100229019,
100229020,
100229033,
100229034,
100232001,
100232002,
100232003,
100232004,
100232005,
100233001,
100233002,
100233003,
100233004,
100233005,
100233006,
100233007,
100233008,
100233009,
100233010,
100233011,
100233012,
100233013,
100233014,
100233015,
100233016,
100233201,
100233018,
100233019,
100233020
};
int[] newIDsArray = {
......@@ -879,7 +912,39 @@ public interface ComparisonTableUtil {
51618973,
87003671,
13408726,
50596425
50596425,
98588427,
20714553,
12163590,
48658295,
75046994,
11441009,
48835607,
74820316,
6696168,
42081767,
79480466,
5574510,
31969219,
65515667,
44459942,
91019775,
97476032,
88477149,
65569724,
80447641,
17832359,
43236494,
79625003,
16110708,
42104806,
79509511,
5997110,
42382265,
74387963,
875572,
37260677,
73664385,
59080
};
}
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