From 3921d6326f10280649b9092f1c3f769705d7d13d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 16 Nov 2021 16:59:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1019147=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E5=AF=BB=E5=AE=9D=E3=80=91=E7=A5=9E=E9=AD=82=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=9C=A8=E5=AF=BB=E5=AE=9D=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=A9=BF=E9=80=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Logic/GameEvent.lua | 1 + .../FindTreasure/FindTreasureDispatchPanel.lua | 2 +- .../Modules/FindTreasure/FindTreasureMainPanel.lua | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index 6b73d7ea79..6bd4a13e83 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -377,6 +377,7 @@ GameEvent = { FindTreasure={ RefreshFindTreasure="FindTreasure.RefreshFindTreasure", RefreshFindTreasureRedPot="FindTreasure.RefreshFindTreasureRedPot", + RefreshFindTreasureRect="FindTreasure.RefreshFindTreasureRect", }, TopMatch={ OnTopMatchDataUpdate = "TopMatch.OnTopMatchDataUpdate", diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua index 896ff50428..e9f8b7de1f 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua @@ -522,7 +522,7 @@ function FindTreasureDispatchPanel:TimeStampToDateString(second) end --界面关闭时调用（用于子类重写） function FindTreasureDispatchPanel:OnClose() - + Game.GlobalEvent:DispatchEvent(GameEvent.FindTreasure.RefreshFindTreasureRect) if timer then timer:Stop() timer = nil diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua index 45b9ac24ee..6f49195064 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua @@ -32,6 +32,7 @@ function FindTreasureMainPanel:InitComponent() -- end -- findTreasureItemsGrid[i] = curexpertRewardItemsGri -- end + self.rectRoot = Util.GetGameObject(self.gameObject, "rect") local v = Util.GetGameObject(self.gameObject, "rect/rect (1)"):GetComponent("RectTransform").rect self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "rect/rect (1)").transform, self.rewardPre, nil, Vector2.New(v.width, v.height), 1, 1, Vector2.New(0,-5)) @@ -167,16 +168,20 @@ end --添加事件监听（用于子类重写） function FindTreasureMainPanel:AddListener() - + Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasureRect, self.RefreshFindTreasureRect,self) Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasure, self.OnShowPanelData,self) end --移除事件监听（用于子类重写） function FindTreasureMainPanel:RemoveListener() - + Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasureRect, self.RefreshFindTreasureRect,self) Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasure, self.OnShowPanelData,self) end +function FindTreasureMainPanel:RefreshFindTreasureRect() + self.rectRoot.gameObject:SetActive(true) +end + --界面打开时调用（用于子类重写） function FindTreasureMainPanel:OnOpen(...) @@ -186,6 +191,7 @@ end --界面打开或者重新打开后，界面刷新时调用（用于子类重写） function FindTreasureMainPanel:OnShow() isPlayAnim = true + self.rectRoot.gameObject:SetActive(true) self:OnShowPanelData(true,true,true) end function FindTreasureMainPanel:OnSortingOrderChange() @@ -391,6 +397,7 @@ function FindTreasureMainPanel:ActivityRewardSingleShow(_activityRewardGo,reward quickGetButtonImage.sprite = self.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,sConFigData.SpeedUpTake[1]).ResourceID)) quickGetButtonNumText.text = sConFigData.SpeedUpTake[2] Util.AddOnceClick(jumpButton, function() + self.rectRoot.gameObject:SetActive(false) UIManager.OpenPanel(UIName.FindTreasureDispatchPanel,rewardData) end) Util.AddOnceClick(grtButton, function()