Merge branch 'china/dev' into china/local

dev_chengFeng
JieLing 2021-05-06 18:33:31 +08:00
commit 0259fc6834
7 changed files with 44 additions and 44 deletions

View File

@ -1007,7 +1007,7 @@ JumpType = {
LingShouBaoGe = 10019,--灵兽宝阁
XiangYaoDuoBao = 10020,--降妖夺宝
HeadChange = 10021, --巅峰赛
XianShiDuiHuan = 10022, --主题活动限时兑换
}
YaoHunFrame = {
--[6] = "r_tongyong_yaohunkuang002",

View File

@ -60,7 +60,7 @@ function ActivityMainPanel:CheckActOpen(_index)
if tabs[_index].IfBack == 1 then
if tabs[_index].ActiveType > 0 then
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType)
if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then
if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then --and (not GlobalActConfig[id].ShowArt or GlobalActConfig[id].ShowArt == this.activityType) then
_CurPageIndex = _index
end
elseif tabs[_index].FunType > 0 then
@ -93,11 +93,18 @@ function ActivityMainPanel:OnOpen(_activityType,_index)
tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType)
--累计充值特殊判断
for i = 1, #tabs do
if tabs[i] and tabs[i].ActiveType > 0 then
if tabs[i] and tabs[i].ActiveType == ActivityTypeDef.AccumulativeRechargeExper then
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[i].ActiveType)
if id and id > 0 then
local curActiveConfig = ConfigManager.TryGetConfigData(ConfigName.GlobalActivity,id)
if curActiveConfig and curActiveConfig.ShowArt == 3 then--3类型的活动不是限时活动里的累计充值
if GlobalActConfig[id] and GlobalActConfig[id].ShowArt == 3 then--3类型的活动不是限时活动里的累计充值
table.remove(tabs,i)
break
end
end
elseif tabs[i] and tabs[i].ActiveType == ActivityTypeDef.LimitExchange then
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[i].ActiveType)
if id and id > 0 then
if GlobalActConfig[id] and GlobalActConfig[id].ShowArt ~= 1 then--3类型的活动不是限时活动里的累计充值
table.remove(tabs,i)
break
end
@ -190,7 +197,7 @@ function this.PageTabAdapter(tab, index, status)
if tabs[index].IfBack == 1 then
if tabs[index].ActiveType > 0 then
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActiveType)
isshow = id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType)
isshow = id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) --and (not GlobalActConfig[id].ShowArt or GlobalActConfig[id].ShowArt == this.activityType)
elseif tabs[index].FunType > 0 then
isshow = ActTimeCtrlManager.SingleFuncState(tabs[index].FunType)
else

View File

@ -340,7 +340,7 @@ end
function this.OnAddPatFaceData(faceConFigType, starUpGiftNum)
if faceConFigType == FacePanelType.GrowGift or faceConFigType == FacePanelType.UpgradePac or faceConFigType == FacePanelType.MonsterWave or faceConFigType == FacePanelType.MainLevel
or faceConFigType == FacePanelType.TimeLimitSkin then
LogError("此种拍脸已删除 faceConFigType "..faceConFigType)
LogYellow("此种拍脸已改为后端推送 faceConFigType "..faceConFigType)
return
end
if this.isLogin then return end--上来就弹新关卡界面 所以不弹
@ -358,12 +358,13 @@ end
this.patFaceCallList = Stack.New()
function this.OpenPatFacePanel(_patFaceAllData)
--LogGreen("#patFaceAllData 事件 " .. #patFaceAllData)
if #_patFaceAllData > 0 then
if _patFaceAllData and #_patFaceAllData > 0 then
this.patFaceCallList:Clear()
this.patFaceCallList:Push(function()
--Log("结束了!!!")
this.DeleBackPatFaceDaqta()
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSendFinish)
AdventureManager.GetIsMaxTime()
end)
for i = #_patFaceAllData, 1, -1 do
this.patFaceCallList:Push(function()
@ -395,11 +396,7 @@ function this.SetPatFaceDaqta(PatFaceDatas)
end
end
end
if this.isLogin then return end--登录界面不拍
if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) then return end--在关卡里 副本里不拍
if GuideManager.IsFunctionGuideExist() then return end--功能引导不拍
if UIManager.IsOpen(UIName.SingleRecruitPanel) or UIManager.IsOpen(UIName.TenRecruitPanel) or UIManager.IsOpen(UIName.RecruitPanel) then return end--抽卡界面不拍
if this.backPatFaceAllData then
if this.backPatFaceAllData and this.GetcurCanPatFace() then
this.OpenPatFacePanel(this.backPatFaceAllData)
end
end
@ -411,4 +408,17 @@ function this.DeleBackPatFaceDaqta()
LogYellow("后端推送礼包拍脸 清空 ")
this.backPatFaceAllData = {}
end
function this.GetcurCanPatFace()
if this.isLogin then return false end--登录界面不拍
if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) then return false end--在关卡里 副本里不拍
if GuideManager.IsFunctionGuideExist() or GuideManager.IsInMainGuide() then return false end--引导不拍
if UIManager.IsOpen(UIName.SingleRecruitPanel) or UIManager.IsOpen(UIName.TenRecruitPanel) or UIManager.IsOpen(UIName.RecruitPanel) then return false end--抽卡界面不拍
if UIManager.IsOpen(UIName.PatFacePanel) then return false end--正在拍脸
return true
end
function this.RefreshPatface()
if this.GetcurCanPatFace() then
this.OpenPatFacePanel(this.GetPatFaceAllDataTabs())
end
end
return this

