Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-07-17 13:58:45 +08:00
commit cb745e26c9
3 changed files with 22 additions and 9 deletions

View File

@ -30,7 +30,9 @@ function this.RefreshUsedTimes()
Game.GlobalEvent:DispatchEvent(GameEvent.FindTreasure.RefreshFindTreasure,true) Game.GlobalEvent:DispatchEvent(GameEvent.FindTreasure.RefreshFindTreasure,true)
end end
function this.RefreshFindTreasureRedPoint() function this.RefreshFindTreasureRedPoint()
-- CheckRedPointStatus(RedPointType.SecretTer_FindTreasure) if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.FINDTREASURE) then
return false
end
TaskManager.SetFindTreasureDataState() TaskManager.SetFindTreasureDataState()
local missionInfo = TaskManager.GetTypeTaskList(TaskTypeDef.FindTreasure) local missionInfo = TaskManager.GetTypeTaskList(TaskTypeDef.FindTreasure)
for i = 1, #missionInfo do for i = 1, #missionInfo do

View File

@ -101,11 +101,12 @@ function FirstRechargePanel:OnSortingOrderChange()
self.dayRewardList[i]:OnSortingOrderChange(self.sortingOrder) self.dayRewardList[i]:OnSortingOrderChange(self.sortingOrder)
end end
end end
local fun = nil
function FirstRechargePanel:OnOpen(context) function FirstRechargePanel:OnOpen(context,_fun)
context = context and context or {} context = context and context or {}
self.selectTabIndex = context.tabIndex and context.tabIndex or 1 self.selectTabIndex = context.tabIndex and context.tabIndex or 1
-- self:SetOncePart() -- self:SetOncePart()
fun = _fun
end end
function FirstRechargePanel:OnShow() function FirstRechargePanel:OnShow()
@ -185,5 +186,11 @@ function FirstRechargePanel:SetTabRedPointStatus(tabIndex)
end end
self.tabRedPoint[tabIndex]:SetActive(redPointStatus) self.tabRedPoint[tabIndex]:SetActive(redPointStatus)
end end
--界面关闭时调用(用于子类重写)
function FirstRechargePanel:OnClose()
if fun then
fun()
fun = nil
end
end
return FirstRechargePanel return FirstRechargePanel

View File

@ -1031,16 +1031,20 @@ function this:OnShow()
-- 刷新拍脸 -- 刷新拍脸
local patFaceAllData = PatFaceManager.GetPatFaceAllDataTabs() local patFaceAllData = PatFaceManager.GetPatFaceAllDataTabs()
if patFaceAllData and #patFaceAllData <= 0 and not UIManager.IsOpen(UIName.PatFacePanel) then if patFaceAllData and #patFaceAllData <= 0 and not UIManager.IsOpen(UIName.PatFacePanel) then
AdventureManager.GetIsMaxTime() if FirstRechargeManager.isFirstRecharge == 1 and FirstRechargeManager.PlayerPrefsGetStrItemId() == 0 then
FirstRechargeManager.PlayerPrefsSetStrItemId(1)
UIManager.OpenPanel(UIName.FirstRechargePanel,nil,function()
AdventureManager.GetIsMaxTime()
end)
else
AdventureManager.GetIsMaxTime()
end
end end
--主城调了两边 所以做特殊判断 --主城调了两边 所以做特殊判断
if not UIManager.IsOpen(UIName.PatFacePanel) then if not UIManager.IsOpen(UIName.PatFacePanel) then
this.RefreshShowPatPaceActivity() this.RefreshShowPatPaceActivity()
end end
if FirstRechargeManager.isFirstRecharge == 1 and FirstRechargeManager.PlayerPrefsGetStrItemId() == 0 then
FirstRechargeManager.PlayerPrefsSetStrItemId(1)
UIManager.OpenPanel(UIName.FirstRechargePanel)
end
-- 设置主城小人名字 -- 设置主城小人名字
if self.playerView then if self.playerView then
self.playerView:SetName() self.playerView:SetName()