From c8271aed5b72bcfb00f2a8ea678db87b0ea76e9a Mon Sep 17 00:00:00 2001 From: JLMin <2479297@qq.com> Date: Mon, 12 Oct 2020 22:46:40 +0800 Subject: [PATCH] fix theme helper --- mod/cui.modinfo | 2 +- mod/lib/cui_update.lua | 4 ++-- mod/modules/great_work/base/greatworksoverview.lua | 7 +++++++ scripts/build.py | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mod/cui.modinfo b/mod/cui.modinfo index efef214..c779f7c 100644 --- a/mod/cui.modinfo +++ b/mod/cui.modinfo @@ -1,5 +1,5 @@ - + [COLOR_Civ6LightBlue]Concise UI[ENDCOLOR] For a better gaming experience. diff --git a/mod/lib/cui_update.lua b/mod/lib/cui_update.lua index 8d3a0e4..c4eff35 100644 --- a/mod/lib/cui_update.lua +++ b/mod/lib/cui_update.lua @@ -1,3 +1,3 @@ -CuiVersion = "1.6.1" -LastUpdate = "2020-10-07" +CuiVersion = "1.6.2" +LastUpdate = "2020-10-12" VersionDetail = "Concise UI - " .. CuiVersion .. "[NEWLINE]" .. "Last Update: " .. LastUpdate diff --git a/mod/modules/great_work/base/greatworksoverview.lua b/mod/modules/great_work/base/greatworksoverview.lua index 7a517b9..085e849 100644 --- a/mod/modules/great_work/base/greatworksoverview.lua +++ b/mod/modules/great_work/base/greatworksoverview.lua @@ -514,6 +514,13 @@ function PopulateGreatWork(instance:table, pCityBldgs:table, pBuildingInfo:table else instance.GreatWorkIcon:SetHide(false); + -- CUI >> setup masks + CuiSetLockMask(instance, pCityBldgs, buildingIndex, slotIndex) + CuiSetThemeMask(instance, pCityBldgs, buildingIndex, slotIndex) + instance.LockMask:SetHide(cui_ThemeHelper) + instance.ThemeMask:SetHide(not cui_ThemeHelper) + -- << CUI + local srcGreatWork:number = pCityBldgs:GetGreatWorkInSlot(buildingIndex, slotIndex); local srcGreatWorkType:number = pCityBldgs:GetGreatWorkTypeFromIndex(srcGreatWork); local srcGreatWorkObjectType:string = GameInfo.GreatWorks[srcGreatWorkType].GreatWorkObjectType; diff --git a/scripts/build.py b/scripts/build.py index 798a09b..2a36a4d 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -11,7 +11,7 @@ # Version GAME_VERSION = '1.0.5.11 (516180)' -MOD_VERSION = '1.6.1' +MOD_VERSION = '1.6.2' # Paths PATH_PROJECT = Path(__file__).parents[1]