View File

@ -424,6 +424,7 @@ function FightPointPassMainPanel:OnShow()
-- 刷新一次编队战斗力
FormationManager.RefreshMainFormationPower()
PatFaceManager.RefreshPatface()
end
--寻宝显示
function this.UpdateFindTreasureMaterialNum()

View File

@ -851,10 +851,7 @@ function this:OnShow()
AdventureManager.GetIsMaxTime()
end
end
--主城调了两边 所以做特殊判断
if not UIManager.IsOpen(UIName.PatFacePanel) then
this.RefreshShowPatPaceActivity()
end
-- 设置主城小人名字
if self.playerView then
@ -1340,33 +1337,7 @@ function this.RefreshActivityShow()
end
function this.RefreshShowPatPaceActivity()
local patFaceAllData = PatFaceManager.GetPatFaceAllDataTabs()
if patFaceAllData and not GuideManager.IsFunctionGuideExist() and not GuideManager.IsInMainGuide() then
Log("#patFaceAllData " .. #patFaceAllData)
if #patFaceAllData > 0 then
this.patFaceCallList:Clear()
this.patFaceCallList:Push(function()
Log("结束了!!!")
PatFaceManager.DeleBackPatFaceDaqta()
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSendFinish)
AdventureManager.GetIsMaxTime()
end)
for i = #patFaceAllData, 1, -1 do
this.patFaceCallList:Push(function()
PatFaceManager.SetisFirstLogVal(1, { patFaceAllData[i] })
UIManager.OpenPanel(UIName.PatFacePanel, patFaceAllData[i], function()
local time2 = Timer.New(function()
this.patFaceCallList:Pop()()
end, 0.5)
time2:Start()
end)
end)
end
this.patFaceCallList:Pop()()
else
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSendFinish)
end
end
PatFaceManager.RefreshPatface()
end
-- 外敌数据变化检测主界面npc显示状态

View File

@ -139,6 +139,7 @@ function MonsterCampPanel:OnOpen(...)
-- 初始化界面数据
this.InitShow()
this.ChangePreview()
PatFaceManager.RefreshPatface()
end
function MonsterCampPanel:OnSortingOrderChange()

View File

@ -632,6 +632,16 @@ local jumpDic = {
return
end
end,
[JumpType.XianShiDuiHuan] = function ()
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitExchange)
local name = ConfigManager.GetConfigDataByKey(ConfigName.JumpConfig,"Type",JumpType.XianShiDuiHuan).Title
if id and id > 0 then
UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.LimitExchange)
else
PopupTipPanel.ShowTip(GetLanguageStrById(name)..Language[11397])
return
end
end,
}
function this.JumpActivity(data,skipfactor)