Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

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 ~= 1 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

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))