mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-16 18:59:15 +07:00
fix that the rightsidebutton will change into another words when you touch tech button in tech tree switching from victorystatus screen. (#1122)
* 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 * update * update * update * update * update * update * update
This commit is contained in:

committed by
Yair Morgenstern

parent
f32f4de3a9
commit
df2faee2a8
@ -72,7 +72,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc
|
||||
val techButton = TechButton(tech.name,civTech,false)
|
||||
|
||||
techNameToButton[tech.name] = techButton
|
||||
techButton.onClick { selectTechnology(tech) }
|
||||
techButton.onClick { selectTechnology(tech, false, switchfromWorldScreen) }
|
||||
topTable.add(techButton)
|
||||
}
|
||||
}
|
||||
@ -115,10 +115,10 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc
|
||||
// and possibly select it to show description,
|
||||
// which is very helpful when just discovered and clicking the notification
|
||||
val tech = if (centerOnTech != null) centerOnTech else civInfo.tech.currentTechnology()
|
||||
if (tech != null && switchfromWorldScreen) {
|
||||
if (tech != null) {
|
||||
// select only if there it doesn't mess up tempTechsToResearch
|
||||
if (civInfo.tech.isResearched(tech.name) || civInfo.tech.techsToResearch.size <= 1)
|
||||
selectTechnology(tech, true)
|
||||
selectTechnology(tech, true, switchfromWorldScreen)
|
||||
else centerOnTechnology(tech)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user