mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-20 09:17:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Select box, text field and picker screens now look much nicer

Browse Source
This commit is contained in:
Yair Morgenstern 2018-06-12 22:46:23 +03:00
parent 66f2ad1f3e
commit 0eb28ab679
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/assets/jsons/Units.json
View File

@ -5,27 +5,27 @@
/* Ancient Era */
{
name:"Worker",
unitType:"Civilian",
baseDescription: "Can build improvements on tiles",
movement:2,
unitType:"Civilian",
hurryCostModifier:20,
cost:70
},
{
name:"Settler",
unitType:"Civilian",
baseDescription: "Founds a new city",
movement:2,
unitType:"Civilian",
cost:106,
hurryCostModifier:20
},
{
name:"Scout",
cost:25,
unitType:"Scout",
movement:2,
strength:5,
cost:25,
uniques:["Ignores terrain cost"]
movement:2
},
{
name:"Warrior",

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.game"
minSdkVersion 14
targetSdkVersion 26
versionCode 81
versionName "2.4.11"
versionCode 82
versionName "2.4.11.2"
}
buildTypes {
release {

1
core/src/com/unciv/ui/pickerscreens/PickerScreen.kt
View File

@ -29,7 +29,6 @@ open class PickerScreen : CameraStageBaseScreen() {
descriptionLabel = Label("", CameraStageBaseScreen.skin)
descriptionLabel.setWrap(true)
descriptionLabel.setFontScale(1.5f)
val labelScroll = ScrollPane(descriptionLabel)
bottomTable.add(labelScroll).pad(5f).width(stage.width / 2)

2
core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
View File

@ -69,7 +69,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen()
} else
civTech.techsToResearch = techsToResearch
game.setWorldScreen()
game.worldScreen!!.update()
game.worldScreen.update()
dispose()
}

6
core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
View File

@ -93,7 +93,11 @@ open class CameraStageBaseScreen : Screen {
var skin = Skin(Gdx.files.internal("skin/flat-earth-ui.json"))
.apply {
get<TextButton.TextButtonStyle>(TextButton.TextButtonStyle::class.java).font = getFont(20)
get<Label.LabelStyle>(Label.LabelStyle::class.java).font = getFont(18) }
get<Label.LabelStyle>(Label.LabelStyle::class.java).font = getFont(18)
get<TextField.TextFieldStyle>(TextField.TextFieldStyle::class.java).font = getFont(18)
get<SelectBox.SelectBoxStyle>(SelectBox.SelectBoxStyle::class.java).font = getFont(20)
get<SelectBox.SelectBoxStyle>(SelectBox.SelectBoxStyle::class.java).listStyle.font = getFont(20)
}
internal var batch: Batch = SpriteBatch()
}