【ScrollCycleView】修改4

dev_chengFeng
zhangqiang 2021-02-26 10:37:39 +08:00
parent edec649f64
commit 545dee3df1
9 changed files with 51 additions and 50 deletions

View File

@ -43,7 +43,7 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function OpenSeverWelfarePanel:OnShow()
isPlayAnim = true
this.OnShowPanelData()
this.OnShowPanelData(true,true)
end
function OpenSeverWelfarePanel:OnSortingOrderChange()
for i, v in pairs(this.NoviceItemList) do
@ -57,7 +57,7 @@ function OpenSeverWelfarePanel:OnSortingOrderChange()
end
local isShowNeedGetUpTextId = 0
local activityData = {}
function this.OnShowPanelData()
function this.OnShowPanelData(isTop,isAni)
this.titleText.text = Language[10026]
activityData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.OpenSeverWelfare)
isShowNeedGetUpTextId = 0
@ -66,7 +66,7 @@ function this.OnShowPanelData()
ActivityGiftManager.OpenSeverWelfareRewardTabsSort(activityData.mission)
this.ScrollView:SetData(activityData.mission, function (index, go)
this.SingleDataShow(go, activityData.mission[index])
end)
end,not isTop,not isAni)
if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView)
isPlayAnim = false
@ -143,7 +143,7 @@ function this.SingleDataShow(go,rewardData)
NetManager.GetActivityRewardRequest(rewardData.missionId, activityData.activityId, function(drop)
--ActivityGiftManager.GetActivityRewardRequest(ActivityTypeDef.OpenSeverWelfare,rewardData.missionId, function(msg)
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
this.OnShowPanelData()
this.OnShowPanelData(false,false)
Game.GlobalEvent:DispatchEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint)
end)
end)

View File

@ -124,7 +124,7 @@ function DailyCarbonPanel:OnShow()
if carbonIndex==0 then carbonIndex=1 end
this.TabCtrl:SetTabAdapter(this.TabAdapter)
this.TabCtrl:SetTabIsLockCheck(this.TabIsLockCheck)
this.TabCtrl:SetChangeTabCallBack(this.RefreshShow)
this.TabCtrl:SetChangeTabCallBack(this.RefreshShow,true,true)
this.TabCtrl:Init(this.tabBox, _TabData,carbonIndex)
-- 音效
SoundManager.PlayMusic(SoundConfig.BGM_Carbon)
@ -149,12 +149,12 @@ function DailyCarbonPanel:OnDestroy()
end
function this.FiveRefresh()
this.RefreshShow(1)
this.RefreshShow(1,false,false)
DailyCarbonPanel:RefreshRedPotShow()
end
--刷新面板
function this.RefreshShow(i)
function this.RefreshShow(i,isTop,isAni)
carbonIndex = i
curData={}
@ -164,17 +164,17 @@ function this.RefreshShow(i)
this.titleTip.text=titleBg[i].titleTip
-- this.titleTip.gameObject:GetComponent("RectTransform").localPosition = titleBg[i].pos
this.SetTimeTip()
this.SetScroll(i)
this.SetScroll(i,isTop,isAni)
DailyCarbonPanel:RefreshRedPotShow()
end
--设置滚动条
local curMaxOpenId = 0
function this.SetScroll(i)
function this.SetScroll(i,isTop,isAni)
this.scrollView:SetData(curData,function(index,root)
this.SetData(root,curData[index], curData[index - 1])
end)
end,not isTop,not isAni)
for k,v in ipairs(curData) do
if not CarbonManager.IsDailyCarbonPass(v.Id) then
curMaxOpenId = k
@ -318,14 +318,14 @@ function this.SetData(root, data, ldata)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
PrivilegeManager.RefreshPrivilegeUsedTimes(data.PrivilegeId[2],1)
CarbonManager.AddDailyChallengeInfo(data.Id)
this.RefreshShow(carbonIndex)
this.RefreshShow(carbonIndex,false,false)
end)
end
end)
elseif type==2 then --扫荡
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
PrivilegeManager.RefreshPrivilegeUsedTimes(data.PrivilegeId[2],1)
this.RefreshShow(carbonIndex)
this.RefreshShow(carbonIndex,false,false)
end)
end
end)

