【限时活动】重构完成

dev_chengFeng
ZhangBiao 2021-04-21 15:00:20 +08:00
parent 30361f5393
commit aa834ad136
9 changed files with 42347 additions and 37 deletions

View File

@ -2928,9 +2928,9 @@ RectTransform:
m_Father: {fileID: 8156779004366035923}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 489}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 539}
m_SizeDelta: {x: 1080, y: 1085}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8941761319558283003

File diff suppressed because it is too large Load Diff

View File

@ -53301,6 +53301,10 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 504
resAbNameIndex: 3198
- resName: ExChangePage
extension: .prefab
resPathIndex: 504
resAbNameIndex: 3198
- resName: ExpertPage
extension: .prefab
resPathIndex: 504
@ -74746,6 +74750,8 @@ MonoBehaviour:
- lz4/dynamicatlas/artfont/l_mrlb_banner_zh.unity3d
- lz4/dynamicatlas/artfont/r_daren_dianjing_zh.unity3d
- lz4/dynamicatlas/l_mrlb_tiao_jpg.unity3d
- lz4/dynamicatlas/r_xianshiduihuan_beijing.unity3d
- lz4/dynamicatlas/r_xianshiduihuan_zidiban.unity3d
- lz4/dynamicatlas/r_ymqf_dikuang.unity3d
- lz4/dynamicatlas/s_shouchong_anniu.unity3d
- lz4/effectresui/meirilibao.unity3d
@ -74754,6 +74760,7 @@ MonoBehaviour:
- lz4/fonts/artfont_2.unity3d
- lz4/fonts/fzjinls.unity3d
- lz4/fonts/kaiu.unity3d
- lz4/fonts/powernewfont.unity3d
- lz4/icons.unity3d
- lz4/publicartres/animations.unity3d
- lz4/publicartres/materials.unity3d

View File

@ -422,5 +422,5 @@ SubUIConfig = {
[11] = {name = "ExpertPage",assetName = "ExpertPage",script = "Modules/NewActivity/ExpertPage"},--达人界面预设
[12] = {name = "ExpertPre",assetName = "ExpertPre",script = "Modules/NewActivity/ExpertPre"},--达人单条预设
[13] = {name = "ConRechargePage",assetName = "ConRechargePage",script = "Modules/NewActivity/ConRechargePage"},--积天豪礼界面预设
[14] = {name = "ExChangePage",assetName = "ExChangePage",script = "Modules/NewActivity/ExChangePage"},--积天豪礼界面预设
[14] = {name = "ExChangePage",assetName = "ExChangePage",script = "Modules/NewActivity/ExChangePage"},--限时兑换界面预设
}

View File

@ -138,7 +138,7 @@ function this.InitActivityServerData(msg, isUpdate)
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
-- LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
for n, m in ipairs(v.mission) do
--LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then

View File

@ -89,14 +89,14 @@ function ActivityMainPanel:OnOpen(_activityType,_index)
_CurPageIndex = 0
if _index and _index > 0 then
self:CheckActOpen(_index)
LogPink("_index:"..tostring(_index))
-- LogPink("_index:"..tostring(_index))
end
for index = 1, #tabs do
if _CurPageIndex < 1 then
self:CheckActOpen(index)
LogYellow("_index:"..tostring(index).." _CurPageIndex:"..tostring(_CurPageIndex))
-- LogYellow("_index:"..tostring(index).." _CurPageIndex:"..tostring(_CurPageIndex))
else
LogGreen("Break _CurPageIndex:"..tostring(_CurPageIndex))
-- LogGreen("Break _CurPageIndex:"..tostring(_CurPageIndex))
break
end
end
@ -211,6 +211,7 @@ function this.OnPageTabChange(index)
subViewList[index].sub:OnShow(orginLayer)
else
subViewList[index] = {}
LogGreen("Change index:"..tostring(index))
if tabs[index].UIName then
subViewList[index].config = SubUIConfig[tabs[index].UIName[1]]
subViewList[index].sub = SubUIManager.Open(subViewList[index].config,this.content.transform,tabs[index],index,this)

View File

