Skip to content

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

同步备份卡组

parent b56e3769
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 64 deletions
Classes/ocgcore/processor.cpp
View file @ d1a672a2
......@@ -2897,9 +2897,9 @@ int32 field::process_battle_command(uint16 step) {
} else if(ctype == 1) {
core.units.begin()->step = 2;
core.units.begin()->arg3 = FALSE;
card* attacker = core.attackable_cards[sel];
core.attacker = attacker;
core.attacker = core.attackable_cards[sel];
core.attacker->set_status(STATUS_ATTACK_CANCELED, FALSE);
core.attacker->attack_controler = core.attacker->current.controler;
core.pre_field[0] = core.attacker->fieldid_r;
effect_set eset;
filter_player_effect(infos.turn_player, EFFECT_ATTACK_COST, &eset, FALSE);
......@@ -2941,7 +2941,7 @@ int32 field::process_battle_command(uint16 step) {
}
case 3: {
core.units.begin()->arg1 = FALSE;
if(core.attacker->current.location != LOCATION_MZONE || core.attacker->current.controler != infos.turn_player || core.attacker->fieldid_r != core.pre_field[0]) {
if(core.attacker->is_status(STATUS_ATTACK_CANCELED)) {
core.units.begin()->arg3 = TRUE;
core.units.begin()->step = 6;
return FALSE;
......@@ -3041,7 +3041,7 @@ int32 field::process_battle_command(uint16 step) {
check_card_counter(core.attacker, 5, infos.turn_player);
core.attacker->attack_announce_count++;
}
if(core.units.begin()->arg3) {
if(core.units.begin()->arg3) {//attack announce failed
core.attacker->announce_count++;
core.chain_attack = FALSE;
core.units.begin()->step = -1;
......
mobile/asset_cn/deck/[汉诺预组]汉诺骑士的完美手牌.ydk 0 → 100644
View file @ d1a672a2
#created by ...
#main
55885348
55885348
55885348
60349525
60349525
60349525
45458027
45458027
45458027
23850421
23850421
23850421
40634253
40634253
40634253
70095155
70095155
3113667
3113667
3113667
77565204
77565204
28053763
28053763
28053763
83764718
81439173
73628505
54447022
38120068
38120068
38120068
97077563
97077563
89208725
89208725
58464739
29649320
29649320
44095762
#extra
64599569
87116928
79229522
16114248
75433814
88120966
!side
1475311
1475311
44095762
74519184
mobile/assets/changelog.html
View file @ d1a672a2
......@@ -23,7 +23,7 @@
更新：
1.更新ygo内核；
2.增加AI按难易度随机加入功能；
3.新卡SHVA+CT15+VJ；
3.新卡SHVA+CT15+VJ+EP18+18SP；
4.新增AI卡组；
修复：
1.关键词输入数字无法搜索「No.」的问题；
......
mobile/assets/data/conf/bot.conf
View file @ d1a672a2
......@@ -70,7 +70,7 @@ Name=尼亚 Deck=Trickstar Dialog=near.zh-CN
AI_LV3 SUPPORT_NEW_MASTER_RULE
!尼亚-幻变骚灵
Name=尼亚 Deck=Altergeist Dialog=zh-CN
Name=尼亚 Deck=Altergeist Dialog=near.zh-CN
幻变骚灵卡组。
AI_LV3 SUPPORT_NEW_MASTER_RULE
......@@ -114,27 +114,27 @@ Name=奇魔果 Deck=DarkMagician Dialog=kiwi.zh-TW
黑魔术师卡组。
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!MAX龍果
Name=MAX龍果 Deck=BlueEyesMaxDragon Dialog=kiwi.zh-TW
青眼混沌极龙卡组。
AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!幻煌果
Name=幻煌果 Deck=Phantasm Dialog=kiwi.zh-TW
幻煌龙卡组。
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!燃血鬥士
Name=燃血鬥士 Deck=ChainBurn Dialog=kiwi.zh-TW
连锁烧卡组。
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!報社鬥士
Name=報社鬥士 Deck=GrenMajuThunderBoarder Dialog=kiwi.zh-TW
红莲雷王滑板卡组。
AI_LV3 SUPPORT_NEW_MASTER_RULE
!复制梁龙-闪刀姬
Name=复制梁龙 Deck=SkyStriker Dialog=anothercopy.zh-CN
纯闪刀姬卡组。
AI_LV3 SUPPORT_NEW_MASTER_RULE
!報社鬥士
Name=報社鬥士 Deck=GrenMajuThunderBoarder Dialog=kiwi.zh-TW
紅蓮雷王滑板牌組
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!MAX龍果
Name=MAX龍果 Deck=BlueEyesMaxDragon Dialog=kiwi.zh-TW
青眼MAX龍牌組
AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!幻煌果
Name=幻煌果 Deck=Phantasm Dialog=kiwi.zh-TW
幻煌牌組
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
mobile/assets/data/conf/strings.conf
View file @ d1a672a2
......@@ -424,7 +424,7 @@
!system 1511 对方宣言了：[%ls]
!system 1512 对方选择了：[%d]
!system 1600 卡片改变了表示形式
!system 1601 放置了卡片
!system 1601 盖放了卡片
!system 1602 卡的控制权改变了
!system 1603 [%ls]召唤中
!system 1604 怪兽召唤成功
......@@ -540,6 +540,7 @@
!counter 0x47 指示物（限制代码）
!counter 0x48 指示物（连接死亡炮塔）
!counter 0x1049 警逻指示物
!counter 0x4a 运动员指示物
#setnames, using tab for comment
!setname 0x1 正义盟军 A・O・J
!setname 0x2 次世代 ジェネクス
......
mobile/assets_en/data/conf/bot.conf
View file @ d1a672a2
......@@ -70,7 +70,7 @@ Trickstar Beat Deck
AI_LV3 SUPPORT_NEW_MASTER_RULE
!Near-Altergeist
Name=AI-Near Deck=Altergeist Dialog=default
Name=Near Deck=Altergeist Dialog=default
Altergeist Beat Deck
AI_LV3 SUPPORT_NEW_MASTER_RULE
......@@ -114,27 +114,27 @@ Name=Kimomi Deck=DarkMagician Dialog=default
Dark Magician Deck
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!Maxryumi
Name=Maxryumi Deck=BlueEyesMaxDragon Dialog=default
Blues-eyes Chao MAX Dragon - Impcantation Deck
AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!Phantasmi
Name=Phantasmi Deck=Phantasm Dialog=default
Phantasm Beat Deck
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!BurningFighter
Name=BurningFighter Deck=ChainBurn Dialog=default
TimeLord Chain Burn Deck
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!MetaBeater
Name=MetaBeater Deck=GrenMajuThunderBoarder Dialog=default
GrenMajuThunderBoarder Deck
AI_LV3 SUPPORT_NEW_MASTER_RULE
!CopyDiplodocus-SkyStrikerAce
Name=CopyDiplodocus Deck=SkyStriker Dialog=default
Basic SkyStrikerAce Deck
AI_LV3 SUPPORT_NEW_MASTER_RULE
!MetaBeater
Name=AI-MetaBeater Deck=GrenMajuThunderBoarder Dialog=kiwi.zh-TW
GrenMajuThunderBoarder Deck
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!Maxryumi
Name=AI-Maxryumi Deck=BlueEyesMaxDragon Dialog=kiwi.zh-TW
Blues-eyes Chao MAX Dragon - Impcantation Deck
AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!Phantasmi
Name=AI-Phantasmi Deck=Phantasm Dialog=kiwi.zh-TW
Phantasm Beat Deck
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
mobile/assets_en/data/deck/[SAMPLE]Knight of Hanoi.ydk 0 → 100644
View file @ d1a672a2
#created by ...
#main
55885348
55885348
55885348
60349525
60349525
60349525
45458027
45458027
45458027
23850421
23850421
23850421
40634253
40634253
40634253
70095155
70095155
3113667
3113667
3113667
77565204
77565204
28053763
28053763
28053763
83764718
81439173
73628505
54447022
38120068
38120068
38120068
97077563
97077563
89208725
89208725
58464739
29649320
29649320
44095762
#extra
64599569
87116928
79229522
16114248
75433814
88120966
!side
1475311
1475311
44095762
74519184
mobile/assets_ko/data/conf/bot.conf
View file @ d1a672a2
......@@ -70,7 +70,7 @@ Name=尼亚 Deck=Trickstar Dialog=near.zh-CN
AI_LV3 SUPPORT_NEW_MASTER_RULE
!니어-함떡맨
Name=尼亚 Deck=Altergeist Dialog=zh-CN
Name=尼亚 Deck=Altergeist Dialog=near.zh-CN
얼터가이스터 덱입니다. (마스터룰4 사용 가능)
AI_LV3 SUPPORT_NEW_MASTER_RULE
......@@ -114,27 +114,27 @@ Name=奇魔果 Deck=DarkMagician Dialog=kiwi.zh-TW
마술사를 씁니다.
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!예진
Name=MAX龍果 Deck=BlueEyesMaxDragon Dialog=kiwi.zh-TW
카오스 맥스 푸른눈 덱입니다. (마스터룰3|마스터룰4 사용 가능)
AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!검은마법사
Name=幻煌果 Deck=Phantasm Dialog=kiwi.zh-TW
판타즘 비스트 덱입니다. (마스터룰3|마스터룰4 사용 가능)
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!열혈전사-체인 번
Name=燃血鬥士 Deck=ChainBurn Dialog=kiwi.zh-TW
체인 번 덱입니다. (마스터룰3|마스터룰4 사용 가능)
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!카피닌자 카카시 - 플래시 나이프
Name=复制梁龙 Deck=SkyStriker Dialog=kiwi.zh-TW
플래시 나이프
AI_LV3 SUPPORT_NEW_MASTER_RULE
!메타몽
Name=報社鬥士 Deck=GrenMajuThunderBoarder Dialog=kiwi.zh-TW
싼다드래곤 덱입니다. (마스터룰3|마스터룰4 사용 가능)
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
!예진
Name=MAX龍果 Deck=BlueEyesMaxDragon Dialog=kiwi.zh-TW
카오스 맥스 푸른눈 덱입니다. (마스터룰3|마스터룰4 사용 가능)
AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
AI_LV3 SUPPORT_NEW_MASTER_RULE
!검은마법사
Name=幻煌果 Deck=Phantasm Dialog=kiwi.zh-TW
판타즘 비스트 덱입니다. (마스터룰3|마스터룰4 사용 가능)
AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
\ No newline at end of file
!카피닌자 카카시 - 플래시 나이프
Name=复制梁龙 Deck=SkyStriker Dialog=anothercopy.zh-CN
플래시 나이프
AI_LV3 SUPPORT_NEW_MASTER_RULE
mobile/assets_ko/data/conf/strings.conf
View file @ d1a672a2
......@@ -540,6 +540,7 @@
!counter 0x47 카운터(리미트 코드)
!counter 0x48 카운터(벤데드)
!counter 0x1049 경찰카운터
!counter 0x4a 애슬리트 카운터
#setnames, using tab for comment
!setname 0x1 얼리 오브 저스티스(정발명:A·O·J)
!setname 0x2 제넥스
......
mobile/assets_ko/data/deck/[SAMPLE]Knight of Hanoi.ydk 0 → 100644
View file @ d1a672a2
#created by ...
#main
55885348
55885348
55885348
60349525
60349525
60349525
45458027
45458027
45458027
23850421
23850421
23850421
40634253
40634253
40634253
70095155
70095155
3113667
3113667
3113667
77565204
77565204
28053763
28053763
28053763
83764718
81439173
73628505
54447022
38120068
38120068
38120068
97077563
97077563
89208725
89208725
58464739
29649320
29649320
44095762
#extra
64599569
87116928
79229522
16114248
75433814
88120966
!side
1475311
1475311
44095762
74519184
mobile/build.gradle
View file @ d1a672a2
......@@ -8,7 +8,7 @@ android {
applicationId "cn.garymb.ygomobile"
minSdkVersion 16
targetSdkVersion 22
versionCode 33050906
versionCode 33050909
versionName "3.3.5"
flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true
......
mobile/src/main/java/cn/garymb/ygomobile/ui/home/ResCheckTask.java
View file @ d1a672a2
......@@ -327,21 +327,16 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
void onResCheckFinished(int result, boolean isNewVersion);
}
public void unregisterMReceiver(){
mContext.unregisterReceiver(mReceiver);
}
public void checkWindbot() {
Log.i("路径", mContext.getFilesDir().getPath());
Log.i("路径2", mSettings.getDataBasePath() + "/" + DATABASE_NAME);
try {
WindBot.initAndroid(mContext.getFilesDir().getPath(),
mSettings.getDataBasePath() + "/" + DATABASE_NAME,
mSettings.getResourcePath() +"/"+ CORE_BOT_CONF_PATH);
}catch (Throwable e){
mSettings.getResourcePath() + "/" + CORE_BOT_CONF_PATH);
} catch (Throwable e) {
e.printStackTrace();
}
MessageReceiver mReceiver = new MessageReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction("RUN_WINDBOT");
mContext.registerReceiver(mReceiver, filter);
......@@ -358,6 +353,10 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
}
}
public void unregisterMReceiver() {
mContext.unregisterReceiver(mReceiver);
}
Handler han = new Handler() {
@Override
......
mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/SettingFragment.java
View file @ d1a672a2
......@@ -178,7 +178,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
.setForced(true) //设置是否强制更新,非自定义回调更新接口此方法有用
.setUserCanRetry(true) //失败后是否提示重新下载，非自定义下载 apk 回调此方法有用
.setDeleteHistroyApk(true) // 检查更新前是否删除本地历史 Apk， 默认为true
/* .setUpdateManagerListener(new UpdateManagerListener() {
.setUpdateManagerListener(new UpdateManagerListener() {
@Override
public void onNoUpdateAvailable() {
Toast.makeText(getContext(), R.string.Already_Lastest, Toast.LENGTH_SHORT).show();
......@@ -192,7 +192,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
@Override
public void checkUpdateFailed(Exception e) {
}
})*/
})
.register();
}
if (PREF_PENDULUM_SCALE.equals(key)) {
......
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