From d7dc0425cb38f97627abb7d8f000c864daabc225 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Tue, 28 Sep 2021 17:22:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=AE=9D=E9=95=9C=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

---
 .../LingLongBaoJingManager.lua                |  1 -
 .../linglongbaojing/LingLongBaoJingPanel.lua  | 34 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua
index 32f758fd35..7c4e1fd0d1 100644
--- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua
@@ -95,7 +95,6 @@ function this.QiMenDunJiaDrawRequest(id,num,func)
         -- for i = 1,#msg.idList do
         --     LogGreen("msg.idList:"..msg.idList[i])
         -- end
-        this.SetDataListState(msg.idList)
         if func then
             func(msg.idList,msg.drop)
         end
diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua
index 093e3a9a9d..8bea8ad5ce 100644
--- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua
@@ -178,34 +178,34 @@ function LingLongBaoJingPanel:BindEvent()
                 return
             end 
             drop = _drop
+            local isGetBigReward = false
             CheckRedPointStatus(RedPointType.linglongBaojing)
             self:DelayMaskWithBool(true)
             self.fx_linglongbaojing_kaiqi.gameObject:SetActive(true)
             SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_kaiqi_002)
-            LingLongBaoJingManager.SetDataListState(idList)
-            local isAllGet = false
-            if idList[2] and idList[2] > 0 then
-                if LingLongBaoJingManager.IsAllGet() then
-                    isAllGet = true
-                    LingLongBaoJingManager.SetDataListState(nil,1)
+            for i = 1,#idList do
+                local config = ConfigManager.GetConfigData(ConfigName.LingLongPool,idList[i])
+                if config.Position == 1 then
+                    isGetBigReward = true
                 end
-                LingLongBaoJingManager.SetDataListState(nil,2)
             end
 
-            local x = function(isGetBigReward)
+            local x = function()
                 local tempData = {}
                 for i = 1,#idList do
                     table.insert(tempData,data[idList[i]])
                 end
-                self:RefreshTreasureTypeState(0,tempData)
                 if drop then
                     UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
                         drop = nil
-                        if isGetBigReward then
-                            if isAllGet then
-                                self:RefreshTreasureTypeState(1)
-                            end
+                        NetManager.QiMenDunJiaHitListRequest(self.actId,function(msg)
+                            LingLongBaoJingManager.SetDataListState(nil,1)
+                            LingLongBaoJingManager.SetDataListState(nil,2)
+                            LingLongBaoJingManager.SetDataListState(msg.hitList)
+                            self:RefreshTreasureTypeState(1)
                             self:RefreshTreasureTypeState(2)
+                        end)
+                        if isGetBigReward then
                             if not isClose then
                                 self.itemList[1][data[idList[2]].address].selectKuang.gameObject:SetActive(false)
                                 self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false)
@@ -232,11 +232,11 @@ function LingLongBaoJingPanel:BindEvent()
             end
             curTurnPos = 1
             if skip == 1 then
-                x(idList[2] and idList[2] > 0)
+                x()
                 return 
             end
             self:SetTableTurnEffect(TableTurnType.Expedite,2,data[idList[1]].address,function()
-                if idList[2] and idList[2] > 0 then
+                if isGetBigReward then
                     --PopupTipPanel.ShowTip("播放一些开门的特效")
                     SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longmengezi_004)  
                     self.Btncoroutine = coroutine.start(function()  
@@ -261,12 +261,12 @@ function LingLongBaoJingPanel:BindEvent()
                             curTurnPos = 1
                             self:SetTableTurnEffect(TableTurnType.Expedite,1,data[idList[2]].address,function()
                                 self:RefreshTreasureMaskByType(1,true)
-                                x(true)
+                                x()
                             end)     
                         end   
                     end)
                 else    
-                    x(false)
+                    x()
                 end
             end)
         end)