任务

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -573,7 +573,7 @@ namespace GFGEditor
         private static string CheckDailyTaskApproach(int itemId)
         {
             TaskActiveRewardCfgArray manager = TaskActiveRewardCfgArray.Instance;
-            List<TaskActiveRewardCfg> dataArray = manager.GetCfgsByfuncType(TaskType.Daily);
+            List<TaskActiveRewardCfg> dataArray = manager.GetCfgsByfuncType(TaskFuncType.Daily);
             for (int i = 0; i < dataArray.Count; i++)
             {
                 for (int j = 0; j < dataArray[i].rewardsArr.Length; j++)

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

@@ -52,7 +52,7 @@ namespace GFGGame
         /// <returns></returns>
         public int GetShowLivenessBoxNum()
         {
-            var cfgs = TaskActiveRewardCfgArray.Instance.GetCfgsByfuncType(TaskType.Daily);
+            var cfgs = TaskActiveRewardCfgArray.Instance.GetCfgsByfuncType(TaskFuncType.Daily);
             foreach (var t in cfgs)
             {
                 if (!_livenessBoxInfos.ContainsKey(t.id) || _livenessBoxInfos[t.id] != ConstBonusStatus.GOT)

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

@@ -35,11 +35,11 @@ namespace GFGGame
             {
                 return true;
             }
-            if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily))
+            if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.Daily))
             {
                 return true;
             }
-            if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass))
+            if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.BattlePass))
             {
                 return true;
             }
@@ -644,7 +644,7 @@ namespace GFGGame
         public bool GetActLuckyBoxTaskdRed()
         {
             if (ActivityDataManager.Instance.actLuckyBoxId <= 0) return false;
-            List<TaskCfg> _bonueCfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.LuckyBoxActivity);
+            List<TaskCfg> _bonueCfgs = TaskDataManager.Instance.GetTaskCfgs(TaskFuncType.LuckyBoxActivity);
             for (int i = 0; i < _bonueCfgs.Count; i++)
             {
                 int state = TaskDataManager.Instance.GetTaskStateById(_bonueCfgs[i].id);

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

@@ -111,7 +111,7 @@ namespace GFGGame
         {
             get
             {
-                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Liveness);
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.DailyLiveness);
             }
         }
         /// <summary>

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

@@ -190,7 +190,7 @@ namespace GFGGame
             var taskInfos = TaskDataManager.Instance.GetTaskInfos(taskType);
             if (taskInfos.Select(taskInfo => taskInfo.Value).Any(info => info.State == ConstBonusStatus.CAN_GET))
             {
-                if (taskType == TaskType.BattlePass && !BattlePassTaskDataManager.Instance.GetIsBuy())
+                if (taskType == TaskFuncType.BattlePass && !BattlePassTaskDataManager.Instance.GetIsBuy())
                 {
                     return false;
                 }

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

@@ -20,7 +20,7 @@ namespace ET
                 case NumericType.Power:
                     RoleDataManager.powerTimeServerLock = false;
                     break;
-                case NumericType.Liveness:
+                case NumericType.DailyLiveness:
                     EventAgent.DispatchEvent(ConstMessage.LIVENESS_CHANGE);
                     break;
                 case NumericType.PassLevel:

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

@@ -62,7 +62,7 @@ namespace GFGGame
         public static void GetTaskInfos()
         {
             TaskDataManager.Instance.Clear();
-            for (var i = TaskType.Daily; i < TaskType.TaskMax; i++) GetTaskInfos(i).Coroutine();
+            for (var i = TaskFuncType.Daily; i < TaskFuncType.LessThan; i++) GetTaskInfos(i).Coroutine();
         }
 
         //C2M_GetTaskInfos

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -82,7 +82,7 @@ namespace GFGGame
         {
             var taskIds = (List<int>)context.data;
             foreach (var _ in taskIds.Select(taskId => TaskCfgArray.Instance.GetCfg(taskId))
-                         .Where(taskCfg => taskCfg is { funcType: TaskType.Day7 }))
+                         .Where(taskCfg => taskCfg is { funcType: TaskFuncType.Day7 }))
             {
                 TaskChange();
             }
@@ -92,7 +92,7 @@ namespace GFGGame
         {
             var taskId = (int)context.data;
             var taskCfg = TaskCfgArray.Instance.GetCfg(taskId);
-            if (!(taskCfg is { funcType: TaskType.Day7 })) return;
+            if (!(taskCfg is { funcType: TaskFuncType.Day7 })) return;
             TaskChange();
         }
 

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -59,9 +59,7 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _taskCfgs =
-                TaskDataManager.Instance.GetTaskCfgs(TaskType
-                    .LuckyBoxActivity); //TaskCfgArray.Instance.GetCfgsBytaskType(TaskType.LuckyBoxActivity);
+            _taskCfgs = TaskDataManager.Instance.GetTaskCfgs(TaskFuncType.LuckyBoxActivity); 
             _ui.m_list.numItems = _taskCfgs.Count;
         }
 

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

