From abc59090142a778055b1aba8eb41840c8b9ed251 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 2 Feb 2023 17:50:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E6=B8=B8=E5=95=86=E4=BA=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewActivity/CommonActPageManager.lua | 45 ++++++++++--------- .../Modules/NewActivity/ItemUpstarPre.lua | 9 ++-- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index d1496fcaef..c4c3243ed2 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -821,29 +821,30 @@ end --红点检测(云游商人) function this.CheckSingleRed(data) - local NeedCost = ConfigManager.GetConfigData(ConfigName.ComposeBook,data.otherData.needItems[1]).NeedCost - local ComposeBook = ConfigManager.GetConfig(ConfigName.ComposeBook) - if data.progress > 0 then - if BagManager.GetTotalItemNum(NeedCost[1][1]) >= NeedCost[1][2] then - local list = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip) - local EquipedEquipList = HeroManager.GetEquipedEquipList() - for i = 1, #data.otherData.needItems do - for j = 1, #list do - if ComposeBook[data.otherData.needItems[i]].NeedItems[1][1] == list[j].itemConfig.Id then - return true - end - end - end - for i = 1, #data.otherData.needItems do - for j = 1, #EquipedEquipList do - if ComposeBook[data.otherData.needItems[i]].NeedItems[1][1] == EquipedEquipList[j] then - return true - end - end - end - end - end return false + -- local NeedCost = ConfigManager.GetConfigData(ConfigName.ComposeBook,data.otherData.needItems[1]).NeedCost + -- local ComposeBook = ConfigManager.GetConfig(ConfigName.ComposeBook) + -- if data.progress > 0 then + -- if BagManager.GetTotalItemNum(NeedCost[1][1]) >= NeedCost[1][2] then + -- local list = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip) + -- local EquipedEquipList = HeroManager.GetEquipedEquipList() + -- for i = 1, #data.otherData.needItems do + -- for j = 1, #list do + -- if ComposeBook[data.otherData.needItems[i]].NeedItems[1][1] == list[j].itemConfig.Id then + -- return true + -- end + -- end + -- end + -- for i = 1, #data.otherData.needItems do + -- for j = 1, #EquipedEquipList do + -- if ComposeBook[data.otherData.needItems[i]].NeedItems[1][1] == EquipedEquipList[j] then + -- return true + -- end + -- end + -- end + -- end + -- end + -- return false end --新三界降魔红点检测 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua index 060f5f3e1f..0ba9696877 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua @@ -30,9 +30,10 @@ end --绑定事件(用于子类重写) function ItemUpstarPre:BindEvent() Util.AddOnceClick(self.btnMaskNeed,function () - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YunYouMan,self.data,function () - self:Refresh() - end) + + -- UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YunYouMan,self.data,function () + -- self:Refresh() + -- end) end) Util.AddOnceClick(self.btnExchange,function () if self.data.otherData.selectId == 0 then @@ -70,6 +71,7 @@ end function ItemUpstarPre:Refresh()--ComposeBook[data.otherData.needItems[i]].NeedItems[1][1] -- LogPink("self.data.missionId.:"..tostring(self.data.missionId).." #self.data.otherData.needItems:"..tostring(#self.data.otherData.needItems)) + self.data.otherData.selectId=self.data.otherData.needItems[1] local needItemId = self.data.otherData.selectId == 0 and self.data.otherData.needItems[1] or self.data.otherData.selectId local configData = ConfigManager.GetConfigData(ConfigName.ComposeBook,needItemId) local rewardList = {configData.NeedItems[1],configData.NeedCost[1],configData.GoalItems[1]} @@ -101,6 +103,7 @@ function ItemUpstarPre:SetMask() Util.GetGameObject(self.itemList[3].gameObject,"item/icon"):SetActive(self.data.otherData.IsShowItem) else self.btnMaskNeedAdd:SetActive(false) + self.btnMaskNeed:SetActive(false) self.btnMaskGet:SetActive(false) Util.GetGameObject(self.itemList[1].gameObject,"effects"):SetActive(true) Util.GetGameObject(self.itemList[1].gameObject,"item/icon"):SetActive(true)