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

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

@@ -33,17 +33,8 @@ namespace GFGGame
         /// <returns></returns>
         public int GetBoxStateById(int boxId)
         {
-            //已领取
-            if (_livenessBoxInfos.ContainsKey(boxId) && _livenessBoxInfos[boxId] == ConstBonusStatus.GOT) return 2;
-            //获取宝箱配置
-            var cfg = TaskActiveRewardCfgArray.Instance.GetCfg(boxId);
-            if (cfg == null)
-            {
-                Log.Error($"出现了没有配置的宝箱id{boxId}");
-                return ConstBonusStatus.CAN_NOT_GET;
-            }
-            //判断是否满足领取条件
-            return RoleDataManager.DailyLiveness >= cfg.count ? ConstBonusStatus.CAN_GET : ConstBonusStatus.CAN_NOT_GET;
+            _livenessBoxInfos.TryGetValue(boxId, out var state);
+            return state;
         }
 
         /// <summary>

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

@@ -12,7 +12,7 @@ namespace ET
                 DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(message.kLivenessBox[i], message.vLivenessBox[i]);
             }
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
-
+            EventAgent.DispatchEvent(ConstMessage.LIVENESS_CHANGE);
             await ETTask.CompletedTask;
         }
     }
@@ -40,7 +40,8 @@ namespace GFGGame
             response = (M2C_GetLivenessBox)await MessageHelper.SendToServer(new C2M_GetLivenessBox() { Id = boxId });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             // BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
-            DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(response.Id, response.Status);
+            DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(response.Id, response.Status); 
+            EventAgent.DispatchEvent(ConstMessage.LIVENESS_CHANGE);
             var bonus = TaskActiveRewardCfgArray.Instance.GetCfg(response.Id).rewardsArr;
             BonusController.TryShowBonusList(bonus);
             return true;

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

@@ -18,7 +18,6 @@ namespace GFGGame
         {
             if (_ui != null)
             {
-                _ui.Dispose();
                 _ui = null;
             }
         }