View File

@ -96,12 +96,13 @@ function DynamicTaskPage:OnShow(_sortingOrder,_parent)
end
sortingOrder = _sortingOrder
parent = _parent
this.Refresh()
this.Refresh(true,true)
end
function this.Refresh()
function this.Refresh(isTop,isAni)
LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni))
allData = OperatingManager:InitDynamicActData()
this:OnShowData()
this:OnShowData(isTop,isAni)
this:SetTime()
end
@ -135,7 +136,7 @@ function DynamicTaskPage:SetTime()
five_timeDown = five_timeDown - 1
week_timeDown = week_timeDown - 1
if five_timeDown <= 0 then
this.Refresh()
this.Refresh(false,false)
return
end
if week_timeDown <= 0 then
@ -162,7 +163,7 @@ function DynamicTaskPage:SetTime()
self.timer:Start()
end
function DynamicTaskPage:OnShowData()
function DynamicTaskPage:OnShowData(isTop,isAni)
if allData then
endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.DynamicAct)
this.SortData(allData)
@ -173,7 +174,7 @@ function DynamicTaskPage:OnShowData()
end
singleTaskPre[go].com = Util.GetGameObject(go,"btn/Text")
singleTaskPre[go].data = allData[index]
end)
end,not isTop,not isAni)
else
parent.OnPageTabChange(1)
PopupTipPanel.ShowTip(Language[12320])
@ -251,7 +252,7 @@ function this.SingleDataShow(pre,value)
if state == 1 then
NetManager.TakeMissionRewardRequest(TaskTypeDef.DynamicActTask,sConFigData.id, function(respond)
UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function ()
this.Refresh()
this.Refresh(false,false)
CheckRedPointStatus(RedPointType.DynamicActTask)
end)
end)
@ -271,7 +272,7 @@ end
function this.RechargeSuccessFunc(id)
FirstRechargeManager.RefreshAccumRechargeValue(id)
--OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.GiftBuy, id)
this.Refresh()
this.Refresh(false,false)
end
function DynamicTaskPage:OnClose()

View File

@ -52,11 +52,11 @@ function LeiJiChongZhiPage:OnShow(_sortingOrder,_parent,_type)
rechargeNum= VipManager.GetChargedNum()--已经充值的金额
sortingOrder = _sortingOrder
parent = _parent
this.Refresh()
this.Refresh(true,true)
end
function this.Refresh()
this:OnShowData()
function this.Refresh(isTop,isAni)
this:OnShowData(isTop,isAni)
this:SetTime()
end
@ -80,7 +80,7 @@ function LeiJiChongZhiPage:SetTime()
self.timer:Start()
end
function LeiJiChongZhiPage:OnShowData()
function LeiJiChongZhiPage:OnShowData(isTop,isAni)
allData =OperatingManager.InitLeiJiChongZhiData(curtype)
if allData then
if curtype == ActivityTypeDef.AccumulativeRechargeExper then
@ -96,7 +96,7 @@ function LeiJiChongZhiPage:OnShowData()
this.SortData(allData)
this.ScrollView:SetData(allData, function (index, go)
this.SingleDataShow(go, allData[index])
end)
end,not isTop,not isAni)
else
parent.OnPageTabChange(1)
PopupTipPanel.ShowTip(Language[12320])
@ -176,7 +176,7 @@ function this.SingleDataShow(pre,value)
local curActivityId = ActivityGiftManager.GetActivityIdByType(curtype)
NetManager.GetActivityRewardRequest(sConFigData.id, curActivityId,function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
this.Refresh()
this.Refresh(false,false)
end)
elseif state == 0 then
if sConFigData.jump then

