任务：军团活动任务改为进入战场就算完成

game-server/app/servers/guild/handler/cityActivityHandler.ts

@@ -189,6 +189,11 @@ export class CityActivityHandler {
         const dbCities = await GuildActivityCityModel.getAllCities(serverId);
         let cityStatus = pubGetCityStatus(guildCode, cityId, dicCity, dbCities);
 
+        // 任务
+        await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
+        //成长任务
+        await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
+
         // 前一天中位数战力
         let medianCe = await getMedianCe(serverId);
 
@@ -323,11 +328,6 @@ export class CityActivityHandler {
         let guildScore = await r.getMyScore({ guildCode });
         let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
 
-        // 任务
-        await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
-        //成长任务
-        await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
-
         return resResult(STATUS.SUCCESS, {
             isSuccess,
             code,

game-server/app/servers/guild/handler/gateActivityHandler.ts

@@ -70,6 +70,7 @@ export class GateActivityHandler {
         const roleName = session.get('roleName');
         const serverId = session.get('serverId');
         const guildCode = session.get('guildCode');
+        const sid = session.get('sid');
         if (!guildCode) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
         let obj = getGateActivityObj();
 
@@ -102,6 +103,11 @@ export class GateActivityHandler {
         // 前一天中位数战力
         let medianCe = await getMedianCe(serverId);
 
+        // 任务
+        await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
+        //成长任务
+        await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
+
         return resResult(STATUS.SUCCESS, {
             code,
             ...statusResult,
@@ -254,10 +260,6 @@ export class GateActivityHandler {
             isSuccess
         }
 
-        // 任务
-        await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
-        //成长任务
-        await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
         return resResult(STATUS.SUCCESS, {
             code,
             ...statusResult,

game-server/app/servers/guild/handler/raceActivityHandler.ts

@@ -91,6 +91,12 @@ export class RaceActivityHandler {
         let chatSid = await getGuildChannelSid(guildCode);
         this.app.rpc.chat.guildRemote.pushRaceHorseJoin.toServer(chatSid, guildCode, woodenHorse);
 
+        // 任务
+        await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
+        //成长任务
+        await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
+
+
         return resResult(STATUS.SUCCESS, {
             code: myGuildActivityRec.code,
             ...statusResult,

game-server/app/services/guildActivityService.ts

@@ -723,10 +723,6 @@ export async function raceActivitySettleReward(guildCode: string, woodenHorse: W
             let onlineUser = await getRoleOnlineInfo(roleId);
             // 发放活跃
             await addActive(roleId, serverId, GUILD_POINT_WAYS.ACTIVITY);  //获得活跃值
-            // 任务
-            await checkTask(roleId, onlineUser.sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: GUILD_ACTIVITY_TYPE.RACE_ACTIVITY });
-            //成长任务
-            await checkActivityTask(serverId, onlineUser.sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: GUILD_ACTIVITY_TYPE.RACE_ACTIVITY })
         }
     }