Update - 1.9.0.103
EN: 1.9.0.103 CN: 1.9.0.104 JP: 1.9.0.106 KR: 1.9.0.108
This commit is contained in:
@@ -24,8 +24,10 @@ MallPackageItemCtrl._mapNodeConfig = {
|
||||
goSaleRate = {
|
||||
sComponentName = "RectTransform"
|
||||
},
|
||||
fxSaleRate = {sNodeName = "goSaleRate", sComponentName = "UIShiny"},
|
||||
txtSaleRate = {sComponentName = "TMP_Text"},
|
||||
imgMask = {},
|
||||
imgSaleMask = {},
|
||||
reddotPkg = {},
|
||||
reddotNew = {}
|
||||
}
|
||||
@@ -100,7 +102,10 @@ end
|
||||
function MallPackageItemCtrl:RefreshCond(mapCfg, mapData)
|
||||
local tbCond = decodeJson(mapCfg.OrderCondParams)
|
||||
local bPurchaseAble = PlayerData.Shop:CheckShopCond(mapCfg.OrderCondType, tbCond)
|
||||
self._mapNode.imgMask:SetActive(mapData.nCurStock == 0 or not bPurchaseAble)
|
||||
local bShowMask = mapData.nCurStock == 0 or not bPurchaseAble
|
||||
self._mapNode.imgMask:SetActive(bShowMask)
|
||||
self._mapNode.imgSaleMask:SetActive(bShowMask)
|
||||
NovaAPI.SetComponentEnable(self._mapNode.fxSaleRate, not bShowMask)
|
||||
self._mapNode.goCondition:SetActive(not bPurchaseAble)
|
||||
self._mapNode.goSoldOut:SetActive(mapData.nCurStock == 0)
|
||||
if not bPurchaseAble then
|
||||
|
||||
@@ -317,19 +317,19 @@ function MallRecommendCtrl:GetTimeText(remainTime)
|
||||
local sTimeStr = ""
|
||||
if remainTime <= 60 then
|
||||
local sec = math.floor(remainTime)
|
||||
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Sec") or "", sec)
|
||||
sTimeStr = orderedFormat(ConfigTable.GetUIText("Mall_Remain_Time_Sec") or "", sec)
|
||||
elseif 60 < remainTime and remainTime <= 3600 then
|
||||
local min = math.floor(remainTime / 60)
|
||||
local sec = math.floor(remainTime - min * 60)
|
||||
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Min") or "", min, sec)
|
||||
sTimeStr = orderedFormat(ConfigTable.GetUIText("Mall_Remain_Time_Min") or "", min, sec)
|
||||
elseif 3600 < remainTime and remainTime <= 86400 then
|
||||
local hour = math.floor(remainTime / 3600)
|
||||
local min = math.floor((remainTime - hour * 3600) / 60)
|
||||
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Hour") or "", hour, min)
|
||||
sTimeStr = orderedFormat(ConfigTable.GetUIText("Mall_Remain_Time_Hour") or "", hour, min)
|
||||
elseif 86400 < remainTime then
|
||||
local day = math.floor(remainTime / 86400)
|
||||
local hour = math.floor((remainTime - day * 86400) / 3600)
|
||||
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Day") or "", day, hour)
|
||||
sTimeStr = orderedFormat(ConfigTable.GetUIText("Mall_Remain_Time_Day") or "", day, hour)
|
||||
end
|
||||
sTimeStr = sTimeStr .. ConfigTable.GetUIText("Mall_Package_Delist") or ""
|
||||
return sTimeStr
|
||||
|
||||
@@ -27,6 +27,10 @@ MallRecommendItemCtrl._mapNodeConfig = {
|
||||
},
|
||||
sale = {},
|
||||
txt_sale = {sComponentName = "TMP_Text"},
|
||||
txt_sale_1 = {
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Mall_Package_Recommend"
|
||||
},
|
||||
txt_Time = {sComponentName = "TMP_Text"},
|
||||
itemPrice = {},
|
||||
icon_res = {sComponentName = "Image"},
|
||||
@@ -67,10 +71,15 @@ function MallRecommendItemCtrl:Refresh(groupConfig, sPackageId)
|
||||
self:SetPngSprite(self._mapNode.bg, "UI/big_sprites/" .. dbResName[mapCfg.Rarity])
|
||||
self:SetPngSprite(self._mapNode.icon, mapCfg.Icon)
|
||||
NovaAPI.SetTMPText(self._mapNode.txt_name, mapCfg.Name)
|
||||
self._mapNode.txt_sale_1.gameObject:SetActive(false)
|
||||
if mapCfg.SaleRate > 0 then
|
||||
self._mapNode.sale:SetActive(true)
|
||||
self._mapNode.txt_sale.gameObject:SetActive(true)
|
||||
NovaAPI.SetTMPText(self._mapNode.txt_sale, string.format("%s%%", mapCfg.SaleRate))
|
||||
elseif mapCfg.SaleRate == -1 then
|
||||
self._mapNode.sale:SetActive(true)
|
||||
self._mapNode.txt_sale_1.gameObject:SetActive(true)
|
||||
self._mapNode.txt_sale.gameObject:SetActive(false)
|
||||
else
|
||||
self._mapNode.sale:SetActive(false)
|
||||
self._mapNode.txt_sale.gameObject:SetActive(false)
|
||||
|
||||
@@ -24,8 +24,10 @@ MallSkinItemCtrl._mapNodeConfig = {
|
||||
goSaleRate = {
|
||||
sComponentName = "RectTransform"
|
||||
},
|
||||
fxSaleRate = {sNodeName = "goSaleRate", sComponentName = "UIShiny"},
|
||||
txtSaleRate = {sComponentName = "TMP_Text"},
|
||||
imgMask = {},
|
||||
imgSaleMask = {},
|
||||
reddotPkg = {},
|
||||
imgRoleBg = {},
|
||||
txtRoleName = {sComponentName = "TMP_Text"},
|
||||
|
||||
@@ -294,9 +294,7 @@ function MallSkinPreviewCtrl:LoadCharacter()
|
||||
self.curShowModel = v
|
||||
self:WaitReadyClipFinish()
|
||||
NovaAPI.BindUIParallaxStageCameraControllerModel(self._mapNode.UIParallax3DStage, 0, v.gameObject)
|
||||
if CS.FrameworkMiscUtils.VersionCompare(CS.ClientManager.Instance:GetClientVersion(), "1.4.0", 2) == 1 then
|
||||
GameUIUtils.SetCustomModelMaterialVariant(v.gameObject, CS.CustomModelMaterialVariantComponent.VariantNames.FormationView)
|
||||
end
|
||||
GameUIUtils.SetCustomModelMaterialVariant(v.gameObject, CS.CustomModelMaterialVariantComponent.VariantNames.FormationView)
|
||||
else
|
||||
v.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user