From 406e6d485ce67acb8667c5e72eb858644d8efdbf Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 09:47:35 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon

---
 System/FairyAu/PlayerRedPacketDatas.cs |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/System/FairyAu/PlayerRedPacketDatas.cs b/System/FairyAu/PlayerRedPacketDatas.cs
index a2d0192..418fa3c 100644
--- a/System/FairyAu/PlayerRedPacketDatas.cs
+++ b/System/FairyAu/PlayerRedPacketDatas.cs
@@ -58,6 +58,8 @@
     private const int Redpoint_key1 = 1070202;
     public  Redpoint redPointStre1 = new Redpoint(10702, Redpoint_key1);
 
+    public int RedEnvelopeID = 0;//鍙戠孩鍖呯殑ID锛堢敤浜庨粯璁ゅ脊鍑哄紑锛�
+
     public override void Init()
     {
         PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;
@@ -71,6 +73,7 @@
     public void OnBeforePlayerDataInitialize()
     {
         UseLimit = 0;
+        RedEnvelopeID = 0;
         IsRedBagGetBool = false;
         RedBagId = 0;
     }
@@ -161,7 +164,11 @@
                     _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].State = (int)info.RedPacketInfo[i].State;
                     _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Wish = (string)info.RedPacketInfo[i].Wish;
                     if (Event_RedEnvelopeToRefresh != null)
+                    {
                         Event_RedEnvelopeToRefresh(_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID]);
+                        RedBagPoppingOpen();
+                    }
+                        
                 }
 
             }
@@ -173,6 +180,22 @@
         RedPacketRedDot();
     }
 
+    private void RedBagPoppingOpen()
+    {
+        if (_DicRedBag.ContainsKey(RedEnvelopeID) && WindowCenter.Instance.CheckOpen<RedBagTipsWin>())
+        {
+            var redBag = _DicRedBag[RedEnvelopeID];
+            if (redBag.GetWay != 5 && redBag.GetWay != 0 && redBag.PlayerID == PlayerDatas.Instance.PlayerId && redBag.State == 1)
+            {
+                RedBagId = RedEnvelopeID;
+                WindowCenter.Instance.Open<RedOPenBGMWin>();//鎵撳紑棰嗗彇鐣岄潰
+            }
+        }
+
+
+    }
+
+
     public void IsRedBagGet()
     {
         IsRedBagGetBool = false;

--
Gitblit v1.8.0