【优化五星成长礼包、心魔试炼礼包】
parent
171e9a4690
commit
df79f56b72
|
@ -25,6 +25,11 @@ end
|
||||||
function AdventureExploreRewardPanel:BindEvent()
|
function AdventureExploreRewardPanel:BindEvent()
|
||||||
Util.AddClick(this.btnBack, function()
|
Util.AddClick(this.btnBack, function()
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
|
--Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.UpgradePac)
|
||||||
|
-- if PlayerManager.IsGetFiveStarHero then--and OperatingManager.IsShowFiveStarPatch then
|
||||||
|
|
||||||
|
-- PlayerManager.IsGetFiveStarHero = false
|
||||||
|
-- end Game.GlobalEvent:AddEvent(GameEvent.PatFace.PatFaceSend
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
|
|
|
@ -128,25 +128,17 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
||||||
end
|
end
|
||||||
elseif v.Type == 5 then--星级成长礼特殊处理
|
elseif v.Type == 5 then--星级成长礼特殊处理
|
||||||
if starUpGiftNum then
|
if starUpGiftNum then
|
||||||
Log("星级成长礼特殊处理 starUpGiftNum == v.Star "..starUpGiftNum .." ".. v.Star)
|
if starUpGiftNum == v.Star then
|
||||||
--Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceHaveGrowGift)--激活一次发一个
|
local pat = false
|
||||||
if starUpGiftNum >= v.Star then
|
local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8)
|
||||||
-- local conFigData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, v.ShopId)
|
for i = 1, #configData do
|
||||||
-- if conFigData == nil then return end
|
local id = configData[i].Id
|
||||||
-- local shopItemData = OperatingManager.GetGiftGoodsInfo(conFigData.Type,v.ShopId)
|
local giftInfo = OperatingManager.GetGiftGoodsInfo(5,id)
|
||||||
-- --shopItemData.startTime 大于零代表第一次开 需要拍脸 下次未购买并在时间内再次获得 shopItemData.startTime为零
|
if giftInfo and giftInfo.dynamicBuyTimes == 1 then
|
||||||
-- --shopItemData.buyTimes <= 0 今天没有购买才会弹
|
pat = true
|
||||||
-- --if shopItemData then
|
end
|
||||||
-- -- Log(" PatFaceManager startTime buyTimes "..shopItemData.startTime.." "..shopItemData.buyTimes)
|
end
|
||||||
-- --else
|
if pat and RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then--商品未开启才会激活拍脸
|
||||||
-- -- Log("shopItemData 为nil")
|
|
||||||
-- --end
|
|
||||||
-- if shopItemData and shopItemData.startTime > 0 and shopItemData.buyTimes <= 0 and type == 2 then
|
|
||||||
-- if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then--商品未开启才会激活拍脸
|
|
||||||
-- table.insert(patFaceAllData,v)
|
|
||||||
-- end
|
|
||||||
-- end
|
|
||||||
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then--商品未开启才会激活拍脸
|
|
||||||
table.insert(patFaceAllData,v)
|
table.insert(patFaceAllData,v)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -168,6 +160,7 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
||||||
end
|
end
|
||||||
elseif v.Type == 7 then--东海寻仙
|
elseif v.Type == 7 then--东海寻仙
|
||||||
if FindFairyManager.GetActivityTime() > 0 then
|
if FindFairyManager.GetActivityTime() > 0 then
|
||||||
|
|
||||||
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||||
table.insert(patFaceAllData,v)
|
table.insert(patFaceAllData,v)
|
||||||
end
|
end
|
||||||
|
@ -300,6 +293,7 @@ end
|
||||||
--事件触发拍脸 (如五星成长礼)
|
--事件触发拍脸 (如五星成长礼)
|
||||||
function this.OnAddPatFaceData(faceConFigType, starUpGiftNum)
|
function this.OnAddPatFaceData(faceConFigType, starUpGiftNum)
|
||||||
if this.isLogin then return end--上来就弹新关卡界面 所以不弹
|
if this.isLogin then return end--上来就弹新关卡界面 所以不弹
|
||||||
|
|
||||||
if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) then return end--在关卡里 副本里不弹
|
if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) then return end--在关卡里 副本里不弹
|
||||||
patFaceAllData = {}
|
patFaceAllData = {}
|
||||||
local allTypeFaceConFig = ConfigManager.GetAllConfigsDataByKey(ConfigName.LoginPosterConfig,"Type",faceConFigType)
|
local allTypeFaceConFig = ConfigManager.GetAllConfigsDataByKey(ConfigName.LoginPosterConfig,"Type",faceConFigType)
|
||||||
|
|
|
@ -317,11 +317,11 @@ end
|
||||||
--第五种显示 五星成长礼
|
--第五种显示 五星成长礼
|
||||||
local timeOb5
|
local timeOb5
|
||||||
function PatFacePanel:OnShowOb5Data()
|
function PatFacePanel:OnShowOb5Data()
|
||||||
if OperatingManager.IsShowFiveStarPatch then
|
-- if OperatingManager.IsShowFiveStarPatch then
|
||||||
OperatingManager.upGradePackagePanelType = 2
|
OperatingManager.upGradePackagePanelType = 2
|
||||||
UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end)
|
UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end)
|
||||||
OperatingManager.IsShowFiveStarPatch = false
|
-- OperatingManager.IsShowFiveStarPatch = false
|
||||||
end
|
-- end
|
||||||
end
|
end
|
||||||
function PatFacePanel:OnShowOb6Data()
|
function PatFacePanel:OnShowOb6Data()
|
||||||
patFaceFindFairy.OnShow(self,patFaceSingleData)
|
patFaceFindFairy.OnShow(self,patFaceSingleData)
|
||||||
|
|
|
@ -1161,7 +1161,7 @@ function this:OnShow()
|
||||||
-- UIManager.ClosePanel(UIName.RewardItemSingleShowPopup)
|
-- UIManager.ClosePanel(UIName.RewardItemSingleShowPopup)
|
||||||
--end
|
--end
|
||||||
CheckRedPointStatus(RedPointType.RankingSort)
|
CheckRedPointStatus(RedPointType.RankingSort)
|
||||||
if PlayerManager.IsGetFiveStarHero and OperatingManager.IsShowFiveStarPatch then
|
if PlayerManager.IsGetFiveStarHero then --and OperatingManager.IsShowFiveStarPatch then
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
|
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
|
||||||
PlayerManager.IsGetFiveStarHero = false
|
PlayerManager.IsGetFiveStarHero = false
|
||||||
end
|
end
|
||||||
|
|
|
@ -41,9 +41,9 @@ function this.SetBasicValues(giftGoodsList)
|
||||||
|
|
||||||
local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
|
local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
|
||||||
|
|
||||||
-- LogGreen("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
|
LogGreen("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
|
||||||
-- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
|
..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
|
||||||
-- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes)
|
..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes)
|
||||||
if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
|
if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
|
||||||
else
|
else
|
||||||
if giftGoodsInfoList[rechargeConfigLocal.Type] then
|
if giftGoodsInfoList[rechargeConfigLocal.Type] then
|
||||||
|
|
|
@ -90,6 +90,10 @@ function RewardItemPopup:BindEvent()
|
||||||
if isPlayerAniEnd then
|
if isPlayerAniEnd then
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
|
if PlayerManager.IsGetFiveStarHero then--and OperatingManager.IsShowFiveStarPatch then
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
|
||||||
|
PlayerManager.IsGetFiveStarHero = false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.btnMapBack, function ()
|
Util.AddClick(this.btnMapBack, function ()
|
||||||
|
|
|
@ -60,7 +60,7 @@ function SingleRecruitPanel:BindEvent()
|
||||||
Util.AddClick(self.sureBtn, function()
|
Util.AddClick(self.sureBtn, function()
|
||||||
-- isFirst=true
|
-- isFirst=true
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
if PlayerManager.IsGetFiveStarHero and OperatingManager.IsShowFiveStarPatch then
|
if PlayerManager.IsGetFiveStarHero then--and OperatingManager.IsShowFiveStarPatch then
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
|
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
|
||||||
PlayerManager.IsGetFiveStarHero = false
|
PlayerManager.IsGetFiveStarHero = false
|
||||||
end
|
end
|
||||||
|
|
|
@ -30,6 +30,10 @@ function TenRecruitPanel:BindEvent()
|
||||||
|
|
||||||
Util.AddClick(self.sureBtn, function()
|
Util.AddClick(self.sureBtn, function()
|
||||||
-- UIManager.OpenPanel(UIName.RecruitPanel)
|
-- UIManager.OpenPanel(UIName.RecruitPanel)
|
||||||
|
if PlayerManager.IsGetFiveStarHero then--and OperatingManager.IsShowFiveStarPatch then
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
|
||||||
|
PlayerManager.IsGetFiveStarHero = false
|
||||||
|
end
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
Util.AddClick(self.againBtn, function()
|
Util.AddClick(self.againBtn, function()
|
||||||
|
|
Loading…
Reference in New Issue