活动：成长基金-镇念塔、精英主线基金

game-server/app/services/growthFundService.ts

@@ -58,11 +58,25 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
             break;
         }
         case ACTIVITY_TYPE.GROWTH_FUND_TOWER: {//镇念塔
-
+            let { towerLv } = await RoleModel.findByRoleId(roleId);
+            for (let item of playerData.list) {
+                if (item.taskType == TASK_TYPE.BATTLE_TOWER_LV) {
+                    if (towerLv < item.taskParamArray[0]) {
+                        item.isComplete = true;
+                    }
+                }
+            }
             break;
         }
         case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE: {//精英
-
+            let { mainEliteWarId } = await RoleModel.findByRoleId(roleId);
+            for (let item of playerData.list) {
+                if (item.taskType == TASK_TYPE.BATTLE_MAIN_ELITE) {
+                    if (mainEliteWarId <= item.taskParamArray[0]) {
+                        item.isComplete = true;
+                    }
+                }
+            }
             break;
         }
         default:

shared/consts/constModules/sysConst.ts

@@ -648,6 +648,7 @@ export enum TASK_TYPE {
     GUILD_TRAIN = 70,                 // 挑战练兵场
     GUILD_ACTIVITY = 71,              // 军团活动
     GUILD_JOIN = 72,                   // 加入军团
+    BATTLE_MAIN_ELITE = 73,            // 精英通关
 }
 
 // 卡池类型

shared/db/Role.ts

@@ -535,8 +535,8 @@ export default class Role extends BaseModel {
         return result;
     }
 
-    public static async updateMainEliteWarId(roleId: string, mailEliteWarId: number, mainEliteUpdatedAt: number, getters = false, virtuals = true) {
+    public static async updateMainEliteWarId(roleId: string, mainEliteWarId: number, mainEliteUpdatedAt: number, getters = false, virtuals = true) {
-        let result: RoleType = await RoleModel.findOneAndUpdate({roleId, mailEliteWarId: { $lt: mailEliteWarId }}, {$set:{mailEliteWarId, mainEliteUpdatedAt}}, {new: true}).lean({ getters, virtuals });
+        let result: RoleType = await RoleModel.findOneAndUpdate({ roleId, mainEliteWarId: { $lt: mainEliteWarId } }, { $set: { mainEliteWarId, mainEliteUpdatedAt } }, { new: true }).lean({ getters, virtuals });
         return result;
     }
 

shared/resource/jsons/dic_zyz_taskType.json

@@ -1078,5 +1078,20 @@
         "__EMPTY_3": 0,
         "__EMPTY_4": 0,
         "__EMPTY_5": 0
+    },
+    {
+        "id": 73,
+        "name": "精英任务",
+        "info": "精英通关第x关",
+        "param": "warid",
+        "string": "关卡id",
+        "content": 0,
+        "condition": "warid",
+        "__EMPTY": 0,
+        "__EMPTY_1": 0,
+        "__EMPTY_2": 0,
+        "__EMPTY_3": 0,
+        "__EMPTY_4": 0,
+        "__EMPTY_5": 0
     }
 ]