From 512a12cc72834f712015cd40bd29a3457925cf34 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 11:24:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=83=E7=95=8C=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralPanel/GeneralTreasurePanel.lua | 16 +++++----------- .../View/GeneralBigPopup_QiJieTreasure.lua | 2 ++ .../Modules/QiJieShiLian/QiJieShiLianPanel.lua | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua index 23d884a9e1..59cba35c7c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua @@ -46,30 +46,24 @@ end --添加事件监听（用于子类重写） function GeneralTreasurePanel:AddListener() - -- Game.GlobalEvent:AddEvent(GameEvent.EndLess.RechargeQinglongSerectSuccess, self.refresh,self) - -- Game.GlobalEvent:AddEvent(GameEvent.EndLess.QinglongSerectRefresh, self.OnShow,self) end --移除事件监听（用于子类重写） function GeneralTreasurePanel:RemoveListener() - -- Game.GlobalEvent:RemoveEvent(GameEvent.EndLess.RechargeQinglongSerectSuccess, self.refresh,self) - -- Game.GlobalEvent:AddEvent(GameEvent.EndLess.QinglongSerectRefresh, self.OnShow,self) end --界面打开时调用（用于子类重写） function GeneralTreasurePanel:OnOpen(...) self.curType = ... - self.curType = 83 end -- 打开，重新打开时回调 function GeneralTreasurePanel:OnShow() - -- self.treasureData = EndLessMapManager.treasureData - self.treasureData = GeneralTreasureMangaer.GetTreasureData(self.curType) - -- self.tips.text = self.treasureData.tip - self:ShowTime() - self:topBar() - self:showTaskList(true,true) + --暂时注释 + -- self.treasureData = GeneralTreasureMangaer.GetTreasureData(self.curType) + -- self:ShowTime() + -- self:topBar() + -- self:showTaskList(true,true) end function GeneralTreasurePanel:refresh(isTop,isAni) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua index d4aa83d578..e8905a4e85 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua @@ -25,6 +25,7 @@ function QiJieTreasure:InitComponent(gameObject) self.itemPre = Util.GetGameObject(gameObject, "Pre") self.tabbox = Util.GetGameObject(gameObject, "tabbox") self.goBtn = Util.GetGameObject(gameObject, "Button") + self.treasureNum = Util.GetGameObject(gameObject, "Num"):GetComponent("Text") local rootHight = self.GameObject.transform.rect.height local width = self.GameObject.transform.rect.width @@ -84,6 +85,7 @@ end function QiJieTreasure:Refresh(_tabNum) self.dataList = QiJieShiLianManager.FormatTreasureData(_tabNum) + -- self.treasureNum.text = string.format( "%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList) self.ScrollView:SetData(self.dataList, function(index, go) self:SetSingleData(index,go,self.dataList[index]) end) diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index 57a55c7e3a..28be743cf3 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -93,7 +93,7 @@ function QiJieShiLianPanel:BindEvent() end) end) Util.AddClick(self.treasureBtn,function() - PopupTipPanel.ShowTip("七界秘宝！") + UIManager.OpenPanel(UIName.GeneralTreasurePanel,ActivityTypeDef.QiJieTreasure) end) Util.AddClick(self.rewardBtn,function() UIManager.OpenPanel(UIName.GeneralRankRewardPanel,4,1)--需要活动id，和我的排名