Skip to content

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

3.3.6

parent fbc17d42
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 162 deletions
Classes/gframe/deck_con.cpp
View file @ c9318255
...@@ -62,6 +62,7 @@ static bool check_set_code(const CardDataC& data, int set_code) { ...@@ -62,6 +62,7 @@ static bool check_set_code(const CardDataC& data, int set_code) {
void DeckBuilder::Initialize() { void DeckBuilder::Initialize() {
mainGame->is_building = true; mainGame->is_building = true;
mainGame->is_siding = false; mainGame->is_siding = false;
mainGame->ClearCardInfo();
mainGame->wInfos->setVisible(true); mainGame->wInfos->setVisible(true);
mainGame->wCardImg->setVisible(true); mainGame->wCardImg->setVisible(true);
mainGame->wDeckEdit->setVisible(true); mainGame->wDeckEdit->setVisible(true);
...@@ -91,6 +92,7 @@ void DeckBuilder::Initialize() { ...@@ -91,6 +92,7 @@ void DeckBuilder::Initialize() {
} }
void DeckBuilder::Terminate() { void DeckBuilder::Terminate() {
mainGame->is_building = false; mainGame->is_building = false;
mainGame->ClearCardInfo();
mainGame->wDeckEdit->setVisible(false); mainGame->wDeckEdit->setVisible(false);
mainGame->wCategories->setVisible(false); mainGame->wCategories->setVisible(false);
mainGame->wFilter->setVisible(false); mainGame->wFilter->setVisible(false);
...@@ -297,7 +299,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -297,7 +299,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->env->addMessageBox(L"", dataManager.GetSysString(1410)); mainGame->env->addMessageBox(L"", dataManager.GetSysString(1410));
break; break;
} }
mainGame->imgCard->setImage(imageManager.tCover[0]); mainGame->ClearCardInfo();
char deckbuf[1024]; char deckbuf[1024];
char* pdeck = deckbuf; char* pdeck = deckbuf;
BufferIO::WriteInt32(pdeck, deckManager.current_deck.main.size() + deckManager.current_deck.extra.size()); BufferIO::WriteInt32(pdeck, deckManager.current_deck.main.size() + deckManager.current_deck.extra.size());
......
Classes/gframe/event_handler.cpp
View file @ c9318255
...@@ -992,14 +992,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -992,14 +992,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
if(mcard->code) { if(mcard->code) {
mainGame->ShowCardInfo(mcard->code); mainGame->ShowCardInfo(mcard->code);
} else { } else {
mainGame->imgCard->setScaleImage(true); mainGame->ClearCardInfo(mcard->controler);
mainGame->imgCard->setImage(imageManager.tCover[mcard->controler]);
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
} }
} }
if(id >= BUTTON_DISPLAY_0 && id <= BUTTON_DISPLAY_4) { if(id >= BUTTON_DISPLAY_0 && id <= BUTTON_DISPLAY_4) {
...@@ -1008,13 +1001,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1008,13 +1001,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
if(mcard->code) { if(mcard->code) {
mainGame->ShowCardInfo(mcard->code); mainGame->ShowCardInfo(mcard->code);
} else { } else {
mainGame->imgCard->setImage(imageManager.tCover[mcard->controler]); mainGame->ClearCardInfo(mcard->controler);
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
} }
} }
break; break;
...@@ -1592,14 +1579,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1592,14 +1579,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
} }
} else { } else {
should_show_tip = false; should_show_tip = false;
mainGame->imgCard->setImage(imageManager.tCover[mcard->controler]); mainGame->ClearCardInfo(mcard->controler);
mainGame->imgCard->setScaleImage(true);
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
} }
} }
hovered_card = mcard; hovered_card = mcard;
...@@ -1809,10 +1789,14 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -1809,10 +1789,14 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
} }
case CHECKBOX_QUICK_ANIMATION: { case CHECKBOX_QUICK_ANIMATION: {
mainGame->gameConf.quick_animation = mainGame->chkQuickAnimation->isChecked() ? 1 : 0; mainGame->gameConf.quick_animation = mainGame->chkQuickAnimation->isChecked() ? 1 : 0;
return true;
break;
} }
case CHECKBOX_DRAW_FIELD_SPELL: { case CHECKBOX_DRAW_FIELD_SPELL: {
mainGame->gameConf.draw_field_spell = mainGame->chkDrawFieldSpell->isChecked() ? 1 : 0; mainGame->gameConf.draw_field_spell = mainGame->chkDrawFieldSpell->isChecked() ? 1 : 0;
} return true;
break;
}
} }
break; break;
} }
......
Classes/gframe/game.cpp
View file @ c9318255
...@@ -448,7 +448,7 @@ bool Game::Initialize() { ...@@ -448,7 +448,7 @@ bool Game::Initialize() {
chkWaitChain = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, -1, dataManager.GetSysString(1277)); chkWaitChain = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, -1, dataManager.GetSysString(1277));
chkWaitChain->setChecked(gameConf.chkWaitChain != 0); chkWaitChain->setChecked(gameConf.chkWaitChain != 0);
posY += 60; posY += 60;
chkDrawFieldSpell = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_DRAW_FIELD_SPELL, dataManager.GetSysString(1277)); chkDrawFieldSpell = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_DRAW_FIELD_SPELL, dataManager.GetSysString(1279));
chkDrawFieldSpell->setChecked(gameConf.draw_field_spell != 0); chkDrawFieldSpell->setChecked(gameConf.draw_field_spell != 0);
posY += 60; posY += 60;
chkQuickAnimation = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_QUICK_ANIMATION, dataManager.GetSysString(1299)); chkQuickAnimation = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_QUICK_ANIMATION, dataManager.GetSysString(1299));
...@@ -1499,6 +1499,15 @@ void Game::ShowCardInfo(int code) { ...@@ -1499,6 +1499,15 @@ void Game::ShowCardInfo(int code) {
const auto& tsize = stText->getRelativePosition(); const auto& tsize = stText->getRelativePosition();
InitStaticText(stText, tsize.getWidth(), tsize.getHeight(), textFont, showingtext); InitStaticText(stText, tsize.getWidth(), tsize.getHeight(), textFont, showingtext);
} }
void Game::ClearCardInfo(int player) {
imgCard->setImage(imageManager.tCover[player]);
stName->setText(L"");
stInfo->setText(L"");
stDataInfo->setText(L"");
stSetName->setText(L"");
stText->setText(L"");
scrCardText->setVisible(false);
}
void Game::AddChatMsg(wchar_t* msg, int player) { void Game::AddChatMsg(wchar_t* msg, int player) {
for(int i = 7; i > 0; --i) { for(int i = 7; i > 0; --i) {
chatMsg[i] = chatMsg[i - 1]; chatMsg[i] = chatMsg[i - 1];
......
Classes/gframe/game.h
View file @ c9318255
...@@ -139,6 +139,7 @@ public: ...@@ -139,6 +139,7 @@ public:
void LoadConfig(); void LoadConfig();
void SaveConfig(); void SaveConfig();
void ShowCardInfo(int code); void ShowCardInfo(int code);
void ClearCardInfo(int player = 0);
void AddChatMsg(wchar_t* msg, int player); void AddChatMsg(wchar_t* msg, int player);
void ClearChatMsg(); void ClearChatMsg();
void AddDebugMsg(char* msgbuf); void AddDebugMsg(char* msgbuf);
......
Classes/gframe/menu_handler.cpp
View file @ c9318255
...@@ -242,17 +242,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -242,17 +242,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
break; break;
if(!ReplayMode::cur_replay.OpenReplay(mainGame->lstReplayList->getListItem(mainGame->lstReplayList->getSelected()))) if(!ReplayMode::cur_replay.OpenReplay(mainGame->lstReplayList->getListItem(mainGame->lstReplayList->getSelected())))
break; break;
mainGame->imgCard->setImage(imageManager.tCover[0]); mainGame->ClearCardInfo();
mainGame->imgCard->setScaleImage(true); mainGame->imgCard->setScaleImage(true);
mainGame->wCardImg->setVisible(true); mainGame->wCardImg->setVisible(true);
mainGame->wInfos->setVisible(true); mainGame->wInfos->setVisible(true);
mainGame->wReplay->setVisible(true); mainGame->wReplay->setVisible(true);
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
mainGame->wReplayControl->setVisible(true); mainGame->wReplayControl->setVisible(true);
mainGame->btnReplayStart->setVisible(false); mainGame->btnReplayStart->setVisible(false);
mainGame->btnReplayPause->setVisible(true); mainGame->btnReplayPause->setVisible(true);
......
Classes/gframe/single_mode.cpp
View file @ c9318255
...@@ -71,16 +71,11 @@ int SingleMode::SinglePlayThread(void* param) { ...@@ -71,16 +71,11 @@ int SingleMode::SinglePlayThread(void* param) {
rh.seed = seed; rh.seed = seed;
mainGame->gMutex.Lock(); mainGame->gMutex.Lock();
mainGame->HideElement(mainGame->wSinglePlay); mainGame->HideElement(mainGame->wSinglePlay);
mainGame->ClearCardInfo();
mainGame->wCardImg->setVisible(true); mainGame->wCardImg->setVisible(true);
mainGame->wInfos->setVisible(true); mainGame->wInfos->setVisible(true);
mainGame->btnLeaveGame->setVisible(true); mainGame->btnLeaveGame->setVisible(true);
mainGame->btnLeaveGame->setText(dataManager.GetSysString(1210)); mainGame->btnLeaveGame->setText(dataManager.GetSysString(1210));
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
mainGame->wPhase->setVisible(true); mainGame->wPhase->setVisible(true);
mainGame->dField.Clear(); mainGame->dField.Clear();
mainGame->dInfo.isFirst = true; mainGame->dInfo.isFirst = true;
......
gradle/wrapper/gradle-wrapper.properties
View file @ c9318255
#Sun May 13 10:11:00 CST 2018 #Tue Oct 02 18:36:28 CST 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
mobile/.gitignore
View file @ c9318255
/build /build
/assets/data/deck
/assets/data/fonts /assets/data/fonts
/assets/data/cards.cdb /assets/data/cards.cdb
/assets/data/main.zip /assets/data/main.zip
\ No newline at end of file
mobile/asset_cn/deck/[汉诺预组]汉诺骑士的完美手牌.ydk deleted 100644 → 0
View file @ fbc17d42
#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 @ c9318255
...@@ -22,10 +22,13 @@ ...@@ -22,10 +22,13 @@
<pre> <pre>
更新： 更新：
1.更新ygo内核； 1.更新ygo内核；
2.汉诺预组加入[魔法筒]；
3.新卡SR07+VJ； 3.新卡SR07+VJ；
优化： 优化：
1.辅助功能中支持加速模式； 1.辅助功能中支持加速模式；
2.辅助功能中支持开关场地背景； 2.辅助功能中支持开关场地背景；
3.字体放大一号；
4.微调UI方便点击；
</pre> </pre>
</body> </body>
</html> </html>
\ No newline at end of file
mobile/assets_en/data/deck/[SAMPLE]Knight of Hanoi.ydk → mobile/assets/data/deck/[SAMPLE]Knight of Hanoi.ydk
View file @ c9318255
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
3113667 3113667
3113667 3113667
77565204 77565204
77565204
28053763 28053763
28053763 28053763
28053763 28053763
...@@ -36,10 +35,11 @@ ...@@ -36,10 +35,11 @@
97077563 97077563
89208725 89208725
89208725 89208725
58464739
29649320 29649320
29649320 29649320
44095762 44095762
58464739
62279055
#extra #extra
64599569 64599569
87116928 87116928
...@@ -52,3 +52,4 @@ ...@@ -52,3 +52,4 @@
1475311 1475311
44095762 44095762
74519184 74519184
77565204
mobile/assets_ko/data/deck/[SAMPLE]Knight of Hanoi.ydk deleted 100644 → 0
View file @ fbc17d42
#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 @ c9318255
...@@ -8,7 +8,7 @@ android { ...@@ -8,7 +8,7 @@ android {
applicationId "cn.garymb.ygomobile" applicationId "cn.garymb.ygomobile"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 22 targetSdkVersion 22
versionCode 330601001 versionCode 330601002
versionName "3.3.6" versionName "3.3.6"
flavorDimensions "versionCode" flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
...@@ -50,9 +50,6 @@ android { ...@@ -50,9 +50,6 @@ android {
assets.srcDirs = ['assets'] assets.srcDirs = ['assets']
jniLibs.srcDirs = ['libs'] jniLibs.srcDirs = ['libs']
} }
cn{
assets.srcDirs = ['assets_cn']
}
en { en {
assets.srcDirs = ['assets_en'] assets.srcDirs = ['assets_en']
} }
......
mobile/src/main/res/values-ko/arrays.xml
View file @ c9318255
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources xmlns:tools="http://schemas.android.com/tools">
<string-array name="opengl_version_value" translatable="false"> <string-array name="opengl_version_value" translatable="false">
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
</string-array> </string-array>
<string-array name="tips"> <string-array name="tips" tools:ignore="InconsistentArrays">
<item>상대에 대한 예의를 지켜 게임을 즐기십시오.</item> <item>상대에 대한 예의를 지켜 게임을 즐기십시오.</item>
<item>설정에서 가상키를 끄고 킬 수 있습니다.</item> <item>설정에서 가상키를 끄고 킬 수 있습니다.</item>
<item>메인화면의 각 서버들은 좌측으로 밀어줄 경우 수정과 삭제가 가능합니다.</item> <item>메인화면의 각 서버들은 좌측으로 밀어줄 경우 수정과 삭제가 가능합니다.</item>
......
mobile/src/main/res/values-zh/arrays.xml
View file @ c9318255
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources xmlns:tools="http://schemas.android.com/tools">
<string-array name="opengl_version_value" translatable="false"> <string-array name="opengl_version_value" translatable="false">
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
</string-array> </string-array>
<string-array name="tips"> <string-array name="tips" tools:ignore="InconsistentArrays">
<item>游戏王圈子不大，珍惜一起玩的人</item> <item>游戏王圈子不大，珍惜一起玩的人</item>
<item>界面偏了还点不准？试试去「功能菜单」→「设置」→打勾/取消「在游戏隐藏虚拟键」</item> <item>界面偏了还点不准？试试去「功能菜单」→「设置」→打勾/取消「在游戏隐藏虚拟键」</item>
<item>主页每个服务器按住左划就会出现「编辑」和「删除」哦</item> <item>主页每个服务器按住左划就会出现「编辑」和「删除」哦</item>
......
mobile/src/main/res/values/arrays.xml
View file @ c9318255
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources xmlns:tools="http://schemas.android.com/tools">
<string-array name="opengl_version_value" translatable="false"> <string-array name="opengl_version_value" translatable="false">
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
</string-array> </string-array>
<string-array name="tips"> <string-array name="tips" tools:ignore="InconsistentArrays">
<item>Duel is One Thing, Kind is Everything</item> <item>Duel is One Thing, Kind is Everything</item>
<item>someting wrong while playing in Ygopro? try to go to「Setting」→check/cancel「Immersive Mode」</item> <item>someting wrong while playing in Ygopro? try to go to「Setting」→check/cancel「Immersive Mode」</item>
<item>you can Move Left every Severlist in Homepage to find「Edit」and「Delete」</item> <item>you can Move Left every Severlist in Homepage to find「Edit」and「Delete」</item>
......
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