Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -131,5 +131,13 @@ namespace GFGGame
         public const string ACTIVITY_ADD = "ACTIVITY_ADD";
         // ACTIVITY_REWARD_ADD
         public const string ACTIVITY_REWARD_ADD = "ACTIVITY_REWARD_ADD";
+        
+        //通知开启通行证
+        public const string NOTICE_PASSPORT_OPEN = "NOTICE_PASSPORT_OPEN";
+        //通知通行证等级变化
+        public const string NOTICE_PASSPORT_LEVEL_CHANGE = "NOTICE_PASSPORT_LEVEL_CHANGE";
+        //通知通行证赛季变更
+        public const string NOTICE_PASSPORT_SEASON_CHANGE = "NOTICE_PASSPORT_SEASON_CHANGE";
+        
     }
 }

GameClient/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs

@@ -44,7 +44,6 @@ namespace GFGGame
             activityInfosByType[activityOpenCfg.type].Add(activityInfo.activityId);
             //ACTIVITY_ADD
             EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD, activityInfo.activityId);
-            //TODO 判断下时间非法情况
             var remainTime = activityInfo.endTime - TimeHelper.ServerNow();
             if (remainTime > 0)
             {

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

@@ -14,7 +14,7 @@ namespace ET
                 return;
             }
             battlePassTaskDataManager.SetIsBuy(message.IsBuy);
-            //TODO 通知UI
+            EventAgent.DispatchEvent(ConstMessage.NOTICE_PASSPORT_OPEN);
             await ETTask.CompletedTask;
         }
     }
@@ -32,7 +32,7 @@ namespace ET
             {
                 battlePassTaskDataManager.AddSuperReward(superLevel);
             }
-            //TODO 通知UI
+            EventAgent.DispatchEvent(ConstMessage.NOTICE_PASSPORT_LEVEL_CHANGE);
             await ETTask.CompletedTask;
         }
     }
@@ -44,7 +44,7 @@ namespace ET
         {
             var battlePassTaskDataManager = BattlePassTaskDataManager.Instance;
             battlePassTaskDataManager.SetSeasonId(message.SeasonId);
-            //TODO 通知UI
+            EventAgent.DispatchEvent(ConstMessage.NOTICE_PASSPORT_SEASON_CHANGE);
             await ETTask.CompletedTask;
         }
     }

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -71,6 +71,7 @@ namespace GFGGame
             base.AddEventListener();
             //监听通行证等级变化
             EventAgent.AddEventListener(ConstMessage.BATTLEPASS_LEVEL_CHANGE, SetBattlePassLevel);
+            EventAgent.AddEventListener(ConstMessage.NOTICE_PASSPORT_OPEN, SetOpenBattlePassBtnStatus);
         }
 
         protected override void RemoveEventListener()

GameClient/Assets/Game/HotUpdate/Views/Task/BuyBattlePassLevelView.cs

@@ -94,7 +94,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("货币不够!");
                 return;
             }
-            await BattlePassTaskSProxy.BuyBattlePassLevel(addLevel);
+            var isBuy = await BattlePassTaskSProxy.BuyBattlePassLevel(addLevel);
+            if (isBuy)
+            {
+                Hide();
+            }
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Task/OpenBattlePassView.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using FairyGUI;
-using UI.CommonGame;
 using UI.Task;
+using static GFGGame.ShopSProxy;
 
 namespace GFGGame
 {
@@ -35,7 +35,7 @@ namespace GFGGame
 
         private void OnBtnOpenClick(EventContext context)
         {
-            //TODO:打开购买界面
+            ReqShopBuy(990003).Coroutine();
         }
 
 
@@ -44,15 +44,30 @@ namespace GFGGame
             base.OnShown();
             SetPrizeData();
         }
+
+        protected override void AddEventListener()
+        {
+            EventAgent.AddEventListener(ConstMessage.NOTICE_PASSPORT_OPEN, OnNoticePassportOpen);
+        }
         
-        
+        protected override void RemoveEventListener()
+        {
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_PASSPORT_OPEN, OnNoticePassportOpen);
+        }
+
+        private void OnNoticePassportOpen()
+        {
+            Hide();
+        }
+
 
         private static void SpecialRewardRender(int index, GObject obj)
         {
             var itemInfos = (List<KeyValuePair<int, int>>)obj.parent.data;
             var itemInfo = itemInfos[index];
-            ItemUtil.CreateItemView(new[]{itemInfo.Key,itemInfo.Value}, obj as GComponent);
+            ItemUtil.CreateItemView(new[] { itemInfo.Key, itemInfo.Value }, obj as GComponent);
         }
+
         private void SetPrizeData()
         {
             //获取所有特别奖励数据