From c4fac7b58f30ac4a8a96d5e703b74092effa5d8a Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 13 Oct 2020 13:55:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Revert=20"=E5=85=B3=E5=8D=A1=20=E5=92=8C=20?= =?UTF-8?q?=E5=BF=83=E9=AD=94=E7=9A=84=E6=8E=A8=E9=80=81=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=20=E5=90=8E=E7=AB=AF=E8=BF=98=E6=9C=AA=E5=89=94=E9=99=A4?= =?UTF-8?q?=E5=B7=B2=E8=B4=AD=E7=A4=BC=E5=8C=85=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=96=87=E5=AD=97=E6=9C=AA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 63a1588f667dd55326de131bd248925ea71dd48e. --- .../~Lua/Common/GlobalDefine.lua | 2 -- .../~Lua/Modules/Expert/PatFaceManager.lua | 29 ------------------- .../~Lua/Modules/Expert/PatFacePanel.lua | 8 ++--- .../~Lua/Modules/Main/MainPanel.lua | 22 ++------------ .../UpGradePackage/UpGradePackagePanel.lua | 2 -- 5 files changed, 5 insertions(+), 58 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 53b4154822..964da9614d 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1882,8 +1882,6 @@ FacePanelType = { Championship = 6, --巅峰战 FindFairy = 7, --寻仙 UpgradePac = 8,--升级限时礼包 - MonsterWave = 9,--心魔试炼限时礼包 - MainLevel = 10,--主线限时礼包 } --迷宫寻宝条件类型 FindTreasureNeedType = { diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index a5977791a4..a9a1404b62 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -173,35 +173,6 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) table.insert(patFaceAllData,v) end end - elseif v.Type == 9 then--心魔试炼限时礼包 - local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,90).Value - local str = string.split(specialConfig,"|") - local nums = string.split(str[1],"#") - local canGet = false - local value = MonsterCampManager.monsterWave - if value == tonumber(nums[1]) or value == tonumber(nums[2]) or value == tonumber(nums[3]) or - ((value - tonumber(nums[3]))%(tonumber(str[2]))) == 0 then - canGet = true - end - if canGet then - if RedPointManager.PlayerPrefsGetStr(v.Id..value.."MonsterWavePatFace") == "0" then - table.insert(patFaceAllData,v) - end - end - elseif v.Type == 10 then--主线关卡限时礼包 - local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,91).Value - local fightLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) - local num = tonumber(specialConfig) - local canGet = false - local value = fightLevelConfig[FightPointPassManager.lastPassFightId].SortId - if value%num == 0 then - canGet = true - end - if canGet then - if RedPointManager.PlayerPrefsGetStr(v.Id..value.."MainLevelPatFace") == "0" then - table.insert(patFaceAllData,v) - end - end else if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then table.insert(patFaceAllData,v) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index e52eac0201..8252cb934a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -125,9 +125,7 @@ function PatFacePanel:OnShowPatFaceData() self.obg4:SetActive(patFaceSingleData.Type == FacePanelType.SupremeHero) self.obg5:SetActive(false) self.obg6:SetActive(patFaceSingleData.Type == FacePanelType.FindFairy) - self.obg7:SetActive(patFaceSingleData.Type == FacePanelType.UpgradePac or - patFaceSingleData.Type == FacePanelType.MonsterWave or - patFaceSingleData.Type == FacePanelType.MainLevel) + self.obg7:SetActive(patFaceSingleData.Type == FacePanelType.UpgradePac) if patFaceSingleData.Type == FacePanelType.Sbtj then self:OnShowOb1Data() elseif patFaceSingleData.Type == FacePanelType.Tesc then @@ -143,9 +141,7 @@ function PatFacePanel:OnShowPatFaceData() local artId=ConfigManager.GetConfigDataByKey(ConfigName.LoginPosterConfig,"Values",curActivityId).BackgroundString self.tipImage.sprite=Util.LoadSprite(ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,artId).Name) self:OnShowOb6Data() - elseif patFaceSingleData.Type == FacePanelType.UpgradePac or - patFaceSingleData.Type == FacePanelType.MonsterWave or - patFaceSingleData.Type == FacePanelType.MainLevel then + elseif patFaceSingleData.Type == FacePanelType.UpgradePac then self:OnShowOb7Data() elseif patFaceSingleData.Type == FacePanelType.GrowGift then self:OnShowOb8Data() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 5402dcc994..20ec5c37d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1576,26 +1576,10 @@ function this:GetInfoList() end end end - local infoList3 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8) + infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8) for index, value in pairs(infoList) do - for i = 1, #infoList3 do - if infoList3[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then - table.insert(giftList,value) - end - end - end - local infoList4 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",25) - for index, value in pairs(infoList) do - for i = 1, #infoList4 do - if infoList4[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then - table.insert(giftList,value) - end - end - end - local infoList5 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",26) - for index, value in pairs(infoList) do - for i = 1, #infoList5 do - if infoList5[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then + for i = 1, #infoList2 do + if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then table.insert(giftList,value) end end diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 51525ed6af..5716a0aecb 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -17,8 +17,6 @@ local rechargeData local activityType = { [1] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21}, [2] = {name = Language[12385],timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8}, -[3] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25}, -[4] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26}, } --初始化组件(用于子类重写) function this:InitComponent() From 677dca14e7f7b685d408deb6f713e2a2dbca9cb9 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 13 Oct 2020 14:00:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83=20?= =?UTF-8?q?=E7=82=B8=E5=BC=B9=E4=BD=BF=E7=94=A8=E6=8F=8F=E8=BF=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 3b19043f344f2e7f1446400d82b8c1cb3dad4033) --- .../ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 124389ec36..94a4e4f4d4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -5608,18 +5608,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u6B21\u5143\u70B8\u5F39\u5A01\u529B\u5F88\u5927\uFF0C\u4F7F\u7528\u540E\u53EF\u6E05\u695A\u672C\u5C42\u6240\u6709\u5C0F\u602A\uFF0C\u5E76\u4E14\u53EC\u5524\u672C\u5C42BOSS" + m_Text: "\u4F7F\u7528\u540E\uFF0C\u6D88\u706D\u68EE\u7F57\u5E7B\u5883\u5F53\u524D\u5C42\u6240\u6709\u602A\u7269\uFF0C\u5E76\u53EC\u5524\u672C\u5C42BOSS" LanguageIndex: 0 --- !u!1 &963919585641795736 GameObject: From eceb50c1140ef7a83dfdb95635eb8f86f0f27ee6 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 22 Oct 2020 01:25:03 +0800 Subject: [PATCH 3/3] no message --- .../Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua | 1 + Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua index 5a01d7cafd..06564cd62a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua @@ -171,6 +171,7 @@ function this.refresh() this:showTaskList(curType) this:SetRedPoint() CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail) + CheckRedPointStatus(RedPointType.QinglongSerectTreasure) end diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index fce553a1c0..fcf19392ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -247,6 +247,8 @@ function this.ChangeVipRedPointState() CheckRedPointStatus(RedPointType.Achievement_Main) CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail) CheckRedPointStatus(RedPointType.DynamicActTask) + CheckRedPointStatus(RedPointType.QinglongSerectTreasure) + CheckRedPointStatus(RedPointType.pozhenzhuxianTask) --CheckRedPointStatus(RedPointType.Achievement_One) --CheckRedPointStatus(RedPointType.Achievement_Two) --CheckRedPointStatus(RedPointType.Achievement_Three) @@ -316,6 +318,7 @@ function this.ResetTreasureTaskInfo(taskList) Game.GlobalEvent:DispatchEvent(GameEvent.DynamicTask.OnMissionChange) Game.GlobalEvent:DispatchEvent(GameEvent.TreasureOfHeaven.TaskRefresh) CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail) + CheckRedPointStatus(RedPointType.QinglongSerectTreasure) end --迷宫寻宝前端刷新任务自行赋值