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

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

@@ -34,10 +34,17 @@ namespace GFGGame
         }
 
         //添加活动数据
-        public void AddActivityInfo(ActivityInfo activityInfo)
+        public void AddActivityInfo(ActivityInfoProto activityInfoProto)
         {
-            if (activityInfo == null) return;
-            if (activityInfos.ContainsKey(activityInfo.ActivityId)) return;
+            if (activityInfoProto == null) return;
+            if (activityInfos.ContainsKey(activityInfoProto.ActivityId)) return;
+            ActivityInfo activityInfo = new ActivityInfo();
+            activityInfo.ActivityId = activityInfoProto.ActivityId;
+            activityInfo.StartTime = activityInfoProto.StartTime;
+            activityInfo.EndTime = activityInfoProto.EndTime;
+            activityInfo.GetRewards = activityInfoProto.GetRewards;
+            activityInfo.CountValue = activityInfoProto.CountValue;
+            activityInfo.Type = activityInfoProto.Type;
             activityInfos.Add(activityInfo.ActivityId, activityInfo);
 
             if (!activityInfosByType.ContainsKey(activityInfo.Type))
@@ -45,6 +52,7 @@ namespace GFGGame
                 activityInfosByType.Add(activityInfo.Type, new List<int>());
             }
             activityInfosByType[activityInfo.Type].Add(activityInfo.ActivityId);
+            LogHelper.LogEditor($"AddActivityInfo {activityInfo.Type}");
             //ACTIVITY_ADD
             EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD, activityInfo.ActivityId);
             var remainTime = activityInfo.EndTime - TimeHelper.ServerNow();

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

@@ -8,14 +8,8 @@ namespace ET
     {
         protected override async ETTask Run(Session session, S2C_NoticeActivityOpen message)
         {
-            ActivityInfo info = new ActivityInfo
-            {
-                ActivityId = message.ActivityId,
-                StartTime = message.StartTime,
-                EndTime = message.EndTime
-            };
-
-            ActivityGlobalDataManager.Instance.AddActivityInfo(info);
+            
+            ActivityGlobalDataManager.Instance.AddActivityInfo(message.ActivityInfo);
 
             await ETTask.CompletedTask;
         }
@@ -57,20 +51,9 @@ namespace GFGGame
                 Log.Error("GetActivityInfo error");
                 return;
             }
-            response.ActivityList.ForEach(activityInfo =>
+            response.ActivityList.ForEach(activityProto =>
             {
-                ActivityInfo info = new ActivityInfo
-                {
-                    ActivityId = activityInfo.ActivityId,
-                    StartTime = activityInfo.StartTime,
-                    EndTime = activityInfo.EndTime,
-                    GetRewards = activityInfo.GetRewards,
-                    CountValue = activityInfo.CountValue,
-                    Type = activityInfo.Type
-                };
-
-
-                ActivityGlobalDataManager.Instance.AddActivityInfo(info);
+                ActivityGlobalDataManager.Instance.AddActivityInfo(activityProto);
             });
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -238,13 +238,14 @@ namespace GFGGame
             }
             else
             {
-                OnRedDotChanged();
+                OnFaterDataInited();
             }
         }
 
         private void OnFaterDataInited()
         {
             GetAdIds();
+            OnRedDotChanged();
             CheckAutoShowViews();
         }
 
@@ -1068,7 +1069,6 @@ namespace GFGGame
                 return;
             }
             AutoShowCompleted = true;
-            OnRedDotChanged();
         }
 
     }