@@ -11,7 +11,7 @@ namespace GFGGame
     {
         private UI_CombTaskUI _ui;
         private List<TaskCfg> _cfgs;
-        private int funcType = TaskType.Daily;
+        private int funcType = TaskFuncType.Daily;
 
         public override void Dispose()
         {
@@ -97,10 +97,10 @@ namespace GFGGame
             {
                 0 =>
                     //每日任务
-                    TaskType.Daily,
+                    TaskFuncType.Daily,
                 1 =>
                     //织造任务
-                    TaskType.BattlePass,
+                    TaskFuncType.BattlePass,
                 _ => funcType
             };
             //更新任务列表
@@ -114,7 +114,7 @@ namespace GFGGame
             DailyTaskDataManager.Instance.GetShowLivenessBoxNum();
             _ui.m_LivenessProcess.target.max = 100;
             _ui.m_LivenessProcess.target.value = liveness;
-            var cfgs = TaskActiveRewardCfgArray.Instance.GetCfgsByfuncType(TaskType.Daily);
+            var cfgs = TaskActiveRewardCfgArray.Instance.GetCfgsByfuncType(TaskFuncType.Daily);
             for (var i = 0; i < cfgs.Count; i++)
             {
                 var boxId = i + 1;
@@ -184,7 +184,7 @@ namespace GFGGame
             item.m_listTaskReward.data = reward;
             item.m_listTaskReward.numItems = reward.Length;
             var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
-            bool canGet = item.m_c1.selectedIndex == 1 && (funcType != TaskType.BattlePass || funcType == TaskType.BattlePass && isBuy);
+            bool canGet = item.m_c1.selectedIndex == 1 && (funcType != TaskFuncType.BattlePass || funcType == TaskFuncType.BattlePass && isBuy);
             RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, canGet);
             UI_TaskListItem.ProxyEnd();
         }
@@ -204,7 +204,7 @@ namespace GFGGame
         private async void OnBtnGetClick(EventContext context)
         {
             if (!(context.sender is GObject btnGet)) return;
-            if (funcType == TaskType.BattlePass)
+            if (funcType == TaskFuncType.BattlePass)
             {
                 //检查通行证是否开启
                 var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
@@ -238,7 +238,7 @@ namespace GFGGame
         private async void OnBtnGetAllClick()
         {
             //通用任务一键领奖
-            if (funcType == TaskType.BattlePass)
+            if (funcType == TaskFuncType.BattlePass)
             {
                 //检查通行证是否开启
                 var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();

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

@@ -93,8 +93,8 @@ namespace GFGGame
 
         private void UpdateRedPoint()
         {
-            bool showRedPoint = TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily)
-                || TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass)
+            bool showRedPoint = TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.Daily)
+                || TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.BattlePass)
                 || DailyTaskDataManager.Instance.GetHadGetRewardNum();
             RedDotController.Instance.SetComRedDot(_ui.m_btnTask, showRedPoint);
             showRedPoint = BattlePassTaskDataManager.Instance.GetHadCanGetReward();