Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -48,12 +48,7 @@ namespace GFGGame
                         itemDatas = ItemUtil.CreateItemDataList(itemCfg.id, response.Times * shopCfg.itemNum);
                     }
                     
-                    if (itemCfg.itemType == ConstItemType.GIFT_BAG &&
-                        itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT)
-                    {
-                        EventAgent.DispatchEvent(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, shopCfg);
-                    }
-                    
+                    EventAgent.DispatchEvent(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, shopCfg);
                     BonusController.TryShowBonusList(itemDatas);
                     EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
                     return true;

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -67,7 +67,7 @@ namespace GFGGame
             AddEffect();
             _ui.m_t1.Play();
             _ui.m_t2.Play();
-         
+
             UpdateView();
         }
 
@@ -76,14 +76,14 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, UpDayRebateAndView);
             EventAgent.AddEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT, UpdateView);
-            // EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
+            //EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
 
         protected override void RemoveEventListener()
         {
-            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, UpDayRebateAndView);
             EventAgent.RemoveEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT, UpdateView);
-            EventAgent.RemoveEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, UpdateView);
+            base.RemoveEventListener();
         }
 
         private void AddEffect()
@@ -455,23 +455,25 @@ namespace GFGGame
         {
             ShopCfg shopCfg = context.data as ShopCfg;
             var itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+            
             if (itemCfg.itemType == ConstItemType.GIFT_BAG &&
                 itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT)
             {
                 EnduringGiftBoxDataManager.Instance.AddDayAllRebateItemIds(itemCfg.id);
                 EnduringGiftBoxDataManager.Instance.AddDayRebateItemIds(itemCfg.id);
             }
-
+            
             UpdateView();
         }
 
         protected override void OnHide()
         {
+            this.RemoveEventListener();
             Dispose();
             base.Hide();
             _onSuccess = null;
         }
-        
+
         private void OnClickBtnCancel()
         {
             // Dispose();