View File

@ -44,10 +44,10 @@ end
function ShengXingYouLi:OnShow(_sortingOrder,_parent)
parent = _parent
sortingOrder = _sortingOrder
this:OnShowData()
this:OnShowData(true,true)
this:SetTime()
end
function ShengXingYouLi:OnShowData()
function ShengXingYouLi:OnShowData(isTop,isAni)
actData={}
actData = DynamicActivityManager.ShengXingYouLiGetData()
activityId = actData.activityId
@ -55,7 +55,7 @@ function ShengXingYouLi:OnShowData()
this.SortData(actData.mission)
this.ScrollView:SetData(actData.mission, function (index, go)
this.SingleDataShow(go, actData.mission[index])
end)
end,not isTop,not isAni)
end
end
@ -125,7 +125,7 @@ function this.SingleDataShow(pre,value)
if canDo == 1 then
NetManager.GetActivityRewardRequest(sData.missionId,activityId,function (drop)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function ()
this:OnShowData()
this:OnShowData(false,false)
CheckRedPointStatus(RedPointType.ShengXingYouLi)
end)
end)

View File

@ -44,10 +44,10 @@ end
function XianShiShangShi:OnShow(_sortingOrder,_parent)
sortingOrder = _sortingOrder
parent = _parent
this:OnShowData()
this:OnShowData(true,true)
XianShiShangShi:SetTime()
end
function XianShiShangShi:OnShowData()
function XianShiShangShi:OnShowData(isTop,isAni)
allData={}
-- allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 22, "Type", GoodsTypeDef.DirectPurchaseGift)
local curActId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_TimeLimitShop)
@ -59,7 +59,7 @@ function XianShiShangShi:OnShowData()
this.SortData(allData)
this.ScrollView:SetData(allData, function (index, go)
this.SingleDataShow(go, allData[index])
end)
end,not isTop,not isAni)
end
end
@ -172,7 +172,7 @@ end
function this.RechargeSuccessFunc(id)
FirstRechargeManager.RefreshAccumRechargeValue(id)
this.OnShowData()
this.OnShowData(false,false)
end
function XianShiShangShi:OnClose()

View File

@ -44,10 +44,10 @@ end
function ZhenQiYiBaoPage:OnShow(_sortingOrder,_parent)
parent = _parent
sortingOrder = _sortingOrder
this:OnShowData()
this:OnShowData(true,true)
ZhenQiYiBaoPage:SetTime()
end
function ZhenQiYiBaoPage:OnShowData()
function ZhenQiYiBaoPage:OnShowData(isTop,isAni)
allData={}
-- allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 23, "Type", GoodsTypeDef.DirectPurchaseGift)
local curActId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_Treasure)
@ -59,7 +59,7 @@ function ZhenQiYiBaoPage:OnShowData()
this.SortData(allData)
this.ScrollView:SetData(allData, function (index, go)
this.SingleDataShow(go, allData[index])
end)
end,not isTop,not isAni)
end
end
@ -176,7 +176,7 @@ end
function this.RechargeSuccessFunc(id)
FirstRechargeManager.RefreshAccumRechargeValue(id)
--OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.GiftBuy, id)
this.OnShowData()
this.OnShowData(false,false)
end
function ZhenQiYiBaoPage:OnClose()

View File

@ -290,7 +290,7 @@ function this.OnTabChange(index, lastIndex)
this.RefreshBaseInfoShow()
NetManager.RequestMyGuildInfo()
elseif index == 2 then
this.RefreshMembersShow(true)
this.RefreshMembersShow(true,true)
MyGuildManager.RequestMyGuildMembers()
elseif index == 3 then
this.RefreshVerifyShow()
@ -380,7 +380,7 @@ function this.RefreshDismissTime()
end
-- 刷新公会成员显示
function this.RefreshMembersShow(isTop)
function this.RefreshMembersShow(isTop,isAni)
if this._CurIndex ~= 2 then return end
-- 创建滚动
if not this.memScrollView then
@ -394,7 +394,7 @@ function this.RefreshMembersShow(isTop)
local members = MyGuildManager.GetMyGuildMemList()
this.memScrollView:SetData(members, function(index, go)
this.MemItemAdapter(go, members[index])
end, not isTop)
end, not isTop)--,not isAni)
-- 在线人数计算
local onlineNum = 0
for _, v in ipairs(members) do

