Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
be75375dd6
|
@ -35,7 +35,10 @@ end
|
||||||
--移除事件监听(用于子类重写)
|
--移除事件监听(用于子类重写)
|
||||||
function XianShiShangShi:RemoveListener()
|
function XianShiShangShi:RemoveListener()
|
||||||
end
|
end
|
||||||
local sortingOrder = 0
|
|
||||||
|
function XianShiShangShi:OnSortingOrderChange()
|
||||||
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function XianShiShangShi:OnOpen()
|
function XianShiShangShi:OnOpen()
|
||||||
|
|
||||||
|
@ -43,7 +46,7 @@ end
|
||||||
|
|
||||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
function XianShiShangShi:OnShow(_sortingOrder,_parent)
|
function XianShiShangShi:OnShow(_sortingOrder,_parent)
|
||||||
sortingOrder = _sortingOrder
|
self.sortingOrder = _sortingOrder
|
||||||
parent = _parent
|
parent = _parent
|
||||||
this:OnShowData(true,true)
|
this:OnShowData(true,true)
|
||||||
XianShiShangShi:SetTime()
|
XianShiShangShi:SetTime()
|
||||||
|
@ -133,7 +136,7 @@ function this.SingleDataShow(pre,value)
|
||||||
end
|
end
|
||||||
for i = 1, #shows do
|
for i = 1, #shows do
|
||||||
if itemsGrid[pre][i] then
|
if itemsGrid[pre][i] then
|
||||||
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder)
|
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,self.sortingOrder)
|
||||||
itemsGrid[pre][i].gameObject:SetActive(true)
|
itemsGrid[pre][i].gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -149,7 +152,7 @@ function this.SingleDataShow(pre,value)
|
||||||
obj.gameObject:SetActive(true)
|
obj.gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
for i = 1, #shows do
|
for i = 1, #shows do
|
||||||
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder)
|
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,self.sortingOrder)
|
||||||
itemsGrid[pre][i].gameObject:SetActive(true)
|
itemsGrid[pre][i].gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -166,11 +169,6 @@ function this.SingleDataShow(pre,value)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
|
||||||
function XianShiShangShi:OnOpen()
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
function this.RechargeSuccessFunc(id)
|
function this.RechargeSuccessFunc(id)
|
||||||
FirstRechargeManager.RefreshAccumRechargeValue(id)
|
FirstRechargeManager.RefreshAccumRechargeValue(id)
|
||||||
this.OnShowData(false,false)
|
this.OnShowData(false,false)
|
||||||
|
|
|
@ -55,6 +55,7 @@ function FuXingGaoZhaoPanel:BindEvent()
|
||||||
self.timer = nil
|
self.timer = nil
|
||||||
end
|
end
|
||||||
self:Refresh()
|
self:Refresh()
|
||||||
|
CheckRedPointStatus(RedPointType.FuXingGaoZhaoPanel)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
@ -62,6 +63,7 @@ function FuXingGaoZhaoPanel:BindEvent()
|
||||||
NetManager.GetActivityRewardRequest(-1,self.data.activityId,function (drop)
|
NetManager.GetActivityRewardRequest(-1,self.data.activityId,function (drop)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function()
|
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function()
|
||||||
self:Refresh()
|
self:Refresh()
|
||||||
|
CheckRedPointStatus(RedPointType.FuXingGaoZhaoPanel)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue