From 731715ed354ea8f162f7c4f9755415da078148e5 Mon Sep 17 00:00:00 2001
From: zhangqiang <657634622@qq.com>
Date: Fri, 23 Jul 2021 13:43:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=BC=95?=
 =?UTF-8?q?=E5=AF=BC=E3=80=91=E5=B9=B8=E8=BF=90=E6=8E=A2=E5=AE=9D=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B8=8D=E4=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=87=E6=8D=A2=E5=88=B0=E5=B9=B8=E8=BF=90=E6=8E=A2?=
 =?UTF-8?q?=E5=AE=9D=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua
index 73e83e0112..b2a9793395 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua
@@ -154,7 +154,7 @@ function this.ExecuteBehavior(beType, beArgs)
             this.button:GetComponent("Button").onClick:RemoveAllListeners()
             Util.AddClick(this.button, this.NextGuide)
         end)
-        if UIManager.IsOpen(UIName.MainPanel) and string.find(btn.transform.parent.name, "layer") ~= nil then --主界面的ui按钮位置可能会超框，所以做位移处理
+        if UIManager.IsOpen(UIName.MainPanel) and (string.find(btn.transform.parent.name, "layer") ~= nil or btn.transform.name == "btnXingYunTanBao") then --主界面的ui按钮位置可能会超框，所以做位移处理
             for k, v in pairs(MainPanel.operateIcon) do
                 if v.go == btn.gameObject then
                     MainPanel:SetPosFunc(Vector2.New(v.pos, 0))

From 4af32b0a852c58a40baaeaefb8700ac6cbe1c03e Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Fri, 23 Jul 2021 13:45:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B6=85=E5=80=BC=E5=9F=BA=E9=87=91?=
 =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
index 5c2c17c0e0..15c18a3af4 100644
--- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
@@ -1375,6 +1375,9 @@ function this.CheckRedpointUpperMonthCard(red)
     if not actInfo then
         return false
     end
+    if actInfo.value == 2 then
+        return false
+    end
     for i = 1,#actInfo.mission do
         if actInfo.mission[i].state == 0 and actInfo.mission[i].progress == 1 then
             return true

From 92738c45a778b06329d200ffa82a786bc89c8f8f Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Fri, 23 Jul 2021 13:48:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B6=85=E5=80=BC=E5=9F=BA=E9=87=91?=
 =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
index 15c18a3af4..442ce80b4f 100644
--- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
@@ -1375,7 +1375,7 @@ function this.CheckRedpointUpperMonthCard(red)
     if not actInfo then
         return false
     end
-    if actInfo.value == 2 then
+    if actInfo.value ~= 1 then
         return false
     end
     for i = 1,#actInfo.mission do