Merge branch 'master_develop' into 0活动开发聚集地/推送礼包
commit
9ddfb22e3a
|
|
@ -1882,8 +1882,6 @@ FacePanelType = {
|
|||
Championship = 6, --巅峰战
|
||||
FindFairy = 7, --寻仙
|
||||
UpgradePac = 8,--升级限时礼包
|
||||
MonsterWave = 9,--心魔试炼限时礼包
|
||||
MainLevel = 10,--主线限时礼包
|
||||
}
|
||||
--迷宫寻宝条件类型
|
||||
FindTreasureNeedType = {
|
||||
|
|
|
|||
|
|
@ -173,35 +173,6 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
|||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
end
|
||||
elseif v.Type == 9 then--心魔试炼限时礼包
|
||||
local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,90).Value
|
||||
local str = string.split(specialConfig,"|")
|
||||
local nums = string.split(str[1],"#")
|
||||
local canGet = false
|
||||
local value = MonsterCampManager.monsterWave
|
||||
if value == tonumber(nums[1]) or value == tonumber(nums[2]) or value == tonumber(nums[3]) or
|
||||
((value - tonumber(nums[3]))%(tonumber(str[2]))) == 0 then
|
||||
canGet = true
|
||||
end
|
||||
if canGet then
|
||||
if RedPointManager.PlayerPrefsGetStr(v.Id..value.."MonsterWavePatFace") == "0" then
|
||||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
end
|
||||
elseif v.Type == 10 then--主线关卡限时礼包
|
||||
local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,91).Value
|
||||
local fightLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig)
|
||||
local num = tonumber(specialConfig)
|
||||
local canGet = false
|
||||
local value = fightLevelConfig[FightPointPassManager.lastPassFightId].SortId
|
||||
if value%num == 0 then
|
||||
canGet = true
|
||||
end
|
||||
if canGet then
|
||||
if RedPointManager.PlayerPrefsGetStr(v.Id..value.."MainLevelPatFace") == "0" then
|
||||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
end
|
||||
else
|
||||
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||
table.insert(patFaceAllData,v)
|
||||
|
|
|
|||
|
|
@ -125,9 +125,7 @@ function PatFacePanel:OnShowPatFaceData()
|
|||
self.obg4:SetActive(patFaceSingleData.Type == FacePanelType.SupremeHero)
|
||||
self.obg5:SetActive(false)
|
||||
self.obg6:SetActive(patFaceSingleData.Type == FacePanelType.FindFairy)
|
||||
self.obg7:SetActive(patFaceSingleData.Type == FacePanelType.UpgradePac or
|
||||
patFaceSingleData.Type == FacePanelType.MonsterWave or
|
||||
patFaceSingleData.Type == FacePanelType.MainLevel)
|
||||
self.obg7:SetActive(patFaceSingleData.Type == FacePanelType.UpgradePac)
|
||||
if patFaceSingleData.Type == FacePanelType.Sbtj then
|
||||
self:OnShowOb1Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.Tesc then
|
||||
|
|
@ -143,9 +141,7 @@ function PatFacePanel:OnShowPatFaceData()
|
|||
local artId=ConfigManager.GetConfigDataByKey(ConfigName.LoginPosterConfig,"Values",curActivityId).BackgroundString
|
||||
self.tipImage.sprite=Util.LoadSprite(ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,artId).Name)
|
||||
self:OnShowOb6Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.UpgradePac or
|
||||
patFaceSingleData.Type == FacePanelType.MonsterWave or
|
||||
patFaceSingleData.Type == FacePanelType.MainLevel then
|
||||
elseif patFaceSingleData.Type == FacePanelType.UpgradePac then
|
||||
self:OnShowOb7Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.GrowGift then
|
||||
self:OnShowOb8Data()
|
||||
|
|
|
|||
|
|
@ -1576,26 +1576,10 @@ function this:GetInfoList()
|
|||
end
|
||||
end
|
||||
end
|
||||
local infoList3 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8)
|
||||
infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8)
|
||||
for index, value in pairs(infoList) do
|
||||
for i = 1, #infoList3 do
|
||||
if infoList3[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then
|
||||
table.insert(giftList,value)
|
||||
end
|
||||
end
|
||||
end
|
||||
local infoList4 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",25)
|
||||
for index, value in pairs(infoList) do
|
||||
for i = 1, #infoList4 do
|
||||
if infoList4[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then
|
||||
table.insert(giftList,value)
|
||||
end
|
||||
end
|
||||
end
|
||||
local infoList5 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",26)
|
||||
for index, value in pairs(infoList) do
|
||||
for i = 1, #infoList5 do
|
||||
if infoList5[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then
|
||||
for i = 1, #infoList2 do
|
||||
if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then
|
||||
table.insert(giftList,value)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -171,6 +171,7 @@ function this.refresh()
|
|||
this:showTaskList(curType)
|
||||
this:SetRedPoint()
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail)
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
||||
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -247,6 +247,8 @@ function this.ChangeVipRedPointState()
|
|||
CheckRedPointStatus(RedPointType.Achievement_Main)
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail)
|
||||
CheckRedPointStatus(RedPointType.DynamicActTask)
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
||||
CheckRedPointStatus(RedPointType.pozhenzhuxianTask)
|
||||
--CheckRedPointStatus(RedPointType.Achievement_One)
|
||||
--CheckRedPointStatus(RedPointType.Achievement_Two)
|
||||
--CheckRedPointStatus(RedPointType.Achievement_Three)
|
||||
|
|
@ -316,6 +318,7 @@ function this.ResetTreasureTaskInfo(taskList)
|
|||
Game.GlobalEvent:DispatchEvent(GameEvent.DynamicTask.OnMissionChange)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.TreasureOfHeaven.TaskRefresh)
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail)
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
||||
end
|
||||
|
||||
--迷宫寻宝前端刷新任务自行赋值
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ local rechargeData
|
|||
local activityType = {
|
||||
[1] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21},
|
||||
[2] = {name = Language[12385],timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8},
|
||||
[3] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25},
|
||||
[4] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26},
|
||||
}
|
||||
--初始化组件(用于子类重写)
|
||||
function this:InitComponent()
|
||||
|
|
|
|||
Loading…
Reference in New Issue