Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-09-16 16:16:59 +08:00
commit a79d425b3b
2 changed files with 12 additions and 9 deletions

View File

@ -33946,7 +33946,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -50, y: 152}
m_AnchoredPosition: {x: -50, y: 283.5}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8374736667363694714
@ -103377,7 +103377,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 1846, y: -78}
m_AnchoredPosition: {x: 1832, y: -78}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &4141209481787949115
@ -156776,9 +156776,9 @@ RectTransform:
m_Father: {fileID: -4381370023651553062}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -20, y: -754}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -20, y: 206}
m_SizeDelta: {x: 1100, y: 202.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1048028496800183147

View File

@ -49,14 +49,14 @@ end
--添加事件监听(用于子类重写)
function ActivityMainPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, function()
this:OnOpen(this.activityType,_CurPageIndex)
this:OnOpen(this.activityType,_CurPageIndex,true)
end)
end
--移除事件监听(用于子类重写)
function ActivityMainPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, function()
this:OnOpen(this.activityType,_CurPageIndex)
this:OnOpen(this.activityType,_CurPageIndex,true)
end)
end
@ -109,18 +109,21 @@ function ActivityMainPanel:CheckActOpen(_index)
end
--界面打开时调用(用于子类重写)
function ActivityMainPanel:OnOpen(_activityType,_index)
function ActivityMainPanel:OnOpen(_activityType,_index,change)
SoundManager.PlaySound(SoundConfig.UI_Hddakai)
this.activityType = _activityType
DynamicActivityManager.curActivityType = this.activityType
tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType)
_CurPageIndex = 0
if change then
_index = tabs[_index].Sort
end
if _index and _index > 0 then
self:CheckActOpen(_index)
end
for index = 1, #tabs do
if _CurPageIndex < 1 then
self:CheckActOpen(index)
self:CheckActOpen(tabs[index].Sort)
else
break
end