diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 02028bb9..897480db 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -405,7 +405,7 @@ BuildingIcons/Paper Maker index: -1 BuildingIcons/Pentagon rotate: false - xy: 1202, 546 + xy: 1304, 648 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -818,21 +818,21 @@ ImprovementIcons/Quarry index: -1 ImprovementIcons/Railroad rotate: false - xy: 894, 342 + xy: 996, 342 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Railroad rotate: false - xy: 894, 342 + xy: 996, 342 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 894, 342 + xy: 996, 342 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1035,7 +1035,7 @@ OtherIcons/MenuIcon index: -1 OtherIcons/Pentagon rotate: false - xy: 1304, 648 + xy: 1202, 546 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2127,7 +2127,7 @@ TechIcons/Radio index: -1 TechIcons/Railroad rotate: false - xy: 996, 342 + xy: 894, 342 size: 100, 100 orig: 100, 100 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index a83005fb..c97d8eac 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index d39e1741..4c81a135 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -803,6 +803,7 @@ Italian:"Forte Mughal" French:"Fort Monghol" Polish:"Fort Mogołów" + Simplified_Chinese:"莫卧儿城塞" } "Alhambra":{ diff --git a/android/assets/jsons/Translations/Techs.json b/android/assets/jsons/Translations/Techs.json index b3e127dd..4f6204e1 100644 --- a/android/assets/jsons/Translations/Techs.json +++ b/android/assets/jsons/Translations/Techs.json @@ -727,6 +727,7 @@ "Radar":{ Italian:"Radar" Russian:"Радар" + Simplified_Chinese:"雷达" } ///////// Technologies (Information Era) @@ -770,6 +771,7 @@ "Mobile Tactics":{ Italian:"Tattiche mobili" Russian:"Мобильная тактика" + Simplified_Chinese:"机动战术" } "Combined Arms":{ @@ -835,6 +837,7 @@ Italian:"Laser" French:"Lasers" Russian:"Лазеры" + Simplified_Chinese:"激光" } "Nanotechnology":{ diff --git a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json index 1a377ca4..91f9fb8c 100644 --- a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json +++ b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json @@ -847,4 +847,8 @@ Portuguese:"Alfândega" } + "Barbarian encampment":{ + Simplified_Chinese:"蛮族营地" + } + } \ No newline at end of file diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index ed7b9a2b..3f131480 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -186,6 +186,7 @@ "Brute":{ Russian:"Громила" Italian:"Bruto" + Simplified_Chinese:"蛮族勇士" } @@ -479,6 +480,7 @@ Italian:"Elefante da guerra" French:"Éléphant de Guerre" Russian:"Боевой слон" + Simplified_Chinese:"印度战象" } ////// Medieval units @@ -590,6 +592,7 @@ Italian:"Lanzichenecco" French:"Lansquenet" Russian:"Ландскнехт" + Simplified_Chinese:"自由佣兵" } "Knight":{ @@ -687,6 +690,7 @@ Italian:"Giannizzero" French:"Janissaire" Russian:"Янычары" + Simplified_Chinese:"苏丹亲兵" } "Heals [amountHealed] damage if it kills a unit":{ @@ -741,6 +745,7 @@ Italian:"Sipahi"//same as in Italian Russian:"Сипаи" //same in french + Simplified_Chinese:"西帕希骑兵" } "No movement cost to pillage":{ @@ -1136,6 +1141,10 @@ Russian:"Истребитель" } + "Zero":{ + Simplified_Chinese:"零式战斗机" + } + "Helicopter Gunship":{ Italian:"Elicottero da guerra" Romanian:"Elicopter de atac" diff --git a/android/build.gradle b/android/build.gradle index bdb1fa63..cdbb2e09 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,6 @@ android { - buildToolsVersion "28.0.3" - compileSdkVersion 28 + buildToolsVersion "29.0.2" + compileSdkVersion 29 sourceSets { main { manifest.srcFile 'AndroidManifest.xml' diff --git a/build.gradle b/build.gradle index 2285ff81..dfa8620b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlinVersion = '1.3.41' + ext.kotlinVersion = '1.3.50' dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" @@ -8,6 +8,11 @@ buildscript { repositories { + // 以下四行代码为阿里gradle 源 + maven{ url 'https://maven.aliyun.com/repository/jcenter'} + maven{ url 'https://maven.aliyun.com/repository/google'} + maven{ url 'https://maven.aliyun.com/repository/gradle-plugin'} + maven{ url 'https://maven.aliyun.com/repository/public'} google() mavenLocal() mavenCentral() @@ -16,7 +21,7 @@ buildscript { } dependencies { classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1' } } @@ -36,6 +41,11 @@ allprojects { } repositories { + // 以下四行代码为阿里gradle 源 + maven{ url 'https://maven.aliyun.com/repository/jcenter'} + maven{ url 'https://maven.aliyun.com/repository/google'} + maven{ url 'https://maven.aliyun.com/repository/gradle-plugin'} + maven{ url 'https://maven.aliyun.com/repository/public'} google() jcenter() mavenLocal()