@ -34,6 +34,14 @@ function ConRechargePage:InitComponent()
self.title1 = Util.GetGameObject(self.image, "title1"):GetComponent("Text")
self.obj = Util.GetGameObject(self.image, "obj")
-- 设置循环滚动,万一内容不停地加
local rootHight = self.Scroll.transform.rect.height
local width = self.Scroll.transform.rect.width
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Scroll.transform,
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0))
self.scrollView.moveTween.MomentumAmount = 1
self.scrollView.moveTween.Strength = 2
if not self.moneyNum then
self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, self.image.transform,
math.round(MoneyUtil.GetMoney(2000)) , MoneyNumViewType.Image_Horizontal, "ArtFont_2_cfont", 42, 0.7, Vector2.New(118, 161), Vector2.New(-30, -50), MoneyNumViewImageType.Big_1)
@ -58,7 +66,7 @@ end
-- 打开,重新打开时回调
function ConRechargePage:OnShow(_sortingOrder)
self.gameObject:SetActive(true)
self.sortingOrder = _sortingOrder or self.sortingOrder
-- self.sortingOrder = _sortingOrder or self.sortingOrder
self.actId = self.actConfig.ActId
self.actType = self.actConfig.ActiveType
if self.actConfig.IfBack == 1 then
@ -94,12 +102,11 @@ function ConRechargePage:OnShow(_sortingOrder)
end
--刷新数据
function ConRechargePage:RefreshData(isTop,isAni)
self.ActData = ConRechargePageManager.GetData(self.actConfig.ActiveType)
self.ActData = CommonActPageManager.GetData(self.actConfig.ActiveType)
if self.actConfig.RpType > 0 then
CheckRedPointStatus(self.actConfig.RpType)
end
self:RefreshActData(isTop,isAni)
self:RefreshTime()
end
--刷新活动数据
function ConRechargePage:RefreshActData(isTop,isAni)
@ -127,28 +134,6 @@ function ConRechargePage:ShowSingleData(item,sdata,index)
self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData.activityId)
end
function ConRechargePage:RefreshTime()
if self.actConfig.ShowTime == 0 then
self.time:SetActive(false)
return
end
if self.localTimer then
self.localTimer:Stop()
self.localTimer = nil
end
self.time:SetActive(true)
local freshTime = self.ActData.endTime - GetTimeStamp()
self.timeText.text = Language[10023]..TimeToFelaxible(freshTime)
self.localTimer = Timer.New(function ()
freshTime = freshTime - 1
self.timeText.text = Language[10023]..TimeToFelaxible(freshTime)
if freshTime <= 0 then
self.parent:ClosePanel()
end
end, 1, -1, true)
self.localTimer:Start()
end
function ConRechargePage:OnClose()
self.gameObject:SetActive(false)
end

View File

@ -74,7 +74,7 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function ExChangePage:OnShow(_sortingOrder)
self.gameObject:SetActive(true)
self.self.cursortingOrder = _sortingOrder or self.self.cursortingOrder
self.cursortingOrder = _sortingOrder or self.self.cursortingOrder
self:ExChangeShow()
end
@ -106,7 +106,6 @@ function ExChangePage:ExChangeShow()
self.liveName = GetResourcePath(self.heroConfig.Live)
self.liveNode = poolManager:LoadLive(self.liveName, self.live2dRoot.transform,
Vector3.one * exChangeConFig.HeroShowScale, Vector3.New(exChangeConFig.HeroShowLocation[1], exChangeConFig.HeroShowLocation[2],0))
self.profession.sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(self.heroConfig.Profession))
self.proImage.sprite =Util.LoadSprite(GetProStrImageByProNum(self.heroConfig.PropertyName))
self.heroName.text =GetLanguageStrById(self.heroConfig.ReadingName)

View File

@ -37,7 +37,7 @@ function ExpertPage:InitComponent()
self.scrollView.moveTween.MomentumAmount = 1
self.scrollView.moveTween.Strength = 2
self.sortingOrder = 0
self.effect = Util.GetGameObject(self.gameObject, "Effect")
self.ItemList = {}
end
@ -58,7 +58,7 @@ end
-- 打开,重新打开时回调
function ExpertPage:OnShow(_sortingOrder)
self.gameObject:SetActive(true)
self.sortingOrder = _sortingOrder or self.sortingOrder
-- self.sortingOrder = _sortingOrder or self.sortingOrder
self.actId = self.actConfig.ActId
self.actType = self.actConfig.ActiveType
if self.actConfig.IfBack == 1 then
@ -86,6 +86,8 @@ function ExpertPage:OnShow(_sortingOrder)
--拿取数据
self:RefreshData(true,true)
self:RefreshBtns()--刷新上方两个按钮
Util.AddParticleSortLayer( self.effect, _sortingOrder - self.sortingOrder)
self.sortingOrder = _sortingOrder
end
function ExpertPage:RefreshBtns()