From fdc4d2f2031169d905c092ddd303ff20656b203b Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Wed, 9 Jun 2021 18:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1009398=E3=80=91=20=E3=80=90?=
 =?UTF-8?q?=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D=E3=80=91=E8=A7=A3=E9=94=81?=
 =?UTF-8?q?=E7=A7=98=E5=AE=9D=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=A5=96?=
 =?UTF-8?q?=E5=8A=B1=20=EF=BC=8C=E6=97=A0=E5=B0=BD=E7=A7=98=E5=AE=9D?=
 =?UTF-8?q?=E5=90=8C=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../~Lua/Modules/Map/EndLessMapManager.lua    |  3 +--
 ...eralPopup_HeavenUnlockExtraRewardPanel.lua | 26 +++++--------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua
index 2a5911b38c..495558205d 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua
@@ -908,10 +908,9 @@ function this.GetAllRewardData()
         if v.Reward then
             for n,m in ipairs(v.Reward) do
                 if m.type == 2 then
+                    table.insert(rewardData1,m)
                     if id >= v.Id then
                         table.insert(rewardData,m)
-                    else
-                        table.insert(rewardData1,m)
                     end                 
                 else
                     if (v.state == 4 and id >= v.Id) or v.state == 2 then
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
index df971d81fc..4f401dfa39 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
@@ -168,7 +168,6 @@ function this:showRewardQinglong()
         end
         return lv
     end
-    LogGreen("level:"..Getlv(curScore))
     for i = 1,#strs do
         local strs1 = string.split(strs[i],"#")
         if tonumber(strs1[1]) == QinglongSerectTreasureManager.scoreId then
@@ -176,7 +175,6 @@ function this:showRewardQinglong()
         end
     end
     local level = Getlv(curScore)
-    LogGreen("level:"..level)
     for i = 1, #rewardData do
         -- body
         local reward = rewardData[i]
@@ -184,31 +182,21 @@ function this:showRewardQinglong()
             local id = reward.Reward[j].item[1]
             local num = reward.Reward[j].item[2]
             if reward.Reward[j].type == 2 then
-                if reward.state == 1 or reward.state == 0 then
-                    if not direct[id] then
-                        direct[id] = 0
-                    end
-                    direct[id] = direct[id] + num
-                elseif reward.state == -2 then
+                if not indirect[id] then
+                    indirect[id] = 0
+                end
+                indirect[id] = indirect[id] + num
+
+                if reward.state ~= -1 then
                     if level >= reward.level then
                         if not direct[id] then
                             direct[id] = 0
                         end
                         direct[id] = direct[id] + num
-                    else
-                        if not indirect[id] then
-                            indirect[id] = 0
-                        end
-                        indirect[id] = indirect[id] + num
                     end
                 end
             else
-                if reward.state == 0 then
-                    if not direct[id] then
-                        direct[id] = 0
-                    end
-                    direct[id] = direct[id] + num
-                elseif reward.state == -2 then
+                if reward.state == 0 or reward.state == -2 then
                     if level >= reward.level then
                         if not direct[id] then
                             direct[id] = 0