【去除多余活动信息】
parent
13991ac0de
commit
7348534847
File diff suppressed because it is too large
Load Diff
|
@ -1,10 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 45d51fb03fdc4e0409257d84adf4a63c
|
|
||||||
timeCreated: 1555742523
|
|
||||||
licenseType: Pro
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 100100000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
|
@ -1,8 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: ad5f5bfa24e584f408fa380b7864e70a
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
|
@ -995,7 +995,6 @@ MonoBehaviour:
|
||||||
- Assets/ManagedResources/~Lua/misc
|
- Assets/ManagedResources/~Lua/misc
|
||||||
- Assets/ManagedResources/~Lua/Modules/Achievement
|
- Assets/ManagedResources/~Lua/Modules/Achievement
|
||||||
- Assets/ManagedResources/~Lua/Modules/ActivityGift
|
- Assets/ManagedResources/~Lua/Modules/ActivityGift
|
||||||
- Assets/ManagedResources/~Lua/Modules/ActivityGift/View
|
|
||||||
- Assets/ManagedResources/~Lua/Modules/Adventure
|
- Assets/ManagedResources/~Lua/Modules/Adventure
|
||||||
- Assets/ManagedResources/~Lua/Modules/Adventure/View
|
- Assets/ManagedResources/~Lua/Modules/Adventure/View
|
||||||
- Assets/ManagedResources/~Lua/Modules/Alien
|
- Assets/ManagedResources/~Lua/Modules/Alien
|
||||||
|
@ -57571,10 +57570,6 @@ MonoBehaviour:
|
||||||
extension: .prefab
|
extension: .prefab
|
||||||
resPathIndex: 654
|
resPathIndex: 654
|
||||||
resAbNameIndex: 3121
|
resAbNameIndex: 3121
|
||||||
- resName: SevenDayGiftPanel
|
|
||||||
extension: .prefab
|
|
||||||
resPathIndex: 654
|
|
||||||
resAbNameIndex: 3121
|
|
||||||
- resName: AdventureAlianInvasionPanel
|
- resName: AdventureAlianInvasionPanel
|
||||||
extension: .prefab
|
extension: .prefab
|
||||||
resPathIndex: 655
|
resPathIndex: 655
|
||||||
|
@ -76410,8 +76405,6 @@ MonoBehaviour:
|
||||||
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuhuise.unity3d
|
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuhuise.unity3d
|
||||||
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuongse.unity3d
|
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuongse.unity3d
|
||||||
- lz4/dynamicatlas/l_libao_kuang.unity3d
|
- lz4/dynamicatlas/l_libao_kuang.unity3d
|
||||||
- lz4/dynamicatlas/r_huodong_qiri_banner.unity3d
|
|
||||||
- lz4/dynamicatlas/r_huodong_qiri_biaoti_zh.unity3d
|
|
||||||
- lz4/dynamicatlas/r_huodong_zaixain_banner.unity3d
|
- lz4/dynamicatlas/r_huodong_zaixain_banner.unity3d
|
||||||
- lz4/dynamicatlas/r_huodong_zaixian_biaoti_zh.unity3d
|
- lz4/dynamicatlas/r_huodong_zaixian_biaoti_zh.unity3d
|
||||||
- lz4/dynamicatlas/r_qrkh_tiao_2.unity3d
|
- lz4/dynamicatlas/r_qrkh_tiao_2.unity3d
|
||||||
|
|
|
@ -882,9 +882,9 @@ RedPointType = {
|
||||||
Guid_SendPackage = 1053,
|
Guid_SendPackage = 1053,
|
||||||
Guid_GetPackage = 1054,
|
Guid_GetPackage = 1054,
|
||||||
--东海寻仙
|
--东海寻仙
|
||||||
FindFairy_OneView = 2361,--东海寻仙主界面
|
-- FindFairy_OneView = 2361,--东海寻仙主界面
|
||||||
FindFairy_ThreeView = 2362,--东海寻仙进阶赠礼
|
-- FindFairy_ThreeView = 2362,--东海寻仙进阶赠礼
|
||||||
FindFairy_FourView = 2363,--东海寻仙寻仙盛典
|
-- FindFairy_FourView = 2363,--东海寻仙寻仙盛典
|
||||||
--成就面板
|
--成就面板
|
||||||
Achievement_Main = 9000,--成就
|
Achievement_Main = 9000,--成就
|
||||||
--Achievement_One = 9001,--成就 玩家等级
|
--Achievement_One = 9001,--成就 玩家等级
|
||||||
|
@ -1277,7 +1277,7 @@ FORMATION_TYPE = {
|
||||||
--活动Type定义
|
--活动Type定义
|
||||||
ActivityTypeDef = {
|
ActivityTypeDef = {
|
||||||
OnlineGift = 1, --在线奖励
|
OnlineGift = 1, --在线奖励
|
||||||
SevenDayRegister = 2, --七日登录
|
-- SevenDayRegister = 2, --七日登录
|
||||||
ChapterAward = 3, --章节奖励
|
ChapterAward = 3, --章节奖励
|
||||||
-- FirstRecharge = 4, --首充
|
-- FirstRecharge = 4, --首充
|
||||||
-- AccumulativeRecharge = 5, --累计充值
|
-- AccumulativeRecharge = 5, --累计充值
|
||||||
|
@ -1315,7 +1315,7 @@ ActivityTypeDef = {
|
||||||
LuckyTurnExper=47,--探宝达人
|
LuckyTurnExper=47,--探宝达人
|
||||||
RecruitExper=48,--征募达人
|
RecruitExper=48,--征募达人
|
||||||
SecretBoxExper=49,--秘宝达人
|
SecretBoxExper=49,--秘宝达人
|
||||||
FindFairyCeremony=51,--寻仙盛典
|
-- FindFairyCeremony=51,--寻仙盛典
|
||||||
UpLvAct=52,--升级限量豪礼
|
UpLvAct=52,--升级限量豪礼
|
||||||
BuyCoin=53,--点金狂潮
|
BuyCoin=53,--点金狂潮
|
||||||
TreasureOfHeaven=54,--天宫秘宝
|
TreasureOfHeaven=54,--天宫秘宝
|
||||||
|
@ -2032,7 +2032,7 @@ numExChange = {
|
||||||
[12]= ActivityTypeDef.EquipExper,
|
[12]= ActivityTypeDef.EquipExper,
|
||||||
[13]= ActivityTypeDef.GoldExper,
|
[13]= ActivityTypeDef.GoldExper,
|
||||||
[14]= ActivityTypeDef.FightExper,
|
[14]= ActivityTypeDef.FightExper,
|
||||||
[15]=ActivityTypeDef.EnergyExper,
|
-- [15]=ActivityTypeDef.EnergyExper,
|
||||||
[16]=ActivityTypeDef.Talisman,
|
[16]=ActivityTypeDef.Talisman,
|
||||||
[17]=ActivityTypeDef.SoulPrint,
|
[17]=ActivityTypeDef.SoulPrint,
|
||||||
[19]=ActivityTypeDef.FindTreasureExper,
|
[19]=ActivityTypeDef.FindTreasureExper,
|
||||||
|
|
|
@ -77,7 +77,7 @@ UIName = {
|
||||||
BagResolveAnCompoundPanel = 75, --剧情使用对话框
|
BagResolveAnCompoundPanel = 75, --剧情使用对话框
|
||||||
RoleGetInfoPopup = 76, --获得英雄点击详情
|
RoleGetInfoPopup = 76, --获得英雄点击详情
|
||||||
ChapterClearanceGiftPanel = 77, --章节奖励
|
ChapterClearanceGiftPanel = 77, --章节奖励
|
||||||
SevenDayGiftPanel = 78, --七日礼包
|
-- SevenDayGiftPanel = 78, --七日礼包
|
||||||
OnlineGiftPanel = 79, --在线礼包
|
OnlineGiftPanel = 79, --在线礼包
|
||||||
FightEndLvUpPanel = 80, --关卡等级提升
|
FightEndLvUpPanel = 80, --关卡等级提升
|
||||||
RewardPreviewPopupPanel = 81, --奖励预览详情弹框
|
RewardPreviewPopupPanel = 81, --奖励预览详情弹框
|
||||||
|
|
|
@ -521,8 +521,8 @@ function this.CheckMoneyProgress(v)
|
||||||
or type == ActivityTypeDef.DailyRecharge
|
or type == ActivityTypeDef.DailyRecharge
|
||||||
-- or v.activityId == ActivityTypeDef.ContinuityRecharge
|
-- or v.activityId == ActivityTypeDef.ContinuityRecharge
|
||||||
or type == ActivityTypeDef.AccumulativeRechargeExper
|
or type == ActivityTypeDef.AccumulativeRechargeExper
|
||||||
or type == ActivityTypeDef.DynamicAct_recharge
|
or type == ActivityTypeDef.DynamicAct_recharge then
|
||||||
or type == ActivityTypeDef.FindFairyCeremony then
|
-- or type == ActivityTypeDef.FindFairyCeremony
|
||||||
|
|
||||||
for n, m in ipairs(v.mission) do
|
for n, m in ipairs(v.mission) do
|
||||||
m.progress = m.progress / 1000
|
m.progress = m.progress / 1000
|
||||||
|
|
|
@ -112,8 +112,8 @@ function this.CheckMoneyProgress(v)
|
||||||
or v.activityId == ActivityTypeDef.DailyRecharge
|
or v.activityId == ActivityTypeDef.DailyRecharge
|
||||||
-- or v.activityId == ActivityTypeDef.ContinuityRecharge
|
-- or v.activityId == ActivityTypeDef.ContinuityRecharge
|
||||||
or v.activityId == ActivityTypeDef.AccumulativeRechargeExper
|
or v.activityId == ActivityTypeDef.AccumulativeRechargeExper
|
||||||
or v.activityId == ActivityTypeDef.DynamicAct_recharge
|
or v.activityId == ActivityTypeDef.DynamicAct_recharge then
|
||||||
or v.activityId == ActivityTypeDef.FindFairyCeremony then
|
-- or v.activityId == ActivityTypeDef.FindFairyCeremony
|
||||||
|
|
||||||
for n, m in ipairs(v.mission) do
|
for n, m in ipairs(v.mission) do
|
||||||
m.progress = m.progress / 1000
|
m.progress = m.progress / 1000
|
||||||
|
|
|
@ -1,447 +0,0 @@
|
||||||
local SevenDayGift = quick_class("SevenDayGift")
|
|
||||||
local this = SevenDayGift
|
|
||||||
local selectIndex = 0
|
|
||||||
local jumpNeedBtn = 0
|
|
||||||
function SevenDayGift:ctor(mainPanel, gameObject)
|
|
||||||
self.mainPanel = mainPanel
|
|
||||||
self.gameObject = gameObject
|
|
||||||
self:InitComponent(gameObject)
|
|
||||||
self:BindEvent()
|
|
||||||
end
|
|
||||||
|
|
||||||
function SevenDayGift:InitComponent(gameObject)
|
|
||||||
this.spLoader = SpriteLoader.New()
|
|
||||||
self.itemPre = Util.GetGameObject(gameObject, "Bg/ItemPre")
|
|
||||||
this.btnBack = Util.GetGameObject(gameObject, "btnBack")
|
|
||||||
this.remaindTimeText = Util.GetGameObject(gameObject, "downLayout/expertRewardGrid/remaindTimeText"):GetComponent("Text")
|
|
||||||
this.item = Util.GetGameObject(gameObject, "item")
|
|
||||||
this.onlineBtn = Util.GetGameObject(gameObject, "tabsContent/tabs_1")
|
|
||||||
this.sevenDayBtn = Util.GetGameObject(gameObject, "tabsContent/tabs_2")
|
|
||||||
this.chapterRewardBtn = Util.GetGameObject(gameObject, "tabsContent/tabs_3")
|
|
||||||
this.selected1 = Util.GetGameObject(gameObject, "tabsContent/tabs_1/selected")
|
|
||||||
this.selected2 = Util.GetGameObject(gameObject, "tabsContent/tabs_2/selected")
|
|
||||||
this.selected3 = Util.GetGameObject(gameObject, "tabsContent/tabs_3/selected")
|
|
||||||
this.viewRect = Util.GetGameObject(gameObject, "rect")
|
|
||||||
this.titleBg = Util.GetGameObject(gameObject, "titleBg"):GetComponent("Image")
|
|
||||||
this.onlineRedPoint = Util.GetGameObject(gameObject, "tabsContent/tabs_1/redPoint")
|
|
||||||
this.sevenDayPoint = Util.GetGameObject(gameObject, "tabsContent/tabs_2/redPoint")
|
|
||||||
this.chapterPoint = Util.GetGameObject(gameObject, "tabsContent/tabs_3/redPoint")
|
|
||||||
|
|
||||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.viewRect.transform,
|
|
||||||
this.item, nil, Vector2.New(940.6, 1220), 1, 1, Vector2.New(0, 0))
|
|
||||||
this.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(-8, 0)
|
|
||||||
this.ScrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5)
|
|
||||||
this.ScrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)
|
|
||||||
this.ScrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
|
|
||||||
this.ScrollView.moveTween.MomentumAmount = 1
|
|
||||||
this.ScrollView.moveTween.Strength = 2
|
|
||||||
this.viewCache = {}
|
|
||||||
--this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft })
|
|
||||||
end
|
|
||||||
|
|
||||||
function SevenDayGift:BindEvent()
|
|
||||||
Util.AddClick(self.btnBack, function()
|
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
|
||||||
self:ClosePanel()
|
|
||||||
end)
|
|
||||||
Util.AddClick(self.onlineBtn, function()
|
|
||||||
local getRewardState = ActivityGiftManager.onlineGetRewardState
|
|
||||||
local canRewardIndex = ActivityGiftManager.currentTimeIndex
|
|
||||||
local activityType = ActivityTypeDef.OnlineGift
|
|
||||||
local data = ActivityGiftManager.onlineData
|
|
||||||
this:OnShowActivityData(data, activityType, getRewardState, canRewardIndex)
|
|
||||||
self.selected1:SetActive(true)
|
|
||||||
self.selected2:SetActive(false)
|
|
||||||
self.selected3:SetActive(false)
|
|
||||||
selectIndex = ActivityTypeDef.OnlineGift
|
|
||||||
this.ScrollView:SetIndex(1)
|
|
||||||
end)
|
|
||||||
Util.AddClick(self.sevenDayBtn, function()
|
|
||||||
local getRewardState = ActivityGiftManager.sevenDayGetRewardState
|
|
||||||
local canRewardIndex = ActivityGiftManager.canRewardDay
|
|
||||||
local activityType = ActivityTypeDef.SevenDayRegister
|
|
||||||
local data = ActivityGiftManager.sevenDayData
|
|
||||||
this:OnShowActivityData(data, activityType, getRewardState, canRewardIndex)
|
|
||||||
self.selected1:SetActive(false)
|
|
||||||
self.selected2:SetActive(true)
|
|
||||||
self.selected3:SetActive(false)
|
|
||||||
selectIndex = ActivityTypeDef.SevenDayRegister
|
|
||||||
this.ScrollView:SetIndex(1)
|
|
||||||
end)
|
|
||||||
Util.AddClick(self.chapterRewardBtn, function()
|
|
||||||
local getRewardState = ActivityGiftManager.chapterGetRewardState
|
|
||||||
local activityType = ActivityTypeDef.ChapterAward
|
|
||||||
local data = ActivityGiftManager.chapterGiftData
|
|
||||||
this:OnShowActivityData(data, activityType, getRewardState, nil)
|
|
||||||
self.selected1:SetActive(false)
|
|
||||||
self.selected2:SetActive(false)
|
|
||||||
self.selected3:SetActive(true)
|
|
||||||
selectIndex = ActivityTypeDef.ChapterAward
|
|
||||||
this.ScrollView:SetIndex(1)
|
|
||||||
end)
|
|
||||||
BindRedPointObject(RedPointType.CourtesyDress_Online, this.onlineRedPoint)
|
|
||||||
BindRedPointObject(RedPointType.CourtesyDress_SevenDay, this.sevenDayPoint)
|
|
||||||
BindRedPointObject(RedPointType.CourtesyDress_Chapter, this.chapterPoint)
|
|
||||||
end
|
|
||||||
|
|
||||||
function SevenDayGift:OnOpen()
|
|
||||||
--local data = { ... }
|
|
||||||
--this.ActivityId = data[1]
|
|
||||||
--this.hideBtns=data[2]
|
|
||||||
--this.onlineBtn:SetActive(true)
|
|
||||||
--this.sevenDayBtn:SetActive(true)
|
|
||||||
--this.chapterRewardBtn:SetActive(true)
|
|
||||||
--if(this.hideBtns) then
|
|
||||||
this.onlineBtn:SetActive(false)
|
|
||||||
this.sevenDayBtn:SetActive(false)
|
|
||||||
this.chapterRewardBtn:SetActive(false)
|
|
||||||
--end
|
|
||||||
end
|
|
||||||
local sortingOrder = 0
|
|
||||||
function SevenDayGift:OnShow(_sortingOrder)
|
|
||||||
sortingOrder = _sortingOrder
|
|
||||||
this:IsGetRewardAll(ActivityGiftManager.sevenDayGetRewardState, ActivityTypeDef.SevenDayRegister, false)
|
|
||||||
this:IsGetRewardAll(ActivityGiftManager.onlineGetRewardState, ActivityTypeDef.OnlineGift, false)
|
|
||||||
this:IsGetRewardAll(ActivityGiftManager.chapterGetRewardState, ActivityTypeDef.ChapterAward, false)
|
|
||||||
this.SetDataSort()
|
|
||||||
if (this.ActivityId == nil) then
|
|
||||||
this:OpenActivityPage()
|
|
||||||
else
|
|
||||||
this:JumpOpenActivity()
|
|
||||||
end
|
|
||||||
this.ScrollView:SetIndex(1)
|
|
||||||
--this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.RoleInfo})
|
|
||||||
end
|
|
||||||
|
|
||||||
function SevenDayGift:OnSortingOrderChange(cursortingOrder)
|
|
||||||
if this.viewCache then
|
|
||||||
for i, v in pairs(this.viewCache) do
|
|
||||||
for j = 1, #v.views do
|
|
||||||
v.views[j]:SetEffectLayer(cursortingOrder)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
--跳转打开页面
|
|
||||||
function SevenDayGift:JumpOpenActivity()
|
|
||||||
if (this.ActivityId == ActivityTypeDef.SevenDayRegister) then
|
|
||||||
local getRewardState = ActivityGiftManager.sevenDayGetRewardState
|
|
||||||
local canRewardIndex = ActivityGiftManager.canRewardDay
|
|
||||||
local activityType = ActivityTypeDef.SevenDayRegister
|
|
||||||
local data = ActivityGiftManager.sevenDayData
|
|
||||||
this:OnShowActivityData(data, activityType, getRewardState, canRewardIndex)
|
|
||||||
selectIndex = ActivityTypeDef.SevenDayRegister
|
|
||||||
self.selected1:SetActive(false)
|
|
||||||
self.selected2:SetActive(true)
|
|
||||||
self.selected3:SetActive(false)
|
|
||||||
elseif (this.ActivityId == ActivityTypeDef.OnlineGift) then
|
|
||||||
local getRewardState = ActivityGiftManager.onlineGetRewardState
|
|
||||||
local canRewardIndex = ActivityGiftManager.currentTimeIndex
|
|
||||||
local activityType = ActivityTypeDef.OnlineGift
|
|
||||||
local data = ActivityGiftManager.onlineData
|
|
||||||
this:OnShowActivityData(data, activityType, getRewardState, canRewardIndex)
|
|
||||||
selectIndex = ActivityTypeDef.OnlineGift
|
|
||||||
self.selected1:SetActive(true)
|
|
||||||
self.selected2:SetActive(false)
|
|
||||||
self.selected3:SetActive(false)
|
|
||||||
elseif (this.ActivityId == ActivityTypeDef.ChapterAward) then
|
|
||||||
local getRewardState = ActivityGiftManager.chapterGetRewardState
|
|
||||||
local activityType = ActivityTypeDef.ChapterAward
|
|
||||||
local data = ActivityGiftManager.chapterGiftData
|
|
||||||
this:OnShowActivityData(data, activityType, getRewardState, nil)
|
|
||||||
selectIndex = ActivityTypeDef.ChapterAward
|
|
||||||
self.selected1:SetActive(false)
|
|
||||||
self.selected2:SetActive(false)
|
|
||||||
self.selected3:SetActive(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
--主城打开页面
|
|
||||||
function SevenDayGift :OpenActivityPage()
|
|
||||||
if (ActivityGiftManager.sevenDayOpen) then
|
|
||||||
local getRewardState = ActivityGiftManager.sevenDayGetRewardState
|
|
||||||
local canRewardIndex = ActivityGiftManager.canRewardDay
|
|
||||||
local activityType = ActivityTypeDef.SevenDayRegister
|
|
||||||
local data = ActivityGiftManager.sevenDayData
|
|
||||||
this:OnShowActivityData(data, activityType, getRewardState, canRewardIndex)
|
|
||||||
selectIndex = ActivityTypeDef.SevenDayRegister
|
|
||||||
end
|
|
||||||
end
|
|
||||||
--展示活动数据
|
|
||||||
function SevenDayGift:OnShowActivityData(activityData, activityType, getRewardState, isCanReward,isTop,isAni)
|
|
||||||
if (activityType == ActivityTypeDef.SevenDayRegister) then
|
|
||||||
this.titleBg.sprite = this.spLoader:LoadSprite("r_huodong_qitian_zh")
|
|
||||||
elseif (activityType == ActivityTypeDef.OnlineGift) then
|
|
||||||
this.titleBg.sprite = this.spLoader:LoadSprite("r_huodong_zaixian_zh")
|
|
||||||
elseif (activityType == ActivityTypeDef.ChapterAward) then
|
|
||||||
this.titleBg.sprite = this.spLoader:LoadSprite("r_huodong_tongguan_zh")
|
|
||||||
end
|
|
||||||
this.ScrollView:SetData(activityData, function(index, item)
|
|
||||||
local shows = activityData[index].Reward
|
|
||||||
if this.viewCache[item] then
|
|
||||||
local viewCacheNum
|
|
||||||
local viewCacheItem = { views = {} }
|
|
||||||
viewCacheNum = table.nums(this.viewCache[item].views)
|
|
||||||
if (viewCacheNum < #shows) then
|
|
||||||
for i = 1, viewCacheNum do
|
|
||||||
this.viewCache[item].views[i].gameObject:SetActive(true)
|
|
||||||
this.viewCache[item].views[i]:OnOpen(false, { shows[i][1], shows[i][2] }, 0.97,false,false,false,sortingOrder)
|
|
||||||
viewCacheItem.views[i] = this.viewCache[item].views[i]
|
|
||||||
end
|
|
||||||
for i = viewCacheNum + 1, #shows do
|
|
||||||
--his.viewCache[item].views[i].gameObject:SetActive(true)
|
|
||||||
local view = SubUIManager.Open(SubUIConfig.ItemView, Util.GetTransform(item, "content").transform)
|
|
||||||
view:OnOpen(false, { shows[i][1], 0 }, 0.97,false,false,false,sortingOrder)
|
|
||||||
viewCacheItem.views[i] = view
|
|
||||||
end
|
|
||||||
this.viewCache[item] = viewCacheItem
|
|
||||||
else
|
|
||||||
for i = 1, #shows do
|
|
||||||
this.viewCache[item].views[i].gameObject:SetActive(true)
|
|
||||||
this.viewCache[item].views[i]:OnOpen(false, { shows[i][1], shows[i][2] }, 0.97,false,false,false,sortingOrder)
|
|
||||||
end
|
|
||||||
for i = #shows + 1, viewCacheNum do
|
|
||||||
this.viewCache[item].views[i].gameObject:SetActive(false)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
this:ScrollActivityDataShow(item, index, activityData[index], activityType, getRewardState, isCanReward)
|
|
||||||
else
|
|
||||||
local viewCacheItem = { views = {} }
|
|
||||||
for i = 1, #shows do
|
|
||||||
local view = SubUIManager.Open(SubUIConfig.ItemView, Util.GetTransform(item, "content").transform)
|
|
||||||
view:OnOpen(false, { shows[i][1], shows[i][2] }, 0.97,false,false,false,sortingOrder)
|
|
||||||
viewCacheItem.views[i] = view
|
|
||||||
end
|
|
||||||
this.viewCache[item] = viewCacheItem
|
|
||||||
this:ScrollActivityDataShow(item, index, activityData[index], activityType, getRewardState, isCanReward)
|
|
||||||
end
|
|
||||||
--this:ScrollActivityDataShow(item, index, activityData[index], activityType, getRewardState, isCanReward)
|
|
||||||
end, not isTop,not isAni)
|
|
||||||
end
|
|
||||||
--循环滚动活动数据
|
|
||||||
function SevenDayGift:ScrollActivityDataShow(item, index, data, activityType, getRewardState, isCanReward)
|
|
||||||
--Util.ClearChild(Util.GetTransform(item, "content").transform)
|
|
||||||
--for i, v in ipairs(data.Reward) do
|
|
||||||
-- local view = SubUIManager.Open(SubUIConfig.ItemView, Util.GetTransform(item, "content").transform)
|
|
||||||
-- view:OnOpen(false, { v[1], v[2] }, 0.97)
|
|
||||||
--end
|
|
||||||
local getRewardProgressValue = 0
|
|
||||||
for i, v in pairs(getRewardState) do
|
|
||||||
if (v == 1) then
|
|
||||||
getRewardProgressValue = getRewardProgressValue + 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
local titleText = Util.GetGameObject(item, "titleImage/titleText"):GetComponent("Text")
|
|
||||||
local nextOpenBtn = Util.GetGameObject(item, "nextDayOpenBtn")
|
|
||||||
local nextOpenBtnText = Util.GetGameObject(item, "nextDayOpenBtn/Text"):GetComponent("Text")
|
|
||||||
local getRewardBtn = Util.GetGameObject(item, "getRewardBtn")
|
|
||||||
local getFinishText = Util.GetGameObject(item, "getFinishText")
|
|
||||||
local getRewardProgress = Util.GetGameObject(item, "getRewardProgress"):GetComponent("Text")
|
|
||||||
--local redPoint = Util.GetGameObject(item, "getRewardBtn/redPoint")
|
|
||||||
if (activityType == ActivityTypeDef.SevenDayRegister) then
|
|
||||||
titleText.text = Language[10016] .. data.Sort .. Language[10017]
|
|
||||||
nextOpenBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_slbz_1anniuhuise")
|
|
||||||
nextOpenBtnText.text = Language[10018]
|
|
||||||
--this.remaindTimeText.text = ""
|
|
||||||
elseif (activityType == ActivityTypeDef.OnlineGift) then
|
|
||||||
titleText.text = Language[10030] .. data.Values[1][1] .. Language[10031]
|
|
||||||
nextOpenBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_slbz_1anniuhuise")
|
|
||||||
nextOpenBtnText.text = Language[10018]
|
|
||||||
elseif (activityType == ActivityTypeDef.ChapterAward) then
|
|
||||||
titleText.text = GetLanguageStrById(data.ContentsShow)
|
|
||||||
nextOpenBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_slbz_1anniuhuangse")
|
|
||||||
nextOpenBtnText.text = Language[10019]
|
|
||||||
--this.remaindTimeText.text = ""
|
|
||||||
end
|
|
||||||
|
|
||||||
if (activityType ~= ActivityTypeDef.ChapterAward) then
|
|
||||||
if (data.Sort >= isCanReward) then
|
|
||||||
getRewardBtn:SetActive(false)
|
|
||||||
getFinishText:SetActive(false)
|
|
||||||
nextOpenBtn:SetActive(true)
|
|
||||||
getRewardProgress .text = "(0/1)"
|
|
||||||
end
|
|
||||||
if (data.Sort <= isCanReward and getRewardState[data.Id] == 0) then
|
|
||||||
getRewardBtn:SetActive(true)
|
|
||||||
getFinishText:SetActive(false)
|
|
||||||
nextOpenBtn:SetActive(false)
|
|
||||||
--redPoint:SetActive(true)
|
|
||||||
getRewardProgress .text = "(1/1)"
|
|
||||||
if (index == 1) then
|
|
||||||
jumpNeedBtn = getRewardBtn
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if (data.Sort <= isCanReward and getRewardState[data.Id] == 1) then
|
|
||||||
getRewardBtn:SetActive(false)
|
|
||||||
getFinishText:SetActive(true)
|
|
||||||
nextOpenBtn:SetActive(false)
|
|
||||||
getRewardProgress .text = "(1/1)"
|
|
||||||
end
|
|
||||||
else
|
|
||||||
if (FightPointPassManager.IsChapterPass(data.Sort) and getRewardState[data.Id] == 0) then
|
|
||||||
getRewardBtn:SetActive(true)
|
|
||||||
getFinishText:SetActive(false)
|
|
||||||
nextOpenBtn:SetActive(false)
|
|
||||||
getRewardProgress .text = "(1/1)"
|
|
||||||
if (index == 1) then
|
|
||||||
jumpNeedBtn = getRewardBtn
|
|
||||||
end
|
|
||||||
elseif (FightPointPassManager.IsChapterPass(data.Sort) and getRewardState[data.Id] == 1) then
|
|
||||||
getRewardBtn:SetActive(false)
|
|
||||||
getFinishText:SetActive(true)
|
|
||||||
nextOpenBtn:SetActive(false)
|
|
||||||
getRewardProgress .text = "(1/1)"
|
|
||||||
elseif (not FightPointPassManager.IsChapterPass(data.Sort)) then
|
|
||||||
getRewardBtn:SetActive(false)
|
|
||||||
getFinishText:SetActive(false)
|
|
||||||
nextOpenBtn:SetActive(true)
|
|
||||||
getRewardProgress .text = "(0/1)"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
Util.AddOnceClick(getRewardBtn, function()
|
|
||||||
if (activityType == ActivityTypeDef.SevenDayRegister) then
|
|
||||||
ActivityGiftManager.GetActivityRewardRequest(ActivityTypeDef.SevenDayRegister, data.Id)
|
|
||||||
elseif (activityType == ActivityTypeDef.OnlineGift) then
|
|
||||||
ActivityGiftManager.GetActivityRewardRequest(ActivityTypeDef.OnlineGift, data.Id)
|
|
||||||
elseif (activityType == ActivityTypeDef.ChapterAward) then
|
|
||||||
ActivityGiftManager.GetActivityRewardRequest(ActivityTypeDef.ChapterAward, data.Id)
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
Util.AddOnceClick(nextOpenBtn, function()
|
|
||||||
if (activityType == ActivityTypeDef.ChapterAward) then
|
|
||||||
--前往跳转
|
|
||||||
JumpManager.GoJump(data.Jump[1])
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
-- 在线奖励倒计时
|
|
||||||
function SevenDayGift:OnlineCountDown(remainTime, activityData)
|
|
||||||
local hour = 0
|
|
||||||
local min = 0
|
|
||||||
local sec = 0
|
|
||||||
sec = math.floor(remainTime % 60)
|
|
||||||
hour = math.floor(remainTime / 3600)
|
|
||||||
min = 0
|
|
||||||
if (hour >= 1) then
|
|
||||||
min = math.floor((remainTime - hour * 3600) / 60)
|
|
||||||
else
|
|
||||||
min = math.floor(remainTime / 60)
|
|
||||||
end
|
|
||||||
if (selectIndex == ActivityTypeDef.OnlineGift) then
|
|
||||||
this.remaindTimeText.text = Language[10032] .. string.format("%02d:%02d:%02d", hour, min, sec)
|
|
||||||
if (ActivityGiftManager.currentTimeIndex == #ActivityGiftManager.onlineData) then
|
|
||||||
this.remaindTimeText.text = ""
|
|
||||||
end
|
|
||||||
local getRewardState = ActivityGiftManager.onlineGetRewardState
|
|
||||||
if (remainTime == 0) then
|
|
||||||
this:OnShowActivityData(activityData, selectIndex, getRewardState, ActivityGiftManager.currentTimeIndex)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
--领取奖励刷新页面数据
|
|
||||||
function SevenDayGift:OnRefreshPageDataShow()
|
|
||||||
local canRewardIndex = 0
|
|
||||||
local getRewardState = 0
|
|
||||||
selectIndex = ActivityTypeDef.SevenDayRegister
|
|
||||||
if (selectIndex == ActivityTypeDef.SevenDayRegister) then
|
|
||||||
canRewardIndex = ActivityGiftManager.canRewardDay
|
|
||||||
getRewardState = ActivityGiftManager.sevenDayGetRewardState
|
|
||||||
elseif (selectIndex == ActivityTypeDef.OnlineGift) then
|
|
||||||
canRewardIndex = ActivityGiftManager.currentTimeIndex
|
|
||||||
getRewardState = ActivityGiftManager.onlineGetRewardState
|
|
||||||
elseif (selectIndex == ActivityTypeDef.ChapterAward) then
|
|
||||||
getRewardState = ActivityGiftManager.chapterGetRewardState
|
|
||||||
end
|
|
||||||
this:OnShowActivityData(ActivityGiftManager.sevenDayData, selectIndex, getRewardState, canRewardIndex)
|
|
||||||
this:IsGetRewardAll(getRewardState, selectIndex, true)
|
|
||||||
|
|
||||||
end
|
|
||||||
--判断奖励是否领取完毕
|
|
||||||
function SevenDayGift:IsGetRewardAll(getRewardState, activityType, isInActivityPage)
|
|
||||||
local isGetAllReward = true
|
|
||||||
for i, v in pairs(getRewardState) do
|
|
||||||
if (v == 0) then
|
|
||||||
isGetAllReward = false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if (activityType == ActivityTypeDef.SevenDayRegister and isGetAllReward) then
|
|
||||||
this.sevenDayBtn:SetActive(false)
|
|
||||||
ActivityGiftManager.sevenDayOpen = false
|
|
||||||
if (isInActivityPage) then
|
|
||||||
--UIManager.OpenPanel(UIName.MainPanel)
|
|
||||||
end
|
|
||||||
elseif (activityType == ActivityTypeDef.OnlineGift and isGetAllReward) then
|
|
||||||
this.onlineBtn:SetActive(false)
|
|
||||||
ActivityGiftManager.onlineOpen = false
|
|
||||||
if (isInActivityPage) then
|
|
||||||
--UIManager.OpenPanel(UIName.MainPanel)
|
|
||||||
end
|
|
||||||
elseif (activityType == ActivityTypeDef.ChapterAward and isGetAllReward) then
|
|
||||||
this.chapterRewardBtn:SetActive(false)
|
|
||||||
ActivityGiftManager.chapterOpen = false
|
|
||||||
if (isInActivityPage) then
|
|
||||||
--UIManager.OpenPanel(UIName.MainPanel)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
--进行数据排序
|
|
||||||
function this.SetDataSort()
|
|
||||||
table.sort(ActivityGiftManager.onlineData, function(a, b)
|
|
||||||
if ActivityGiftManager.onlineGetRewardState[a.Id] == ActivityGiftManager.onlineGetRewardState[b.Id] then
|
|
||||||
return a.Id < b.Id
|
|
||||||
else
|
|
||||||
return ActivityGiftManager.onlineGetRewardState[a.Id] < ActivityGiftManager.onlineGetRewardState[b.Id]
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
|
|
||||||
table.sort(ActivityGiftManager.sevenDayData, function(a, b)
|
|
||||||
if ActivityGiftManager.sevenDayGetRewardState[a.Id] == ActivityGiftManager.sevenDayGetRewardState[b.Id] then
|
|
||||||
return a.Id < b.Id
|
|
||||||
else
|
|
||||||
return ActivityGiftManager.sevenDayGetRewardState[a.Id] < ActivityGiftManager.sevenDayGetRewardState[b.Id]
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
table.sort(ActivityGiftManager.chapterGiftData, function(a, b)
|
|
||||||
if ActivityGiftManager.chapterGetRewardState[a.Id] and ActivityGiftManager.chapterGetRewardState[b.Id] then
|
|
||||||
if ActivityGiftManager.chapterGetRewardState[a.Id] == ActivityGiftManager.chapterGetRewardState[b.Id] then
|
|
||||||
return a.Id < b.Id
|
|
||||||
else
|
|
||||||
return ActivityGiftManager.chapterGetRewardState[a.Id] < ActivityGiftManager.chapterGetRewardState[b.Id]
|
|
||||||
end
|
|
||||||
else
|
|
||||||
return ActivityGiftManager.chapterGetRewardState[a.Id] and not ActivityGiftManager.chapterGetRewardState[b.Id]
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
|
||||||
function SevenDayGift:AddListener()
|
|
||||||
--Game.GlobalEvent:AddEvent(GameEvent.Activity.OnlineState, this.OnlineCountDown, self)
|
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.GetRewardRefresh, this.OpenActivityPage, self)
|
|
||||||
end
|
|
||||||
|
|
||||||
--移除事件监听(用于子类重写)
|
|
||||||
function SevenDayGift:RemoveListener()
|
|
||||||
--Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnlineState, this.OnlineCountDown, self)
|
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.GetRewardRefresh, this.OpenActivityPage, self)
|
|
||||||
end
|
|
||||||
--跳转显示新手提示圈
|
|
||||||
function SevenDayGift.ShowGuideGo()
|
|
||||||
if jumpNeedBtn ~= 0 then
|
|
||||||
JumpManager.ShowGuide(UIName.CourtesyDressPanel, jumpNeedBtn)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function SevenDayGift:OnDestroy()
|
|
||||||
this.spLoader:Destroy()
|
|
||||||
ClearRedPointObject(RedPointType.CourtesyDress_Online)
|
|
||||||
ClearRedPointObject(RedPointType.CourtesyDress_SevenDay)
|
|
||||||
ClearRedPointObject(RedPointType.CourtesyDress_Chapter)
|
|
||||||
--SubUIManager.Close(this.UpView)
|
|
||||||
this.ScrollView = nil
|
|
||||||
sortingOrder = 0
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
return SevenDayGift
|
|
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 0cf9019a7cb99434895c90a114f63b66
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
|
@ -375,8 +375,8 @@ function ExpertPanel:RefreshActivityBtn(context)
|
||||||
tabBtns[13]:SetActive(context.status == 1)
|
tabBtns[13]:SetActive(context.status == 1)
|
||||||
elseif context.type == ActivityTypeDef.FightExper then
|
elseif context.type == ActivityTypeDef.FightExper then
|
||||||
tabBtns[14]:SetActive(context.status == 1)
|
tabBtns[14]:SetActive(context.status == 1)
|
||||||
elseif context.type == ActivityTypeDef.EnergyExper then
|
-- elseif context.type == ActivityTypeDef.EnergyExper then
|
||||||
tabBtns[15]:SetActive(context.status == 1)
|
-- tabBtns[15]:SetActive(context.status == 1)
|
||||||
elseif context.type == ActivityTypeDef.Talisman then
|
elseif context.type == ActivityTypeDef.Talisman then
|
||||||
tabBtns[16]:SetActive(context.status == 1)
|
tabBtns[16]:SetActive(context.status == 1)
|
||||||
elseif context.type == ActivityTypeDef.SoulPrint then
|
elseif context.type == ActivityTypeDef.SoulPrint then
|
||||||
|
@ -452,7 +452,7 @@ function ExpertPanel:RefreshActivityShow()
|
||||||
tabBtns[12]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EquipExper))
|
tabBtns[12]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EquipExper))
|
||||||
tabBtns[13]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GoldExper))
|
tabBtns[13]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GoldExper))
|
||||||
tabBtns[14]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FightExper))
|
tabBtns[14]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FightExper))
|
||||||
tabBtns[15]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EnergyExper))
|
-- tabBtns[15]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EnergyExper))
|
||||||
tabBtns[16]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.Talisman))
|
tabBtns[16]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.Talisman))
|
||||||
tabBtns[17]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SoulPrint))
|
tabBtns[17]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SoulPrint))
|
||||||
tabBtns[18]:SetActive(false)--(OperatingManager.IsHeroGiftActive())
|
tabBtns[18]:SetActive(false)--(OperatingManager.IsHeroGiftActive())
|
||||||
|
|
|
@ -54,9 +54,9 @@ local TypeUpdateFunc = {
|
||||||
[ActivityTypeDef.EquipExper] = function ()--装备达人
|
[ActivityTypeDef.EquipExper] = function ()--装备达人
|
||||||
this.GetExpertData(1,ActivityTypeDef.EquipExper)
|
this.GetExpertData(1,ActivityTypeDef.EquipExper)
|
||||||
end,
|
end,
|
||||||
[ActivityTypeDef.EnergyExper] = function ()--体力达人
|
-- [ActivityTypeDef.EnergyExper] = function ()--体力达人
|
||||||
this.GetExpertData(2,ActivityTypeDef.EnergyExper)
|
-- this.GetExpertData(2,ActivityTypeDef.EnergyExper)
|
||||||
end,
|
-- end,
|
||||||
[ActivityTypeDef.FindTreasureExper] = function ()--寻宝达人
|
[ActivityTypeDef.FindTreasureExper] = function ()--寻宝达人
|
||||||
this.GetExpertData(1,ActivityTypeDef.FindTreasureExper)
|
this.GetExpertData(1,ActivityTypeDef.FindTreasureExper)
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 024846920bd3ddd45b9237ade8d620d9
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
Loading…
Reference in New Issue