From 0a9d0d2d05c42b97d953aa14a5dd27ef02d450d3 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 28 Jan 2021 15:06:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=B9=B8=E8=BF=90=E6=8E=A2?= =?UTF-8?q?=E5=AE=9D=E3=80=91=E5=9C=A8=E6=8E=A2=E5=AE=9D=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E8=BF=870=E7=82=B9=E5=88=B7=E6=96=B0=EF=BC=8C=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=88=B7=E6=96=B0=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E7=89=A9=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Logic/GameEvent.lua | 2 ++ .../Modules/LuckyTurnTable/LuckyTurnTableManager.lua | 1 + .../~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index 638746d1ff..704fc64055 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -195,6 +195,8 @@ GameEvent = { OnPatFaceRedRefresh = "Activity.OnPatFaceRedRefresh", --幸运转盘跑马灯数据刷新 OnLuckyTableWorldMessage="Activity.OnLuckyTableWorldMessage", + --幸运转盘跑马灯0点数据刷新 + OnLuckyTableZeroRefresh="Activity.OnLuckyTableZeroRefresh", -- 积天豪礼刷新 ContinueRechargeRefresh ="Activity.ContinueRechargeRefresh", }, diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua index 8b9f93a33e..70fa485b60 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua @@ -94,6 +94,7 @@ function this.ReceiveServerDataForFive(data1,data2) --for i, v in ipairs(this.advancedData) do -- Log("服务器推送高级探宝5点数据"..tostring(v)) --end + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnLuckyTableZeroRefresh) end ---请求活动数据 diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua index a34a02a4cc..38053415b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua @@ -152,11 +152,13 @@ end ---添加事件监听(用于子类重写) function LuckyTurnTablePanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.Activity.OnLuckyTableWorldMessage, this.ShowRecordMessage) + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnLuckyTableZeroRefresh, this.OnShowPanelData) end ---移除事件监听(用于子类重写) function LuckyTurnTablePanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnLuckyTableWorldMessage, this.ShowRecordMessage) + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnLuckyTableZeroRefresh, this.OnShowPanelData) end ---界面打开时调用(用于子类重写) @@ -173,6 +175,13 @@ function LuckyTurnTablePanel:OnShow() this.LuckyTurnOnShow(TreasureType.Advanced) end end +function this.OnShowPanelData() + if LuckyTurnTableManager.curTreasureType==TreasureType.Lucky then--防止当前为高级探宝时 按下探宝后跳转到幸运探宝 + this.LuckyTurnOnShow(TreasureType.Lucky) + elseif LuckyTurnTableManager.curTreasureType==TreasureType.Advanced then + this.LuckyTurnOnShow(TreasureType.Advanced) + end +end local sortingOrder = 0 ---重设层级 function LuckyTurnTablePanel:OnSortingOrderChange() From ba6db732703f21c55f3bd2363b1f30cc13737ba8 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 28 Jan 2021 15:27:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90NPC=E3=80=91=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Player/PlayerManager.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 862cf02fbb..39ae4f6557 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -550,7 +550,17 @@ function this.GetMainPlayerNPCData3(fun) table.insert(upList,val) end for key,val in pairs(rankNPCList) do - table.insert(upList,val) + -- 去重 + local isRepetition = false + for ke2y,val2 in pairs(upList) do + local curUid = val2.roleUid or val2.id + if val.uid == curUid then + isRepetition = true + end + end + if not isRepetition then + table.insert(upList,val) + end end if #upList < needAllNum then for i = 1, needAllNum - #upList do