mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-31 15:19:29 +07:00
instead some font-sizes with the one is often used in game and doesn't need to be created again, adjust the construction table in city screen (#1080)
* systemProp * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * fix that researched tech can be picked when we pick a free tech * update to master * update * Update TechPickerScreen.kt * delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align. * update * language polish is wrong to be writing "polski" * 显示教程 * update * update * update * update * update * update * update * viewport
This commit is contained in:
lishaoxia1985
committed by
Yair Morgenstern
Yair Morgenstern
parent
f03dfc10d6
commit
390254b584
@ -717,7 +717,7 @@
|
||||
German:"Für [amount] Gold kaufen"
|
||||
Dutch:"Voor [amount] gold kopen"
|
||||
Spanish:"Comprar por [amount] de oro"
|
||||
Simplified_Chinese:"购买花费[amount]金钱"
|
||||
Simplified_Chinese:"花费[amount]金钱购买"
|
||||
Portuguese:"Comprar por [amount] ouro"
|
||||
Japanese:"[amount]ゴールドで購入する"
|
||||
}
|
||||
@ -912,7 +912,7 @@
|
||||
German:"Erweiterung in [turnsToExpansion] Runden"
|
||||
Dutch:"Uitbreiding in [turnsToExpansion] rondes"
|
||||
Spanish:"[turnsToExpansion] rondas hasta la expansión"
|
||||
Simplified_Chinese:"这座城市将在[turnsToExpansion]回合后扩张"
|
||||
Simplified_Chinese:"此城市将在[turnsToExpansion]回合后扩张"
|
||||
Portuguese:"[turnsToExpansion] turnos até a expansão"
|
||||
Japanese:"[turnsToExpansion]が拡大に変わります"
|
||||
}
|
||||
@ -938,7 +938,7 @@
|
||||
German:"Neuer Einwohner in [turnsToPopulation] Runden"
|
||||
Dutch:"Een nieuwe inwoner in [turnsToPopulation] rondes"
|
||||
Spanish:"[turnsToPopulation] rondas hasta un nuevo residente"
|
||||
Simplified_Chinese:"这座城市将在[turnsToPopulation]轮后有1个新市民"
|
||||
Simplified_Chinese:"此城市将在[turnsToPopulation]轮后有1个新市民"
|
||||
Portuguese:"[turnsToPopulation] turnos até um novo residente"
|
||||
Japanese:"[turnsToPopulation]新しい人口に目を向けます"
|
||||
}
|
||||
@ -951,7 +951,7 @@
|
||||
German:"Bevölkerungsverlust in [turnsToStarvation] Runden"
|
||||
Dutch:"Bevolkingsverlies in [turnsToStarvation] rondes"
|
||||
Spanish:"Pérdida de población en [turnsToStarvation] turnos"
|
||||
Simplified_Chinese:"这座城市将在[turnsToStarvation]轮后失去1个市民"
|
||||
Simplified_Chinese:"此城市将在[turnsToStarvation]轮后失去1个市民"
|
||||
Portuguese:"Perda de população em [turnsToStarvation] turnos"
|
||||
Japanese:"[turnsToStarvation]人口を減らす"
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@ class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseS
|
||||
val width = cityScreen.stage.width/4 - 2*pad
|
||||
val showHideTableWrapper = Table()
|
||||
showHideTableWrapper.add(showHideTable).width(width)
|
||||
titleTable.add(str.toLabel().setFontSize(22))
|
||||
titleTable.add(str.toLabel().setFontSize(24))
|
||||
titleTable.onClick {
|
||||
if(showHideTableWrapper.hasChildren()) showHideTableWrapper.clear()
|
||||
else showHideTableWrapper.add(showHideTable).width(width)
|
||||
|
||||
@ -88,7 +88,8 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
|
||||
topCityStatsTable = getCityStatsTable()
|
||||
topCityStatsTable.setPosition(5f, stage.height-5, Align.topLeft)
|
||||
stage.addActor(topCityStatsTable)
|
||||
stage.addActor(topCityStatsTable)
|
||||
constructionsTable.height=stage.height-topCityStatsTable.height
|
||||
constructionsTable.setPosition(5f, stage.height-5-topCityStatsTable.height, Align.topLeft)
|
||||
|
||||
if (city.getCenterTile().getTilesAtDistance(4).isNotEmpty()){
|
||||
displayTutorials("CityRange")
|
||||
|
||||
@ -39,7 +39,7 @@ class CityScreenCityPickerTable(val cityScreen: CityScreen) : Table(){
|
||||
}
|
||||
|
||||
val currentCityLabel = Label(city.name + " (" + city.population.population + ")", CameraStageBaseScreen.skin)
|
||||
currentCityLabel.setFontSize(25)
|
||||
currentCityLabel.setFontSize(30)
|
||||
currentCityLabel.onClick {
|
||||
val editCityNamePopup = PopupTable(cityScreen)
|
||||
val textArea = TextField(city.name, CameraStageBaseScreen.skin)
|
||||
|
||||
@ -73,7 +73,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
|
||||
if(list.isEmpty()) return
|
||||
val titleTable = Table()
|
||||
titleTable.background = ImageGetter.getBackground(ImageGetter.getBlue())
|
||||
titleTable.add(title.toLabel())
|
||||
titleTable.add(title.toLabel().setFontSize(24))
|
||||
|
||||
addSeparator()
|
||||
add(titleTable).fill().row()
|
||||
@ -128,7 +128,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
|
||||
}
|
||||
constructionPickerTable.addCategory("Other",specialConstructions)
|
||||
|
||||
val scrollPane = ScrollPane(constructionPickerTable, skin)
|
||||
val scrollPane = ScrollPane(constructionPickerTable.addBorder(2f, Color.WHITE))
|
||||
|
||||
// This is to keep the same amount of scrolling on the construction picker scroll between refresh()es
|
||||
if(constructionScrollPane!=null){
|
||||
@ -138,7 +138,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
|
||||
}
|
||||
constructionScrollPane = scrollPane
|
||||
|
||||
add(scrollPane).height(stage.height / 3).minWidth(stage.width/4).row()
|
||||
add(scrollPane).maxHeight(stage.height / 3 * (stage.height/600)).row()
|
||||
}
|
||||
|
||||
private fun addCurrentConstructionTable(city: CityInfo) {
|
||||
|
||||
@ -126,7 +126,7 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
|
||||
.fillY() // provide full-height clicking area
|
||||
|
||||
if (UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isCurrentPlayer())
|
||||
iconTable.add(getConstructionGroup(city.cityConstructions)).padRight(10f)
|
||||
iconTable.add(getConstructionGroup(city.cityConstructions)).padRight(10f).padLeft(10f)
|
||||
else if (city.civInfo.isMajorCiv()) {
|
||||
val nationIcon = ImageGetter.getNationIcon(city.civInfo.nation.name)
|
||||
nationIcon.color = secondaryColor
|
||||
@ -176,7 +176,7 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
|
||||
val turnsToConstruction = cityConstructions.turnsToConstruction(cityCurrentConstruction.name)
|
||||
val label = turnsToConstruction.toString().toLabel()
|
||||
label.setFontColor(secondaryColor)
|
||||
label.setFontSize(10)
|
||||
label.setFontSize(14)
|
||||
label.pack()
|
||||
group.addActor(label)
|
||||
|
||||
|
||||
@ -65,8 +65,8 @@ class Fonts {
|
||||
if(withChinese) {
|
||||
if (Gdx.files.internal("jsons/BasicHelp/BasicHelp_Simplified_Chinese.json").exists())
|
||||
charSet.addAll(Gdx.files.internal("jsons/BasicHelp/BasicHelp_Simplified_Chinese.json").readString().asIterable())
|
||||
if (Gdx.files.internal("jsons/Nations_Simplified_Chinese.json").exists())
|
||||
charSet.addAll(Gdx.files.internal("jsons/Nations_Simplified_Chinese.json").readString().asIterable())
|
||||
if (Gdx.files.internal("jsons/Nations/Nations_Simplified_Chinese.json").exists())
|
||||
charSet.addAll(Gdx.files.internal("jsons/Nations/Nations_Simplified_Chinese.json").readString().asIterable())
|
||||
if (Gdx.files.internal("jsons/Tutorials/Tutorials_Simplified_Chinese.json").exists())
|
||||
charSet.addAll(Gdx.files.internal("jsons/Tutorials/Tutorials_Simplified_Chinese.json").readString().asIterable())
|
||||
|
||||
|
||||
@ -254,7 +254,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
|
||||
buttonPic.background = ImageGetter.getDrawable("OtherIcons/civTableBackground")
|
||||
.tint(colorFromRGB(7, 46, 43))
|
||||
buttonPic.defaults().pad(20f)
|
||||
buttonPic.add("{Pick a tech}!".toLabel().setFontColor(Color.WHITE).setFontSize(24))
|
||||
buttonPic.add("{Pick a tech}!".toLabel().setFontColor(Color.WHITE).setFontSize(30))
|
||||
techButtonHolder.add(buttonPic)
|
||||
}
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user