diff --git a/android/build.gradle b/android/build.gradle index 81645a24fb..6c1f38e4b3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 39 - versionName "1.4.6" + versionCode 40 + versionName "1.4.7" } buildTypes { release { diff --git a/android/src/com/unciv/game/AndroidLauncher.java b/android/src/com/unciv/game/AndroidLauncher.java index 86edfc276b..b6ab5e389e 100644 --- a/android/src/com/unciv/game/AndroidLauncher.java +++ b/android/src/com/unciv/game/AndroidLauncher.java @@ -10,6 +10,6 @@ public class AndroidLauncher extends AndroidApplication { protected void onCreate (Bundle savedInstanceState) { super.onCreate(savedInstanceState); AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); - initialize(new com.unciv.ui.UnCivGame(), config); + initialize(new com.unciv.UnCivGame(), config); } } diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt index 79c676f275..24c139c0de 100644 --- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt @@ -5,8 +5,8 @@ import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align -import com.unciv.logic.map.TileInfo import com.unciv.UnCivGame +import com.unciv.logic.map.TileInfo import com.unciv.ui.cityscreen.CityScreen import com.unciv.ui.cityscreen.addClickListener import com.unciv.ui.utils.CameraStageBaseScreen @@ -16,6 +16,7 @@ import com.unciv.ui.utils.ImageGetter class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) { var cityButton: Table? = null private var unitImage: Group? = null + //private var whiteCircleAroundUnit private var circleImage = ImageGetter.getImage("UnitIcons/Circle.png") @@ -83,7 +84,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) { unitImage = null } - if (tileInfo.unit != null && color.a==1f) { // Tile is visible + if (tileInfo.unit != null && isViewable) { // Tile is visible val unit = tileInfo.unit!! unitImage = getUnitImage(unit.name, unit.civInfo.getCivilization().getColor()) addActor(unitImage!!)