View File

@ -99,7 +99,7 @@ local curBuyType = 0
function GiftView:OnShow(_sortingOrder, buyType)
rechargeNum= VipManager.GetChargedNum()--已经充值的金额
curBuyType = buyType
self:RefreshData(buyType)
self:RefreshData(buyType,true,true)
end
function GiftView:OnSortingOrderChange(cursortingOrder)
@ -117,13 +117,13 @@ end
------日周月礼包------
-- 根据选择的页签刷新数据
function GiftView:RefreshData(buyType)
function GiftView:RefreshData(buyType,isTop,isAni)
-- 当前选中的页签
self.buyType = buyType
self.titleBg.sprite = Util.LoadSprite(Title_BG_NAME[buyType])
CheckRedPointStatus(RedPointType.GrowthPackage)
-- 刷新商品数据
self:RefreshGiftData()
self:RefreshGiftData(isTop,isAni)
-- 刷新剩余时间
self:GetRemainTime()
-- 刷新一键购买显示
@ -146,7 +146,7 @@ function GiftView:RefreshOneKeyShow()
end
-- 刷新礼包的数据
function GiftView:RefreshGiftData()
function GiftView:RefreshGiftData(isTop,isAni)
self:isBought()
self.scrollView.gameObject:SetActive(false)
self.scrollView2.gameObject:SetActive(false)
@ -166,7 +166,7 @@ function GiftView:RefreshGiftData()
local callBack = function(index, item)
self:RefreshShowData(item, shopData[index].data, self.buyType, shopData[index].DataType)
end
self.scrollView:SetData(shopData, callBack)
self.scrollView:SetData(shopData, callBack,not isTop,not isAni)
self.scrollView.gameObject:SetActive(true)
elseif self.buyType == DirectBuyType.FINDTREASURE_GIFT then--特权礼包界面
--两部分组成 寻宝特权在商品里 极速探索礼包在直购里
@ -191,7 +191,7 @@ function GiftView:RefreshGiftData()
local callBack = function(index, item)
self:RefreshShowData(item, shopData[index].data, self.buyType, shopData[index].DataType)
end
self.scrollView2:SetData(shopData, callBack)
self.scrollView2:SetData(shopData, callBack,not isTop,not isAni)
self:TimeCountDown()
self.scrollView2.gameObject:SetActive(true)
@ -215,7 +215,7 @@ function GiftView:RefreshGiftData()
local callBack = function(index, item)
self:RefreshShowData(item, shopData[index].data, self.buyType, shopData[index].DataType)
end
self.scrollView3:SetData(shopData, callBack)
self.scrollView3:SetData(shopData, callBack,not isTop,not isAni)
self.scrollView3.gameObject:SetActive(true)
end
@ -755,7 +755,7 @@ function GiftView:TimeCountDown()
local t1=timerList[1].freshTime-GetTimeStamp()
t1=t1-1
if t1 <= 0 then
self:RefreshData(curBuyType)
self:RefreshData(curBuyType,false,false)
end
timerList[1].pre.text=Language[10561]..self:SpecialTime(t1)--self:SpecialTime
end
@ -763,7 +763,7 @@ function GiftView:TimeCountDown()
local t2 = timerList[2].freshTime-GetTimeStamp()
t2=t2-1
if t2 <= 0 then
self:RefreshData(curBuyType)
self:RefreshData(curBuyType,false,false)
end
timerList[2].pre.text=Language[10561]..self:SpecialTime(t2)
end