qinglong update

dev_chengFeng
jiaoyangna 2020-08-22 15:42:07 +08:00
parent 98e9b9757e
commit f0f8a5d69e
6 changed files with 25 additions and 25 deletions

View File

@ -266,12 +266,6 @@ function this.GetActivityInfo(type, Id)
return nil,0
end
end
function this.GetActivityInfoByType(type)
if this.mission[type] then
return this.mission[type]
end
end
function this.SetActivityInfo(type, Id, state)
for _, missInfo in pairs(this.mission[type].mission) do
if missInfo.missionId == Id then

View File

@ -17,14 +17,14 @@ local bgName
local day_picture ={--数字名、文字名、奖励id
[1] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,50,0}},
[2] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,50,0}},
[1] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,-435.9,0}},
[2] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,-435.9,0}},
[3] = {"b_baridenglu_slogan003",2503,"b_baridenglu_slogan03",10022,{1,1,1},{-69,91,0}},
[4] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
[5] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
[6] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
[7] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
[8] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
[4] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-521.3,0}},
[5] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-521.3,0}},
[6] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-521.3,0}},
[7] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-521.3,0}},
[8] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-521.3,0}},
}
--初始化组件(用于子类重写)

View File

@ -1324,7 +1324,7 @@ function this.TimeFormat()
end
--轮转活动,乾坤宝盒
local dynamicAct = not not ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
local dynamicAct = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.FindFairy)
if dynamicAct then
local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
info = info.endTime - PlayerManager.serverTime
@ -1333,14 +1333,15 @@ function this.TimeFormat()
this.DynamicActivityTime.text = info..""
end
end
--青龙秘宝
local QingLong = not not ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody)
if dynamicAct then
local QingLong = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody)
if QingLong then
local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody)
info = info.endTime - PlayerManager.serverTime
info = math.floor(info/86400)
local tempTime = info.endTime - GetTimeStamp()
tempTime = math.floor(tempTime/86400)
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureOfSomeBody) then
this.treasureOfSlText.text = info..""
this.treasureOfSlText.text = tempTime..""
end
end

View File

@ -11,10 +11,11 @@ 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 +115,9 @@ 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

@ -87,7 +87,7 @@ function this.GetTrailWeekTime(msg)
end
function this.GetTimeStartToEnd()
local info= ActivityGiftManager.GetActivityInfoByType(this.activityId)
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody)
if info then
local startTime= this.GetTimeShow(info.startTime)
local endtime= this.GetTimeShow(info.endTime)
@ -155,7 +155,7 @@ function this.GetQinglongTaskData(_curtype)
end
function this.GetQinglongSerectTreasureRedPot()
if this.activityId==0 or not ActivityGiftManager.GetActivityOpenStatus(this.activityId) then
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureOfSomeBody) then
return false
end
local state = this.GetTreasureState()

View File

@ -120,6 +120,7 @@ function this.InitializeData(_msg)
reward.id = _msg.countReward[i].locationId
reward.rewardId = _msg.countReward[i].rewardId
if _msg.countReward[i].rewardId > 0 then
LogGreen("_msg.countReward[i].rewardId:".._msg.countReward[i].rewardId)
reward.itemId = blessingRewardPool[_msg.countReward[i].rewardId].Reward[1]
reward.num = blessingRewardPool[_msg.countReward[i].rewardId].Reward[2]
else