From 056815a8b600f6e7a87bb248e052b736816cd96f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 22 Aug 2020 19:40:14 +0800 Subject: [PATCH] patch commit --- .../~Lua/Modules/Expert/PatFaceManager.lua | 37 ++++++++++--------- .../~Lua/Modules/Expert/PatFacePanel.lua | 33 ++++------------- .../~Lua/Modules/Hero/HeroManager.lua | 3 +- .../~Lua/Modules/Main/MainPanel.lua | 4 ++ .../MissionDailyPanel_SecretTreasureTrail.lua | 3 -- .../Modules/Operating/OperatingManager.lua | 1 + .../~Lua/Modules/Player/PlayerManager.lua | 2 +- .../~Lua/Modules/Recruit/TenRecruitPanel.lua | 3 +- .../UpGradePackage/UpGradePackagePanel.lua | 9 +++-- 9 files changed, 44 insertions(+), 51 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index f129961022..f2e6f14ff7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -120,23 +120,26 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) end elseif v.Type == 5 then--星级成长礼特殊处理 if starUpGiftNum then - --Log("星级成长礼特殊处理 starUpGiftNum == v.Star "..starUpGiftNum .." ".. v.Star) - Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceHaveGrowGift)--激活一次发一个 - if starUpGiftNum == v.Star then - local conFigData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, v.ShopId) - if conFigData == nil then return end - local shopItemData = OperatingManager.GetGiftGoodsInfo(conFigData.Type,v.ShopId) - --shopItemData.startTime 大于零代表第一次开 需要拍脸 下次未购买并在时间内再次获得 shopItemData.startTime为零 - --shopItemData.buyTimes <= 0 今天没有购买才会弹 - --if shopItemData then - -- Log(" PatFaceManager startTime buyTimes "..shopItemData.startTime.." "..shopItemData.buyTimes) - --else - -- 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 + Log("星级成长礼特殊处理 starUpGiftNum == v.Star "..starUpGiftNum .." ".. v.Star) + --Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceHaveGrowGift)--激活一次发一个 + if starUpGiftNum >= v.Star then + -- local conFigData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, v.ShopId) + -- if conFigData == nil then return end + -- local shopItemData = OperatingManager.GetGiftGoodsInfo(conFigData.Type,v.ShopId) + -- --shopItemData.startTime 大于零代表第一次开 需要拍脸 下次未购买并在时间内再次获得 shopItemData.startTime为零 + -- --shopItemData.buyTimes <= 0 今天没有购买才会弹 + -- --if shopItemData then + -- -- Log(" PatFaceManager startTime buyTimes "..shopItemData.startTime.." "..shopItemData.buyTimes) + -- --else + -- -- 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) end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 4f63a4ee7d..f66d58e832 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -123,7 +123,7 @@ function PatFacePanel:OnShowPatFaceData() self.obg2:SetActive(patFaceSingleData.Type == FacePanelType.Tesc) self.obg3:SetActive(patFaceSingleData.Type == FacePanelType.GuildFight or patFaceSingleData.Type == FacePanelType.Championship) self.obg4:SetActive(patFaceSingleData.Type == FacePanelType.SupremeHero) - self.obg5:SetActive(patFaceSingleData.Type == FacePanelType.GrowGift) + self.obg5:SetActive(false) self.obg6:SetActive(patFaceSingleData.Type == FacePanelType.FindFairy) self.obg7:SetActive(patFaceSingleData.Type == FacePanelType.UpgradePac) if patFaceSingleData.Type == FacePanelType.Sbtj then @@ -143,6 +143,8 @@ function PatFacePanel:OnShowPatFaceData() self:OnShowOb6Data() elseif patFaceSingleData.Type == FacePanelType.UpgradePac then self:OnShowOb7Data() + elseif patFaceSingleData.Type == FacePanelType.GrowGift then + self:OnShowOb8Data() end end end @@ -311,31 +313,11 @@ end --第五种显示 五星成长礼 local timeOb5 function PatFacePanel:OnShowOb5Data() - self.obg5infoText.text = patFaceSingleData.Desc - Util.AddOnceClick(self.obg5goJumpBtn, function() - self:JumpBtnClickEvent() - end) - Util.AddOnceClick(self.obg5cancelBtn, function() - self:ClosePanel() - end) - local timeDownNum = 5 - self.obg5cancelBtnText.text = Language[10552]..timeDownNum..")" - if timeOb5 then - timeOb5:Stop() - timeOb5 = nil + if OperatingManager.IsShowFiveStarPatch then + OperatingManager.upGradePackagePanelType = 2 + UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end) + OperatingManager.IsShowFiveStarPatch = false end - timeOb5 = Timer.New(function() - self.obg5cancelBtnText.text = Language[10552]..timeDownNum..")" - if timeDownNum < 0 then - self:ClosePanel() - if timeOb5 then - timeOb5:Stop() - timeOb5 = nil - end - end - timeDownNum = timeDownNum - 1 - end, 1, -1, true) - timeOb5:Start() end function PatFacePanel:OnShowOb6Data() patFaceFindFairy.OnShow(self,patFaceSingleData) @@ -349,6 +331,7 @@ function PatFacePanel:OnShowOb7Data() OperatingManager.upGradePackagePanelType = 1 UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end) end + function PatFacePanel:JumpBtnClickEvent() if openPanle then openPanle.patFaceCallList:Clear() diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 0877ab2d37..ae6043029d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2071,7 +2071,8 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas(sid, star) end function this.DetectionOpenFiveStarActivity(starUpGiftNum) Log(" ---- GameEvent.PatFace.PatFaceSend,14 ") - Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, starUpGiftNum) + PlayerManager.IsGetFiveStarHero = true + end -- 判断英雄是否有魂印功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index c3e07143a0..b35672c07c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1063,6 +1063,10 @@ function this:OnShow() -- UIManager.ClosePanel(UIName.RewardItemSingleShowPopup) --end CheckRedPointStatus(RedPointType.RankingSort) + if PlayerManager.IsGetFiveStarHero and OperatingManager.IsShowFiveStarPatch then + Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5) + PlayerManager.IsGetFiveStarHero = false + end end diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua index 5bba9b7e00..26aa68d681 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua @@ -181,9 +181,6 @@ function this:SingleTask(go, rewardSingleData) local text = Util.GetGameObject(lingquButton.gameObject, "Text") :GetComponent("Text") lingquButton:GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite) text.text = type[state].text - if state == 1 then - text.text = sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name - end Util.AddOnceClick(lingquButton, function() if state == 1 then NetManager.TakeMissionRewardRequest(TaskTypeDef.TreasureOfSomeBody,sConFigData.id, function(msg) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index f4015cf9ea..00b51d6116 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -20,6 +20,7 @@ local giftGoodsInfo this.upGradePackagePanelType = 1 this.upGradePackagePanelIndex = 1 +this.IsShowFiveStarPatch = true --初始化 function this.Initialize() Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, function() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index af03177a9c..d96f4255f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -24,7 +24,7 @@ this.heroHandBookListData={} --移动速度 和 视野范围 this.MapSpeed = 0 this.MapView = 0 - +this.IsGetFiveStarHero = false local update = function() local dt = Time.unscaledDeltaTime this.serverTime = this.serverTime + dt diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua index c6fa357caf..c8dbfade3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua @@ -74,7 +74,8 @@ function TenRecruitPanel:OnOpen(...) for i = 1, #_roleDatas do cardList[i]:OnOpen(_roleDatas[i].id,false,false,-1,self.sortingOrder) local heorConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,_roleDatas[i].heroId) - if heorConfig and heorConfig.Quality == 5 and heorConfig.Natural >= 13 then + LogBlue("heorConfig.Star:"..heorConfig.Star) + if heorConfig and heorConfig.Star >= 5 then HeroManager.DetectionOpenFiveStarActivity(heorConfig.Star) end end diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 2cdba8849a..be43f383b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -15,8 +15,8 @@ local curType local fun--回调 local rechargeData local activityType = { -[1] = {name = "等级礼包",timePos = Vector3.New(0,-255.6,0),price = true,comp = "bg1",showType = 21}, -[2] = {name = "五星成长礼",timePos = Vector3.New(0,-567,0),price = false,comp = "bg2",showType = 8}, +[1] = {name = "等级礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21}, +[2] = {name = "五星成长礼",timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8}, } --初始化组件(用于子类重写) function this:InitComponent() @@ -187,6 +187,9 @@ end --设置奖励 local _ItemViewList = {} function this:SetGfitShow(rechargeData) + for k,v in pairs(_ItemViewList) do + v.gameObject:SetActive(false) + end for i=1, #RechargeConfig[curGiftId].RewardShow do if not _ItemViewList[i] then local view = SubUIManager.Open(SubUIConfig.ItemView,this.grid.transform) @@ -197,7 +200,7 @@ function this:SetGfitShow(rechargeData) end this.times.text = Language[10535]..rechargeData.dynamicBuyTimes..Language[10054] this.price.text = RechargeConfig[curGiftId].Price..Language[10538] - this.oriPrice.gameObject:SetActive(activityType[curType].price) + --this.oriPrice.gameObject:SetActive(activityType[curType].price) end --设置剩余时间,取剩余时间最短的礼包