Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 409d8abf authored by fallenstardust's avatar fallenstardust
Browse files
Options

Merge branch 'master' of https://github.com/fallenstardust/YGOMobile-cn-ko-en

parents aee96b6c 30f7a553
Hide whitespace changes
Inline Side-by-side
Showing with 331 additions and 10 deletions
Classes/gframe/config.h
View file @ 409d8abf
...@@ -80,7 +80,7 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) { ...@@ -80,7 +80,7 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
using namespace irr::io; using namespace irr::io;
using namespace irr::os; using namespace irr::os;
extern const unsigned short PRO_VERSION; constexpr uint16_t PRO_VERSION = 0x1362;
extern unsigned int enable_log; extern unsigned int enable_log;
extern bool exit_on_return; extern bool exit_on_return;
extern bool bot_mode; extern bool bot_mode;
......
Classes/gframe/game.cpp
View file @ 409d8abf
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <COGLESDriver.h> #include <COGLESDriver.h>
#endif #endif
const unsigned short PRO_VERSION = 0x1362;
namespace ygo { namespace ygo {
Game* mainGame; Game* mainGame;
......
mobile/build.gradle
View file @ 409d8abf
...@@ -9,8 +9,8 @@ android { ...@@ -9,8 +9,8 @@ android {
minSdkVersion 25 minSdkVersion 25
//noinspection ExpiredTargetSdkVersion //noinspection ExpiredTargetSdkVersion
targetSdkVersion 29 targetSdkVersion 29
versionCode 312000008 versionCode 312000009
versionName "3.12.6" versionName "3.12.6fix1"
flavorDimensions "versionCode" flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
ndkVersion "21.3.6528147" ndkVersion "21.3.6528147"
......
mobile/src/main/java/cn/garymb/ygomobile/utils/ComparisonTableUtil.java
View file @ 409d8abf
...@@ -834,7 +834,168 @@ public interface ComparisonTableUtil { ...@@ -834,7 +834,168 @@ public interface ComparisonTableUtil {
101302077, 101302077,
101302078, 101302078,
101302079, 101302079,
101302080 101302080,
101302081,
101302082,
101302083,
101302084,
101302085,
101302086,
101302087,
101302088,
101302089,
101302090,
101302091,
101302092,
101302093,
101302094,
101302095,
101302096,
100240001,
100240201,
100240003,
100240204,
100240005,
100240205,
100240007,
100240202,
100240203,
100240010,
100200274,
100200275,
100200276,
100200278,
100200279,
100247147,
100247148,
100247149,
100246001,
100246002,
100245001,
100245002,
100245003,
100245004,
100245005,
100245006,
100245007,
100245008,
100245009,
100245010,
100245011,
100245016,
100245017,
100245018,
100245019,
100245020,
100245021,
100245022,
100245023,
100245024,
100245025,
100245026,
100245031,
100245032,
100245033,
100245034,
100245035,
100245036,
100245037,
100245038,
100245039,
100245040,
100245041,
100244001,
100244002,
100244003,
100244004,
100244005,
100244006,
100244032,
100244033,
100238301,
100200280,
100248019,
100248041,
101303201,
101303202,
101303203,
101303004,
101303005,
101303006,
101303007,
101303008,
101303009,
101303010,
101303011,
101303012,
101303013,
101303014,
101303015,
101303016,
101303017,
101303018,
101303019,
101303020,
101303021,
101303022,
101303023,
101303024,
101303025,
101303026,
101303027,
101303028,
101303029,
101303030,
101303031,
101303204,
101303033,
101303034,
101303035,
101303036,
101303037,
101303038,
101303039,
101303040,
101303041,
101303042,
101303043,
101303044,
101303045,
101303046,
101303205,
101303206,
101303049,
101303050,
101303051,
101303207,
101303053,
101303054,
101303055,
101303056,
101303057,
101303058,
101303059,
101303060,
101303061,
101303062,
101303063,
101303064,
101303065,
101303066,
101303067,
101303068,
101303069,
101303208,
101303071,
101303072,
101303073,
101303074,
101303075,
101303076,
101303077,
101303078,
101303079,
101303080
}; };
int[] newIDsArray = { int[] newIDsArray = {
...@@ -1667,6 +1828,167 @@ public interface ComparisonTableUtil { ...@@ -1667,6 +1828,167 @@ public interface ComparisonTableUtil {
80208225, 80208225,
16693934, 16693934,
42091632, 42091632,
89086647 89086647,
87750925,
23249029,
50643638,
86038337,
13023431,
55421040,
81916745,
18300894,
54399598,
81794107,
17188206,
44573911,
80071619,
16066654,
43450363,
79859067,
8445808,
44839512,
71228611,
7622360,
33017964,
70105073,
2507443,
6500778,
33995387,
69389481,
3837261,
88039509,
60681372,
30394645,
84824728,
72162751,
9567495,
45951104,
37301660,
212652,
95365081,
32759190,
68144894,
95132593,
21637502,
67021206,
94410955,
20415050,
57809669,
93294363,
29792472,
56187077,
92171126,
29570824,
55965529,
82359538,
28454232,
54842941,
81237046,
17621695,
54020393,
80015408,
16509007,
43904702,
89392810,
16387555,
42781164,
88170262,
15665977,
41069676,
78058681,
14442329,
40847034,
17201951,
54656950,
80054655,
16449363,
43834302,
89932017,
16327715,
42711820,
11212437,
86289475,
30271097,
76666602,
25554552,
51548207,
98937206,
24431911,
51826619,
87814728,
23219323,
50604072,
86098176,
13597785,
59581480,
85976588,
12375297,
58769832,
85154941,
11248645,
47647354,
84031359,
10426067,
78910832,
5121528,
41516133,
47425162,
73819701,
19304410,
46708514,
12197223,
49181828,
85586937,
12975671,
48469380,
84464389,
11852093,
47247792,
74631897,
10136446,
42125140,
79519259,
5914858,
42302563,
78397661,
4891376,
31286915,
77675029,
4079728,
30064423,
66452432,
3957130,
39341885,
66736884,
2725599,
38129297,
65514302,
91002901,
38007649,
64491754,
90880453,
27285068,
63679166,
90764871,
26162470,
53557529,
99941223,
4909946,
25940932,
52335937,
98829635,
25224340,
51612489,
87607094,
50590801,
24092792,
87985506,
13379114,
59374259,
86762958,
12157563,
49652661,
85640370,
11035075
}; };
} }
\ No newline at end of file
mobile/src/main/res/values-es/strings.xml
View file @ 409d8abf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="StringFormatInvalid"> <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="StringFormatInvalid">
<!--string name="app_name">YGOMobile</string--> <!--string name="app_name">YGOMobile</string-->
<string name="action_settings">Configuración</string> <string name="action_settings">Configuración</string>
<string name="action_game">Un jugador</string> <string name="action_game">Solitario</string>
<string name="action_about">Acerca de</string> <string name="action_about">Acerca de</string>
<string name="dont_start_game">No se puede iniciar el juego</string> <string name="dont_start_game">No se puede iniciar el juego</string>
<!-- check --> <!-- check -->
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<string name="label_category">Categoría</string> <string name="label_category">Categoría</string>
<string name="linkmarker">◀F.Enlace▶</string>> <string name="linkmarker">◀F.Enlace▶</string>>
<string name="searching">Cargando</string> <string name="searching">Cargando</string>
<string name="card_faq">Consultar reglas</string> <string name="card_faq">Ver reglas</string>
<string name="card_related">Relacionadas</string> <string name="card_related">Relacionadas</string>
<string name="no_webbrowser">No hay navegador instalado</string> <string name="no_webbrowser">No hay navegador instalado</string>
<string name="load_game">Iniciando juego</string> <string name="load_game">Iniciando juego</string>
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
<string name="screenshoot">Compartir imagen</string> <string name="screenshoot">Compartir imagen</string>
<string name="ydk_share">Compartir archivo</string> <string name="ydk_share">Compartir archivo</string>
<string name="no_share_app">No se encontró la aplicación para compartir</string> <string name="no_share_app">No se encontró la aplicación para compartir</string>
<string name="intput_room_name">Ingresa la contraseña (opcional)</string> <string name="intput_room_name">Ingresa la contraseña</string>
<string name="join">Unirse</string> <string name="join">Unirse</string>
<string name="quick_join">Unirse a la sala</string> <string name="quick_join">Unirse a la sala</string>
<string name="join_game">Entrar al juego</string> <string name="join_game">Entrar al juego</string>
...@@ -385,3 +385,4 @@ ...@@ -385,3 +385,4 @@
<string name="pre_view">Vista previa</string> <string name="pre_view">Vista previa</string>
</resources> </resources>
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