qinglong commit

dev_chengFeng
jiaoyangna 2020-08-24 14:00:15 +08:00
parent ada573a8d0
commit 80a7f569f7
2 changed files with 9 additions and 5 deletions

View File

@ -11,10 +11,10 @@ local contentScripts = {
[4] = {view = require("Modules/Mission/MissionDailyPanel_Achievement"), panelName = "MissionDailyPanel_Achievement",type=4},
}
local TabBox = require("Modules/Common/TabBox")
local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11358] },
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "青龙秘宝" },
[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "秘宝试炼" },
[4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11359]}, }
local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11358],type = -1 },
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "青龙秘宝" ,type = ActivityTypeDef.TreasureOfSomeBody },
[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "秘宝试炼" ,type = ActivityTypeDef.TreasureOfSomeBody },
[4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11359],type = -1 }, }
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)}
--子模块预设
@ -114,6 +114,10 @@ function this.TabAdapter(tab, index, status)
Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = Util.LoadSprite(_TabData[index][status])
tabLab:GetComponent("Text").text = _TabData[index].name
tabLab:GetComponent("Text").color = _TabFontColor[status]
if _TabData[index].type ~= -1 and not ActivityGiftManager.GetActivityOpenStatus(_TabData[index].type) then
tab.gameObject:SetActive(false)
end
end
--切换视图
function this.SwitchView(_index)

View File

@ -97,7 +97,7 @@ function this.GetTrailWeekTime(msg)
end
function this.GetTimeStartToEnd()
local info= ActivityGiftManager.GetActivityInfoByType(ActivityTypeDef.TreasureOfSomeBody)
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody)
if info then
local startTime= this.GetTimeShow(info.startTime)
local endtime= this.GetTimeShow(info.endTime)