将两种任务初步合起来

game-server/app/servers/role/handler/friendHandler.ts

@@ -21,7 +21,7 @@ import { FRIEND } from "../../../pubUtils/dicParam";
 import { PlayerDetail, PlayerDetailHero } from "../../../domain/battleField/guild";
 import { createPrivateMsg, pushMsgToRole, pushPresent } from "../../../services/chatService";
 import { Rank } from "../../../services/rankService";
-import { checkTaskWithRoles, checkTask, checkActivityTask } from "../../../services/taskService";
+import { checkTaskWithRoles, checkTask, checkActivityTask } from "../../../services/task/taskService";
 import { ComBattleTeamModel } from "../../../db/ComBattleTeam";
 import { JewelModel } from "../../../db/Jewel";
 

game-server/app/servers/role/handler/heroHandler.ts

@@ -13,7 +13,7 @@ import { getDropItems, FIGURE_UNLOCK_CONDITION } from '../../../consts/constModu
 import { pushComposeOrangeHero, pushHeroQualityUpMsg, pushHeroStarMax, pushHeroWakeUp } from '../../../services/chatService';
 import { calculatetopLineup } from '../../../pubUtils/playerCe';
 import { PvpDefenseModel } from '../../../db/PvpDefense';
-import { checkTaskWithHero, checkTask, checkActivityTask } from '../../../services/taskService';
+import { checkTaskWithHero, checkTask, checkActivityTask } from '../../../services/task/taskService';
 import { isNumber, pick } from 'underscore';
 import { updateEplaces } from '../../../services/equipService';
 import { addConsumeToHero } from '../../../services/roleService';

game-server/app/servers/role/handler/roleHandler.ts

@@ -16,7 +16,7 @@ import { HERO_SYSTEM_TYPE, LINEUP_NUM, ROLE_SELECT, REDIS_KEY, TASK_TYPE, DEFAUL
 import { checkBattleHeroesByHid, roleLevelup } from '../../../services/normalBattleService';
 import { Rank } from '../../../services/rankService';
 import { updateUserInfo } from '../../../services/redisService';
-import { checkTaskWithHero, checkTask, checkTaskWithArgs, checkActivityTask } from '../../../services/taskService';
+import { checkTaskWithHero, checkTask, checkTaskWithArgs, checkActivityTask } from '../../../services/task/taskService';
 import { getGoldObject, getCoinObject } from '../../../pubUtils/itemUtils';
 import { RScriptRecordModel } from '../../../db/RScriptRecord';
 import { SkinModel, SkinUpdate } from '../../../db/Skin';

game-server/app/servers/role/handler/taskHandler.ts

@@ -1,13 +1,13 @@
 import { Application, BackendSession, pinus, HandlerService, } from "pinus";
 import { resResult, parseGoodStr, getRandSingleEelm } from "../../../pubUtils/util";
-import { STATUS, TASK_FUN_TYPE, SHOP_REFRESH_TYPE, KING_EXP_RATIO_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, ACTIVITY_TYPE } from "../../../consts";
+import { STATUS, TASK_FUN_TYPE, SHOP_REFRESH_TYPE, KING_EXP_RATIO_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, ACTIVITY_TYPE, TASK_TYPE } from "../../../consts";
 import { gameData } from "../../../pubUtils/data";
 import { UserTaskRecModel } from "../../../db/UserTaskRec";
 import { addItems } from "../../../services/role/rewardService";
 import { UserTaskModel } from "../../../db/UserTask";
 import { nowSeconds, getZeroPointD } from "../../../pubUtils/timeUtil";
 import { DicDailyTask, DicAchievement, DicMainTask } from "../../../pubUtils/dictionary/DicTask";
-import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask, getPvpTask } from "../../../services/taskService";
+import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask, getPvpTask } from "../../../services/task/taskService";
 import { TASK } from "../../../pubUtils/dicParam";
 import { ActivityTaskPointModel, ActivityTaskPointModelType } from "../../../db/ActivityTaskPoint";
 import { ItemInter, RewardInter } from "../../../pubUtils/interface";
@@ -15,6 +15,8 @@ import { RoleModel } from "../../../db/Role";
 import { roleLevelup } from "../../../services/normalBattleService";
 import _ = require("underscore");
 import { addActvityTaskPoint } from "../../../services/activity/activityService";
+import { CheckTask } from "../../../services/task/taskObj";
+import { ServerlistModel } from "../../../db/Serverlist";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -323,4 +325,16 @@ export class ShopHandler {
         console.log('******', _.isEqual([1,2], [1,2,2]))
         return resResult(STATUS.SUCCESS, { tasks: [...gameData.taskType]});
     }
+
+    async test(msg: { magicWord: string }, session: BackendSession) {
+        let roleId = session.get('roleId');
+        let serverId = session.get('serverId');
+        let sid = session.get('sid');
+        let role = await RoleModel.findByRoleId(roleId);
+        let server = await ServerlistModel.findByServerId(serverId);
+        let task = new CheckTask(serverId, roleId, TASK_TYPE.LOGIN_SUM, role.createTime, server.openTime);
+        task.param.setRole(role);
+        task.check(1, sid);
+        return resResult(STATUS.SUCCESS)
+    }
 }