From 054c31caee89fa5441b13a6c769c8328d2d35a63 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 1 Jun 2022 13:23:34 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=91=A8=E5=8D=A1]=3D=3D=3D=3D=3D=E7=BA=A2?= =?UTF-8?q?=E7=82=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/MonthCardPageView/WeekCardPanel.prefab | 4 +-- .../Incarnation/IncarnationManager.lua | 3 ++ .../Modules/Operating/WeekCardManager.lua | 32 +++++++++++------ .../~Lua/Modules/Operating/WeekCardPanel.lua | 36 +++++++++++++------ .../~Lua/Modules/Player/RedpotManager.lua | 6 ++-- 5 files changed, 56 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab index ddba627201..2e243e7e2e 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab @@ -4135,7 +4135,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 74.8, y: 22.4} + m_AnchoredPosition: {x: 42, y: 43} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396217404059041 @@ -7693,7 +7693,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 74.8, y: 22.4} + m_AnchoredPosition: {x: 42, y: 43} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396218097421653 diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua index fb4a482477..a1f6de1c08 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua @@ -209,6 +209,9 @@ end --获取化身之力属性加成 function this.GetIncarnationPower() local id =this.incarnationForceLv + if id==0 then + id=1 + end local lvConfig=ConfigManager.GetConfigData(ConfigName.ChangingForce,id) local proList=lvConfig.PropList return proList diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardManager.lua index cf4c8de602..a24294f977 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardManager.lua @@ -28,12 +28,11 @@ function this.UpdateWeekCardData(data) -- LogRed("月卡信息更新 "..data.id.." "..tostring(data.isBuy).." "..data.leaveGetRewardDays) local week = {} week.id = data.weekcardId - --week.isBuy = data.isBuy week.leaveGetRewardDays = data.day LogError("data.weekcardId=="..data.weekcardId) _WeekCardData[data.weekcardId] = week -- 检测红点显示 - CheckRedPointStatus(RedPointType.WeekCardReward) + CheckRedPointStatus(RedPointType.WeekCard) end -- 请求获取周卡数据 @@ -70,7 +69,7 @@ function this.RequestGetWeekCardReward(id,actId,func) --data.leaveGetRewardDays = 0 this.ChangeCardState(id) --this.UpdateWeekCardData(data) - -- + CheckRedPointStatus(RedPointType.WeekCard) if func then func() end @@ -104,11 +103,24 @@ function this.CheckRedReward() if data.leaveGetRewardDays then for key, value in pairs(data.leaveGetRewardDays) do if value.state==1 then - LogError("有可以领取的奖励-----------") + return true end end - return true + end + end + end + return false +end + +function this.CheckTabRedReward(id) + if _WeekCardData then + data=_WeekCardData[id] + if data and data.leaveGetRewardDays then + for key, value in pairs(data.leaveGetRewardDays) do + if value.state==1 then + return true + end end end end @@ -118,10 +130,10 @@ end -- 根据是否有周卡数据,判断周卡功能是否开启 function this.IsWeekCardOpen() - local list = this.GetWeekCardDataArray() - if list and #list > 0 then - LogError("有周卡数据了-----------") - return true - end + -- local list = this.GetWeekCardDataArray() + -- if list and #list > 0 then + -- LogError("有周卡数据了-----------") + -- return true + -- end return false end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPanel.lua index a9c3665ba7..ea8f2bfed8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPanel.lua @@ -100,9 +100,8 @@ function WeekCardPanel:OnShow() sortingOrder = _sortingOrder -- 查看周卡界面刷新红点 PlayerPrefs.SetInt("IsCheckWeekCard_"..PlayerManager.uid, 1) - CheckRedPointStatus(RedPointType.WeekCardOpen) + CheckRedPointStatus(RedPointType.WeekCard) local id = ActivityGiftManager.GetActivityTypeInfo(102) - LogError("id.activityId=="..activityId) weekcardR=ConfigManager.GetConfigDataByKey(ConfigName.WeekcardRotationConfig,"GlobalActivity",id.activityId) --weekcardR=ConfigManager.GetConfigData(ConfigName.WeekcardRotationConfig,1) local cardTypes={} @@ -110,7 +109,6 @@ function WeekCardPanel:OnShow() local id=weekcardR.WeekcardType[i][3] local min=weekcardR.WeekcardType[i][1] local max=weekcardR.WeekcardType[i][2] - LogError(" "..id) local type=_WeekcardConfig[id].Type local data=WeekCardManager.GetWeekCardData(id) --已经购买 @@ -155,15 +153,33 @@ function WeekCardPanel:OnShow() curIndex=i self:SetCardWind(curKey) end) - --LogError("key=="..key.." value=="..value[1].Id.." value2=="..value[2].Id) + LogError("key=="..key.." value=="..value[1].Id.." value2=="..value[2].Id) end - + self:CheckTabRed() if curKey==0 then curKey=firstKey end self:SetCardWind(firstKey) end +function WeekCardPanel:CheckTabRed() + --检测页签红点 + local num=0 + for key, value in pairs(allcards) do + num=num+1 + local isTrue=false + Util.GetGameObject(self.tabs[num], "redpoint"):SetActive(false) + for i=1,#value do + isTrue=WeekCardManager.CheckTabRedReward(value[i].Id) + if isTrue then + Util.GetGameObject(self.tabs[num], "redpoint"):SetActive(isTrue) + end + end + + end +end + + -- 妖晶数量显示 function WeekCardPanel:RefreshShow() -- local allData = WeekCardManager.GetWeekCardDataArray() @@ -173,7 +189,7 @@ function WeekCardPanel:RefreshShow() -- self:SetCardShow(i, allData[i]) -- end -- end - LogError("刷新周卡界面 curkey=="..curKey) + self:CheckTabRed() self:SetCardWind(curKey) end @@ -181,11 +197,9 @@ end --设置周卡界面 function WeekCardPanel:SetCardWind(key) curkey=key - LogError("currkey=="..key) if allcards[curkey] then local aaa=0 for k, value in pairs(allcards) do - LogError("k=="..k) aaa=aaa+1 if k==curkey then break @@ -288,7 +302,7 @@ function WeekCardPanel:ShowCardInfo(index,config) Util.SetGray(pre.btn, false) Util.AddOnceClick(pre.btn, function() local id = ActivityGiftManager.GetActivityTypeInfo(102) - LogError("cardid=="..data.id.." id=="..id.activityId) + --LogError("cardid=="..data.id.." id=="..id.activityId) WeekCardManager.RequestGetWeekCardReward(data.id, id.activityId,function() -- 刷新显示 self:RefreshShow() @@ -408,7 +422,9 @@ end --界面关闭时调用(用于子类重写) function WeekCardPanel:OnClose() - + --CheckRedPointStatus(RedPointType.WeekCard) + CheckRedPointStatus(RedPointType.WeekCardOpen) + CheckRedPointStatus(RedPointType.WeekCardReward) end --界面销毁时调用(用于子类重写) function WeekCardPanel:OnDestroy() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 89c63e0352..d68e7cb2bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -198,7 +198,7 @@ function this.InitRedPointAllRelate() --角色招募红点 -- RPData:SetParent(RedPointType.Recruit_Red, RedPointType.Recruit) -- --运营红点 - -- RPData:SetParent(RedPointType.GrowthGift, RedPointType.Operating) + RPData:SetParent(RedPointType.GrowthGift, RedPointType.Operating) -- RPData:SetParent(RedPointType.CumulativeSignIn, RedPointType.Operating) -- RPData:SetParent(RedPointType.WeekGiftPage, RedPointType.Operating) -- RPData:SetParent(RedPointType.MonthGiftPage, RedPointType.Operating) @@ -645,8 +645,8 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.DemonSlayerNew, CommonActPageManager.DemonSlayerNewRedCheck) -- 周卡 - RPData:AddCheckFunc(RedPointType.WeekCardOpen, WeekCardManager.CheckRedOpen, FUNCTION_OPEN_TYPE.WEEK_CARD) - RPData:AddCheckFunc(RedPointType.WeekCardReward, WeekCardManager.CheckRedReward, FUNCTION_OPEN_TYPE.WEEK_CARD) + RPData:AddCheckFunc(RedPointType.WeekCardOpen, WeekCardManager.CheckRedOpen) + RPData:AddCheckFunc(RedPointType.WeekCardReward, WeekCardManager.CheckRedReward) RPData:AddCheckFunc(RedPointType.ZhongShenKa, ActivityGiftManager.CheckZhongShenKaRedPoint) RPData:AddCheckFunc(RedPointType.tailsmanSoul_gold,TailsManSoulManager.CheckRedData)