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

fix display tutorial, please update immediately (#1176)

Browse Source 
* update

* update
This commit is contained in:
lishaoxia1985
2019-10-10 04:40:02 +08:00
committed by Yair Morgenstern
parent f21e508b28
commit 4baa7b6105
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/assets/jsons/Translations/Techs.json
View File

@ -994,6 +994,10 @@
"'Aeronautics was neither an industry nor a science. It was a miracle.' - Igor Sikorsky":{
Simplified_Chinese:"“航空既不是一种工业也不是一门科学。它是一个奇迹。”——伊戈尔·西科尔斯基（俄裔美籍飞机设计师）"
}
"'The introduction of so powerful an agent as steam to a carriage on wheels will make a great change in the situation of man.' - Thomas Jefferson":{//"Railroad" Technology quotes, it has been translated somewhere.
Simplified_Chinese:"“引入蒸汽这样一个强大的助手来驱动车轮进行运输，将极大地改变人类的境地。”——托马斯·杰斐逊"
}
///////// Technologies (Information Era)

2
core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
View File

@ -95,7 +95,7 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
}
private fun onTileClicked(tileInfo: TileInfo) {
worldScreen.displayTutorials("TileClicked")
worldScreen.displayTutorials("Tile_Clicked")
unitActionOverlay?.remove()
selectedTile = tileInfo

10
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -101,7 +101,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
stage.addActor(unitActionsTable)
displayTutorials("New_Game")
displayTutorials("TileLayout")
displayTutorials("World_Map")
createNextTurnButton() // needs civ table to be positioned
@ -207,12 +207,12 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
UnCivGame.Current.settings.save()
}
if (bottomBar.unitTable.selectedUnit != null) displayTutorials("UnitSelected")
if (bottomBar.unitTable.selectedUnit != null) displayTutorials("Unit_Selected")
if (viewingCiv.cities.isNotEmpty()){
displayTutorials("_City_Founded")
displayTutorials("First_Steps")
}
if (UnCivGame.Current.settings.tutorialsShown.contains("Cities")) displayTutorials("AfterCityEntered")
if (UnCivGame.Current.settings.tutorialsShown.contains("Cities")) displayTutorials("Next_Turn")
if (!UnCivGame.Current.settings.tutorialsShown.contains("_EnemyCityNeedsConqueringWithMeleeUnit")) {
@ -429,7 +429,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
private fun showTutorialsOnNextTurn(){
val shownTutorials = UnCivGame.Current.settings.tutorialsShown
displayTutorials("NextTurn")
displayTutorials("Slow_Start")
if("_BarbarianEncountered" !in shownTutorials
&& viewingCiv.viewableTiles.any { it.getUnits().any { unit -> unit.civInfo.isBarbarian() } })
displayTutorials("_BarbarianEncountered")
@ -438,7 +438,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
if(viewingCiv.getHappiness() < 0) displayTutorials("Unhappiness")
if(viewingCiv.goldenAges.isGoldenAge()) displayTutorials("Golden_Age")
if(gameInfo.turns >= 50 && UnCivGame.Current.settings.checkForDueUnits) displayTutorials("Idle_Units")
if(gameInfo.turns >= 100) displayTutorials("ContactMe")
if(gameInfo.turns >= 100) displayTutorials("Contact_Me")
val resources = viewingCiv.getCivResources()
if(resources.any { it.resource.resourceType==ResourceType.Luxury }) displayTutorials("Luxury_Resource")
if(resources.any { it.resource.resourceType==ResourceType.Strategic}) displayTutorials("Strategic_Resource")