活动：任务接口添加serverId接口

game-server/app/servers/activity/handler/gachaHandler.ts

@@ -255,6 +255,7 @@ export class GachaHandler {
     async setPickHero(msg: { gachaId: number, activityId: number, pickHero: number }, session: BackendSession) {
         const { gachaId, activityId = 0, pickHero } = msg;
         const roleId: string = session.get('roleId');
+        const serverId: number = session.get('serverId');
         if (gachaId != GACHA_ID.ASSIGN && gachaId != GACHA_ID.TIMELIMIT)
             return resResult(STATUS.WRONG_PARMS);
         let dicHero = gameData.hero.get(pickHero);
@@ -262,7 +263,7 @@ export class GachaHandler {
 
         let heroes: number[] = [];
         if (gachaId == GACHA_ID.TIMELIMIT) {
-            let activityData = await ActivityModel.findActivity(activityId, true);
+            let activityData = await ActivityModel.findActivity(serverId, activityId, true);
             if (!activityData) return resResult(STATUS.ACTIVITY_MISSING);
 
             let gachaData = new GachaData(activityData);

game-server/app/servers/activity/handler/popUpShopHandler.ts

@@ -51,7 +51,7 @@ export class PopUpShopHandler {
         const roleName = session.get('roleName');
         const funcs: number[] = session.get('funcs');
 
-        let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
         if (!activityData) {
             return resResult(STATUS.ACTIVITY_MISSING);
         }

game-server/app/servers/activity/handler/selfServiceShopHandler.ts

@@ -50,7 +50,7 @@ export class SelfServiceShopHandler {
         const roleName = session.get('roleName');
         const funcs: number[] = session.get('funcs');
 
-        let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
         let playerData = new SelfServiceShopData(activityData);
         let item = playerData.getItem(index);
 

game-server/app/servers/activity/handler/thirtyDaysHandler.ts

@@ -55,7 +55,7 @@ export class ThirtyDaysHandler {
 
         let todayIndex = await playerThirtyDaysActivityDays(roleId);//玩家当前的天数
 
-        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.THIRTY_DAYS, true)
+        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, true)
         activityArray = activityArray.sort((a, b) => {
             return a.activityId - b.activityId
         });

game-server/app/servers/battle/handler/expeditionBattleHandler.ts

@@ -211,6 +211,7 @@ export class ExpeditionBattleHandler {
         const { expeditionCode, battleCode, battleId, expeditionId, isSuccess, heroes = [], star, enemies } = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
+        const serverId = session.get('serverId');
         let sid = session.get('sid');
         let funcs: number[] = session.get('funcs');
 
@@ -267,7 +268,7 @@ export class ExpeditionBattleHandler {
             // 更新下一关状态
             await ExpeditionWarRecordModel.updateStatus(expeditionCode, expeditionId + 1, EXPEDITION_WAR_RECORD_STATUS.WAITING);
         }
-        await checkTaskInBattleEnd(roleId, sid, funcs, battleId, dbHeroes, star);
+        await checkTaskInBattleEnd(serverId, roleId, sid, funcs, battleId, dbHeroes, star);
 
         return resResult(STATUS.SUCCESS, {
             expeditionCode, expeditionId,

game-server/app/servers/battle/handler/guildTrainHandler.ts

@@ -271,7 +271,7 @@ export class GuildTrainHandler {
         }
         await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_TRAIN, 1, true, {});
         //成长任务
-        await accomplishTask(roleId, TASK_TYPE.GUILD_TRAIN, 1)
+        await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_TRAIN, 1)
 
         return resResult(STATUS.SUCCESS, result);
     }

game-server/app/servers/battle/handler/normalBattleHandler.ts

@@ -265,7 +265,7 @@ export class NormalBattleHandler {
 
         let actordata = await roleLevelup(roleId, isSuccess ? warInfo.kingExp : 0, session);// 主公升级经验
 
-        await checkTaskInBattleEnd(roleId, sid, funcs, battleId, dbHeroes, star);
+        await checkTaskInBattleEnd(serverId, roleId, sid, funcs, battleId, dbHeroes, star);
         // 返回值：
         // towerStatus: false-本层未通过, true-本层已通过
         return resResult(STATUS.SUCCESS, {

game-server/app/servers/connector/handler/entryHandler.ts

@@ -112,8 +112,8 @@ export class EntryHandler {
         r2.setRankWithRoleInfo(role.roleId, role.lv, role.updatedAt.getTime(), role);
 
         // 任务
-        checkTaskWithRole(role.roleId, self.app.get('serverId'), role.funcs, TASK_TYPE.LOGIN_SUM, role);
+        checkTaskWithRole(serverId, role.roleId, self.app.get('serverId'), role.funcs, TASK_TYPE.LOGIN_SUM, role);
-        checkTaskWithRole(role.roleId, self.app.get('serverId'), role.funcs, TASK_TYPE.LOGIN_SERIES, role);
+        checkTaskWithRole(serverId, role.roleId, self.app.get('serverId'), role.funcs, TASK_TYPE.LOGIN_SERIES, role);
 
         role['heros'] = heros;
         role['equips'] = equips;

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

@@ -295,7 +295,7 @@ export class CityActivityHandler {
         // 任务
         await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
         //成长任务
-        await accomplishTask(roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
+        await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
 
         return resResult(STATUS.SUCCESS, {
             isSuccess,

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

@@ -259,7 +259,7 @@ export class GateActivityHandler {
         // 任务
         await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
         //成长任务
-        await accomplishTask(roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
+        await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
         return resResult(STATUS.SUCCESS, {
             code,
             ...statusResult,

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

@@ -179,7 +179,7 @@ export class RaceActivityHandler {
         // 任务
         await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
         //成长任务
-        await accomplishTask(roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
+        await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
         return resResult(STATUS.SUCCESS, {
             timestamp: Date.now(),
             woodenHorse: guildActivityRec.woodenHorse,

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

@@ -92,6 +92,7 @@ export class EquipHandler {
     public async strengthen(msg: { hid: number, ePlaceId: number, type: number }, session: BackendSession) {
         let roleId: string = session.get('roleId');
         // let roleName: string = session.get('roleName');
+        const serverId = session.get('serverId');
         let sid: string = session.get('sid');
         let funcs: number[] = session.get('funcs');
 
@@ -167,7 +168,7 @@ export class EquipHandler {
         // 任务
         await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_STRENGTHEN, hero, oldLvs);
         //成长任务
-        await accomplishTask(roleId, TASK_TYPE.EQUIP_STRENGTHEN, 1, changeData)
+        await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_STRENGTHEN, 1, changeData)
 
         const curHero = {
             hid,
@@ -183,6 +184,7 @@ export class EquipHandler {
         // let roleName: string = session.get('roleName');
         let sid: string = session.get('sid');
         let funcs: number[] = session.get('funcs');
+        const serverId = session.get('serverId');
 
         let changeData = [];//变化的等级数据
         let { hid, lv: maxLv } = msg; // lv: 升到哪一级
@@ -248,7 +250,7 @@ export class EquipHandler {
         // 任务
         await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_STRENGTHEN, hero, oldLvs);
         //成长任务
-        await accomplishTask(roleId, TASK_TYPE.EQUIP_STRENGTHEN, 1, changeData)
+        await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_STRENGTHEN, 1, changeData)
 
         const curHero = {
             hid,
@@ -326,7 +328,7 @@ export class EquipHandler {
             let curEquip = <EquipType>equip;
             pushEquipRefineSucMsg(roleId, roleName, serverId, curEplace, curEquip ? curEquip.quality : 0);
             await checkTask(roleId, sid, funcs, TASK_TYPE.EQUIP_REFINE, 1, true, {});
-            await accomplishTask(roleId, TASK_TYPE.EQUIP_REFINE_LV, 1, { lv: curEplace.refineLv });
+            await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_REFINE_LV, 1, { lv: curEplace.refineLv });
         }
         return resResult(STATUS.SUCCESS, { isSuccess, curHero });
     }
@@ -479,6 +481,7 @@ export class EquipHandler {
     public async putOnOrOff(msg: { eid: number, hid: number, type: number }, session: BackendSession) {
         let { eid, hid, type } = msg;
         let roleId: string = session.get('roleId');
+        const serverId = session.get('serverId');
         let equip = await EquipModel.getEquip(eid);
         let sid: string = session.get('sid');
         let funcs: number[] = session.get('funcs');
@@ -503,10 +506,10 @@ export class EquipHandler {
             if (index < 0)
                 return resResult(STATUS.WRONG_PARMS);
             let equipOffInfo = <EquipType>hero.ePlace[index].equip;
-            let curEquip = await changeEquip(roleId, sid, equipOffInfo, equip.hid, id, equip, funcs);
+            let curEquip = await changeEquip(serverId, roleId, sid, equipOffInfo, equip.hid, id, equip, funcs);
             if (!!curEquip)
                 curEquips.push(curEquip);
-            curEquip = await dressEquip(roleId, sid, hero, equip, funcs);
+            curEquip = await dressEquip(serverId, roleId, sid, hero, equip, funcs);
             if (!!curEquip)
                 curEquips.push(curEquip);
 
@@ -514,7 +517,7 @@ export class EquipHandler {
             //英雄满装备且都镶嵌相同阶数的宝石
             let { isTask, jewelLevel } = await checkTaskConditionEquipSuitJewelStage(hero)
             if (isTask) {
-                await accomplishTask(roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel })
+                await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel })
             }
         } else if (type == 2) {
             if (!equip.hid)
@@ -557,6 +560,7 @@ export class EquipHandler {
     public async fillHole(msg: { eid: number, id: number, jewel: number }, session: BackendSession) {
         let { eid, id, jewel } = msg;
         let roleId: string = session.get('roleId');
+        const serverId = session.get('serverId');
         let sid: string = session.get('sid');
         let funcs: number[] = session.get('funcs');
         let consumes: Array<{ id: number, count: number }> = [];
@@ -593,7 +597,7 @@ export class EquipHandler {
             //英雄满装备且都镶嵌相同阶数的宝石
             let { isTask, jewelLevel } = await checkTaskConditionEquipSuitJewelStage(hero)
             if (isTask) {
-                await accomplishTask(roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel })
+                await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel })
             }
         }
 
@@ -602,8 +606,8 @@ export class EquipHandler {
         await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_STAGE, [jewel, oldJewel]);
         await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_SUM, equip, [oldJewelCount]);
         //成长任务
-        await accomplishTask(roleId, TASK_TYPE.EQUIP_JEWEL_SUM, 1)
+        await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_JEWEL_SUM, 1)
-        await accomplishTask(roleId, TASK_TYPE.EQUIP_JEWEL_STAGE, 1)
+        await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_JEWEL_STAGE, 1)
 
         return resResult(STATUS.SUCCESS, { curEquip: { seqId: eid, holes: equip.holes } });
     }
@@ -773,7 +777,7 @@ export class EquipHandler {
                 //英雄满装备且都镶嵌相同阶数的宝石
                 let { isTask, jewelLevel } = await checkTaskConditionEquipSuitJewelStage(hero)
                 if (isTask) {
-                    await accomplishTask(roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel })
+                    await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel })
                 }
             }
 
@@ -782,7 +786,7 @@ export class EquipHandler {
             await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_STAGE, [jewel, oldJewel]);
             await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_SUM, equip, [oldJewelCount]);
             //成长任务
-            await accomplishTask(roleId, TASK_TYPE.EQUIP_JEWEL_SUM, count)
+            await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_JEWEL_SUM, count)
 
             return resResult(STATUS.SUCCESS, { curEquip: { seqId: eid, holes: equip.holes } });
         } else {

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

@@ -203,6 +203,7 @@ export class FriendHandler {
         let roleId: string = session.get('roleId');
         let sid: string = session.get('sid');
         let funcs: number[] = session.get('funcs');
+        const serverId = session.get('serverId');
 
         let { applyCodeList, isPass } = msg;
 
@@ -265,7 +266,7 @@ export class FriendHandler {
         role = await RoleModel.increaseFriendApplyCnt(roleId, -1 * resultApplyCodeList.length, 50);
         roles.push(role);
         // 任务
-        await checkTaskWithRoles(roleId, sid, funcs, TASK_TYPE.FRIEND_NUM, roles);
+        await checkTaskWithRoles(serverId, roleId, sid, funcs, TASK_TYPE.FRIEND_NUM, roles);
 
         // 特殊处理：如果他点一键同意，有很多人，这个单独的人就不做这个额外的提示，直接把他好友申请删掉就好
         if (str == getResStr(STATUS.FRIEND_HAS_ADD) && resultApplyCodeList.length > 1) str = '';
@@ -373,6 +374,7 @@ export class FriendHandler {
         let roleId: string = session.get('roleId');
         let sid: string = session.get('sid');
         let funcs: number[] = session.get('funcs');
+        const serverId = session.get('serverId');
         let { roleId: hisRoleId, type } = msg;
 
         let role = await RoleModel.findByRoleId(roleId);
@@ -475,7 +477,7 @@ export class FriendHandler {
         let { friendCnt = 0, blockCnt = 0 } = role;
 
         // 任务
-        await checkTaskWithRoles(roleId, sid, funcs, TASK_TYPE.FRIEND_NUM, [role, friend]);
+        await checkTaskWithRoles(serverId, roleId, sid, funcs, TASK_TYPE.FRIEND_NUM, [role, friend]);
 
         return resResult(STATUS.SUCCESS, {
             frdRoleIds, blackRoleIds,

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

@@ -186,6 +186,7 @@ export class HeroHandler {
     // 武将升星
     public async starUp(msg: { hid: number, star: number, starStage: number }, session: BackendSession) {
         let roleId: string = session.get('roleId');
+        const serverId = session.get('serverId');
         let sid: string = session.get('sid');
         let funcs: number[] = session.get('funcs');
 
@@ -226,9 +227,9 @@ export class HeroHandler {
             await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAR_UP, hero);
             await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_QUALITY_STAR_UP, hero);
             //成长任务
-            await accomplishTask(roleId, TASK_TYPE.HERO_QUALITY_STAR_UP, 1, { quality: dicHero.quality, star: hero.star });
+            await accomplishTask(serverId, roleId, TASK_TYPE.HERO_QUALITY_STAR_UP, 1, { quality: dicHero.quality, star: hero.star });
             if (hero.colorStar) {//觉醒升星
-                await accomplishTask(roleId, TASK_TYPE.HERO_WAKE_UP_STAR_UP_COUNT, 1, { quality: dicHero.quality, star: hero.star });
+                await accomplishTask(serverId, roleId, TASK_TYPE.HERO_WAKE_UP_STAR_UP_COUNT, 1, { quality: dicHero.quality, star: hero.star });
             }
         }
 
@@ -247,7 +248,7 @@ export class HeroHandler {
         let roleId: string = session.get('roleId');
         let roleName: string = session.get('roleName');
         let sid: string = session.get('sid');
-        let serverId: string = session.get('serverId');
+        let serverId: number = session.get('serverId');
         let funcs: number[] = session.get('funcs');
 
         let { hid, quality } = msg;
@@ -285,7 +286,7 @@ export class HeroHandler {
         // 任务
         await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_QUALITY_UP, hero);
         // 任务
-        await accomplishTask(roleId, TASK_TYPE.HERO_QUALITY_TO_QUALITY_COUNT, 1, { oldQuality, quality: hero.quality });
+        await accomplishTask(serverId, roleId, TASK_TYPE.HERO_QUALITY_TO_QUALITY_COUNT, 1, { oldQuality, quality: hero.quality });
 
         const curHero = {
             hid,
@@ -301,7 +302,7 @@ export class HeroHandler {
         let roleId: string = session.get('roleId');
         let sid: string = session.get('sid');
         let roleName: string = session.get('roleName');
-        let serverId: string = session.get('serverId');
+        const serverId = session.get('serverId');
         let funcs: number[] = session.get('funcs');
 
         let { hid, colorStar, colorStarStage } = msg;
@@ -348,7 +349,7 @@ export class HeroHandler {
             // 任务
             await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAR_UP, hero);
             await checkTask(roleId, sid, funcs, TASK_TYPE.HERO_WAKE_UP, 1, true, {});
-            await accomplishTask(roleId, TASK_TYPE.HERO_WAKE_UP_COUNT, 1, { quality: hero.quality });
+            await accomplishTask(serverId, roleId, TASK_TYPE.HERO_WAKE_UP_COUNT, 1, { quality: hero.quality });
         }
         const curHero = {
             hid,
@@ -403,6 +404,7 @@ export class HeroHandler {
     async heroJobStageUp(msg: { hid: number }, session: BackendSession) {
         console.log(JSON.stringify([...gameData.jobClassMaxGrades]))
         let roleId: string = session.get('roleId');
+        const serverId = session.get('serverId');
         let sid: string = session.get('sid');
         let funcs: number[] = session.get('funcs');
         let { hid } = msg;
@@ -430,7 +432,7 @@ export class HeroHandler {
         hero = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.STAGEUP, sid, roleId, hero, update);
         // 任务
         await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAGE_UP, hero);
-        await accomplishTask(roleId, TASK_TYPE.HERO_STAGE_UP, 1, { job: hero.job });
+        await accomplishTask(serverId, roleId, TASK_TYPE.HERO_STAGE_UP, 1, { job: hero.job });
 
         return resResult(STATUS.SUCCESS, { curHero: { hid: hero.hid, job: hero.job, jobStage: hero.jobStage } });
     }

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

@@ -79,6 +79,7 @@ export class RoleHandler {
     async roleTitleLevelUp(msg: {}, session: BackendSession) {
         let roleId = session.get('roleId');
         let sid: string = session.get('sid');
+        const serverId = session.get('serverId');
         let funcs: number[] = session.get('funcs');
 
         let role = await RoleModel.findByRoleId(roleId);
@@ -100,7 +101,7 @@ export class RoleHandler {
         // 任务
         await checkTask(roleId, sid, funcs, TASK_TYPE.ROLE_TITLE, 1, false, { title });
         //成长任务
-        await accomplishTask(roleId, TASK_TYPE.ROLE_TITLE, update.title)
+        await accomplishTask(serverId, roleId, TASK_TYPE.ROLE_TITLE, update.title)
 
         return resResult(STATUS.SUCCESS, { roleId, title: role.title });
     }
@@ -231,6 +232,7 @@ export class RoleHandler {
         let roleId = session.get('roleId');
         let sid = session.get('sid');
         let funcs: number[] = session.get('funcs');
+        const serverId = session.get('serverId');
 
         let { schoolId, positionId, hid } = msg;
         if (!gameData.school.has(schoolId)) {
@@ -271,7 +273,7 @@ export class RoleHandler {
         await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.ROLE_SCHOOL_UNLOCK, [hid, preHid]);
         if (hid > 0) {
             //成长任务
-            await accomplishTask(roleId, TASK_TYPE.ROLE_SCHOOL_PUT_HERO, 1)
+            await accomplishTask(serverId, roleId, TASK_TYPE.ROLE_SCHOOL_PUT_HERO, 1)
         }
 
         return resResult(STATUS.SUCCESS, {

game-server/app/services/dailyChallengesService.ts

@@ -12,7 +12,7 @@ import { DailyChallengesData, DailyItem } from '../domain/activityField/dailyCha
    *
    */
 export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
 
     let playerData = new DailyChallengesData(activityData);

game-server/app/services/dailyGiftsService.ts

@@ -12,7 +12,7 @@ import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGift
    *
    */
 export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
 
     let playerData = new DailyGiftsData(activityData);

game-server/app/services/dailyRMBGiftsService.ts

@@ -18,7 +18,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
    */
 
 export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
     activityArray = activityArray.sort((a, b) => {
         return a.activityId - b.activityId
     });
@@ -41,7 +41,7 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
    *
    */
 export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
 
     let playerData = new DailyRMBGiftsData(activityData);
     let productID = playerData.productID;
@@ -70,7 +70,7 @@ export async function getPlayerDailyGiftsData(activityId: number, serverId: numb
    */
 export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerData = new DailyRMBGiftsData(activityData);
     let bigGiftProductID = playerData.productID;
     if (bigGiftProductID == productID) {//一次性购买7天礼包

game-server/app/services/equipService.ts

@@ -58,7 +58,7 @@ export function checkMaterialEnough(consumes: Array<{ id: number, count: number
  * @param id 装备类型
  * @param seqId 要装上的装备的唯一id 装备B
  */
-export async function changeEquip(roleId: string, sid: string, equipA: EquipType, hid: number, id: number, equipB: EquipType, funcs: number[]) {
+export async function changeEquip(serverId: number, roleId: string, sid: string, equipA: EquipType, hid: number, id: number, equipB: EquipType, funcs: number[]) {
     let heroB: HeroType;
     if (!!hid) //需要卸下或者替换的武将
         heroB = await HeroModel.findByHidAndRoleWithEquip(hid, roleId);//需要替换的武将
@@ -77,7 +77,7 @@ export async function changeEquip(roleId: string, sid: string, equipA: EquipType
                 let res = await takeOffEquipAndCalPlayerCe(roleId, sid, heroB, equipB, id, funcs);//卸下装备并重算战力
                 return res;
             }
-            let res = await dressEquip(roleId, sid, heroB, equipA, funcs);//替换给武将，并计算战力
+            let res = await dressEquip(serverId, roleId, sid, heroB, equipA, funcs);//替换给武将，并计算战力
             return res;
         } else {
             let res = await takeOffEquipAndCalPlayerCe(roleId, sid, null, equipA, id, funcs);//卸下装备并重算战力
@@ -119,7 +119,7 @@ export async function takeOffEquipAndCalPlayerCe(roleId: string, sid: string, he
  * @param hero 
  * @param equip 
  */
-export async function dressEquip(roleId: string, sid: string, hero: HeroType, equip: EquipType, funcs: number[]) {
+export async function dressEquip(serverId: number, roleId: string, sid: string, hero: HeroType, equip: EquipType, funcs: number[]) {
     let args = calEquipSeids(hero);
 
     hero = await HeroModel.addEquip(roleId, hero.hid, equip.ePlaceId, equip._id);
@@ -129,7 +129,7 @@ export async function dressEquip(roleId: string, sid: string, hero: HeroType, eq
     await checkTask(roleId, sid, funcs, TASK_TYPE.EQUIP_SUM, 1, true, {});
     await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_BY_HERO, hero, [1]);
     await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_QUALITY, equip, [1]);
-    await accomplishTask(roleId, TASK_TYPE.EQUIP_QUALITY, 1, { quality: equip.quality })
+    await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_QUALITY, 1, { quality: equip.quality })
 
     return { seqId: equip.seqId, hid: hero.hid };
 }

game-server/app/services/firstGiftService.ts

@@ -13,7 +13,7 @@ import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftF
    */
 
 export async function firstGiftActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.FIRST_GIFT, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, true)
     activityArray = activityArray.sort((a, b) => {
         return a.activityId - b.activityId
     });
@@ -34,7 +34,7 @@ export async function firstGiftActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerFirstGiftData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityId, roleId);
 
     let playerData = new FirstGiftData(activityData);

game-server/app/services/gachaService.ts

@@ -13,9 +13,9 @@ import { gameData, getDicGachaFloor } from "../pubUtils/data";
  * @param roleId 玩家id
  * @param aid 活动id
  */
-export async function getLimitGacha(roleId: string, activityId: number) {
+export async function getLimitGacha(serverId: number, roleId: string, activityId: number) {
 
-    let activityData = await ActivityModel.findActivity(activityId, true);
+    let activityData = await ActivityModel.findActivity(serverId, activityId, true);
     if (!activityData) return false;
 
     let gachaData = new GachaData(activityData);

game-server/app/services/growthFundService.ts

@@ -22,7 +22,7 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
   GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
 */
 export async function growthFundActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
     activityArray = activityArray.sort((a, b) => {
         return a.activityId - b.activityId
     });
@@ -45,7 +45,7 @@ export async function growthFundActivity(type: number, serverId: number, roleId:
    *
    */
 export async function getPlayerGrowthFundData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecords: ActivityGrowthFundModelType[] = await ActivityGrowthFundModel.findData(activityId, roleId);
 
     let playerData = new GrowthFundData(activityData);

game-server/app/services/growthService.ts

@@ -1,3 +1,4 @@
+import { ACTIVITY_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityGrowthModel, ActivityGrowthModelType } from '../db/ActivityGrowth';
 import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
@@ -10,8 +11,8 @@ import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
    * @param {string} roleId 角色Id
    *
    */
-export async function getActivityData(activityId: number, serverId: number, roleId: string) {
+export async function getGrowthActivityData(serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
     return { data: activityData };
 }
 
@@ -24,7 +25,7 @@ export async function getActivityData(activityId: number, serverId: number, role
    *
    */
 export async function getPlayerGrowthData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
 
     let playerData = new GrowthData(activityData);

game-server/app/services/guildService.ts

@@ -93,7 +93,7 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol
     }
 
     //成长任务-加入军团
-    await accomplishTask(roleId, TASK_TYPE.GUILD_JOIN, 1);
+    await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_JOIN, 1);
 
     session.set('guildCode', code);
     session.push('guildCode', () => { });

game-server/app/services/limitPackageService.ts

@@ -13,7 +13,7 @@ import { LimitShopData, ShopItem } from '../domain/activityField/limitShopField'
    */
 
 export async function newPlayerLimitPackageActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE, new Date)
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE, new Date)
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });
@@ -34,7 +34,7 @@ export async function newPlayerLimitPackageActivity(serverId: number, roleId: st
    *
    */
 export async function getPlayerLimitPackageData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerData = new LimitShopData(activityData);
 
     let playerRecord: ActivityShopModelType = await ActivityShopModel.findData(activityId, roleId, playerData.roundIndex);
@@ -53,7 +53,7 @@ export async function getPlayerLimitPackageData(activityId: number, serverId: nu
    */
 
 export async function limitPackageActivity(serverId: number, roleId: string, type: number) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date)
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date)
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });

game-server/app/services/monthlyTicketService.ts

@@ -16,7 +16,7 @@ import moment = require('moment');
    */
 
 export async function monthlyTicketActivity(serverId: number, roleId: string, type: number) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date())
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date())
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });
@@ -37,7 +37,7 @@ export async function monthlyTicketActivity(serverId: number, roleId: string, ty
    *
    */
 export async function getPlayerMonthlyTicketData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
     let playerData = new MonthlyTicketData(activityData);
     playerData.setPlayerRecords(playerRecord);
@@ -54,7 +54,7 @@ export async function getPlayerMonthlyTicketData(activityId: number, serverId: n
    */
 export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number,) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
     if (!playerRecord) {//没有购买过
         return null;
@@ -84,7 +84,7 @@ export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName:
    */
 export async function makeMonthlyTicketReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerData = new MonthlyTicketData(activityData);
 
     let endTime = moment(new Date()).startOf('d').add(playerData.days, 'day').toDate();

game-server/app/services/normalBattleService.ts

@@ -12,6 +12,7 @@ import { checkTask } from './taskService';
 import { accomplishTask } from '../pubUtils/taskUtil';
 
 export async function roleLevelup(roleId: string, kingExp: number, session: BackendSession) {
+    const serverId = session.get('serverId');
     let role = await RoleModel.findByRoleId(roleId);
     let { lv = 1, exp = 0 } = role;
     let canGetExp = lv < gameData.maxPlayerLv; // 当主公超过最大级后，挑战结算不再获得经验值
@@ -35,7 +36,7 @@ export async function roleLevelup(roleId: string, kingExp: number, session: Back
         // 任务
         await checkTask(roleId, session.get('sid'), session.get('funcs'), TASK_TYPE.ROLE_LV, newLv, false, {});
         //成长任务
-        await accomplishTask(roleId, TASK_TYPE.ROLE_LV, newLv);
+        await accomplishTask(serverId, roleId, TASK_TYPE.ROLE_LV, newLv);
 
     }
     let actordata: { lv: number, exp: number, getExp: number, mostExp: number }[] = [];

game-server/app/services/popUpShopService.ts

@@ -15,7 +15,7 @@ import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../db/Activi
    */
 
 export async function popUpShopActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.POP_UP_SHOP, new Date())
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.POP_UP_SHOP, new Date())
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });
@@ -36,7 +36,7 @@ export async function popUpShopActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerPopUpShopData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecords: ActivityPopUpShopModelType[] = await ActivityPopUpShopModel.findAllOpenData(serverId, activityId, roleId);
 
     let allPlayerShop = [];
@@ -65,7 +65,7 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
    */
 export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     if (!activityData) {
         return null;
     }

game-server/app/services/rechargeMoneyService.ts

@@ -17,7 +17,7 @@ import moment = require('moment');
    */
 
 export async function rechargeMoneyActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.RECHARGE_MONEY, new Date())
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.RECHARGE_MONEY, new Date())
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });
@@ -38,7 +38,7 @@ export async function rechargeMoneyActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerRechargeMoneyData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findData(serverId, roleId);
 
     let playerData = new RechargeMoneyData(activityData);

game-server/app/services/selfServiceShopActivityService.ts

@@ -16,7 +16,7 @@ import { addReward, getSelectedReward } from './giftPackageService';
    *
    */
 export async function getActivityData(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.SELF_SERVICE_SHOP, new Date())
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.SELF_SERVICE_SHOP, new Date())
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });
@@ -37,7 +37,7 @@ export async function getActivityData(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerActivityData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerData = new SelfServiceShopData(activityData);
 
     let playerRecords: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.findDataByPriceType(serverId, activityId, roleId, playerData.roundIndex, ACTIVITY_RESOURCES_TYPE.RMB);

game-server/app/services/signInService.ts

@@ -14,7 +14,7 @@ import { SignInData, SignInItem } from '../domain/activityField/signInField';
    *
    */
 export async function signInActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date());
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date());
     if (activityArray.length > 0) {
         return activityArray[0];
     }
@@ -30,7 +30,7 @@ export async function signInActivity(type: number, serverId: number, roleId: str
    *
    */
 export async function getPlayerSignInData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerData = new SignInData(activityData);
     let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex);
 
@@ -51,7 +51,7 @@ export async function getPlayerSignInData(activityId: number, serverId: number,
    */
 export async function makeSignInVIP(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerData = new SignInData(activityData);
 
     await ActivitySignInModel.buyVIP(activityId, roleId, playerData.roundIndex);

game-server/app/services/taskService.ts

@@ -16,16 +16,16 @@ import { gameData, getGoodById } from '../pubUtils/data';
 import { getSeconds, getZeroPointD } from '../pubUtils/timeUtil';
 import { RoleStatus } from '../db/ComBattleTeam';
 
-export async function checkTaskWithRoles(roleId: string, sid: string, funcs: number[], taskType: number, roles: RoleType[]) {
+export async function checkTaskWithRoles(serverId: number, roleId: string, sid: string, funcs: number[], taskType: number, roles: RoleType[]) {
     for (let role of roles) {
         if (role) {
-            await checkTaskWithRole(role.roleId, role.roleId == roleId ? sid : null, role.roleId == roleId ? funcs : null, taskType, role);
+            await checkTaskWithRole(serverId, role.roleId, role.roleId == roleId ? sid : null, role.roleId == roleId ? funcs : null, taskType, role);
         }
     }
 }
 
-export async function checkTaskWithRole(roleId: string, sid: string, funcs: number[], taskType: number, role: RoleType) {
+export async function checkTaskWithRole(serverId: number, roleId: string, sid: string, funcs: number[], taskType: number, role: RoleType) {
-    let pushMessage = await taskUtil.checkTaskWithRole(roleId, taskType, role, funcs);
+    let pushMessage = await taskUtil.checkTaskWithRole(serverId, roleId, taskType, role, funcs);
     pushTaskUpdate(roleId, sid, funcs, pushMessage);
 }
 
@@ -76,7 +76,7 @@ export async function pushTaskUpdate(roleId: string, sid: string, funcs: number[
 /**
  * battle.normalBattleHandler.battleEnd 中会触发的任务，因为有点多提出来了
  */
-export async function checkTaskInBattleEnd(roleId: string, sid: string, funcs: number[], battleId: number, heroes: number[], star: number) {
+export async function checkTaskInBattleEnd(serverId: number, roleId: string, sid: string, funcs: number[], battleId: number, heroes: number[], star: number) {
 
     await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_WITH_HERO, battleId, heroes, 1, star);
     await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_MAIN, battleId, heroes, 1, star);
@@ -88,7 +88,7 @@ export async function checkTaskInBattleEnd(roleId: string, sid: string, funcs: n
     await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_VESTIGE, battleId, heroes, 1, star);
     await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_EXPEDITION, battleId, heroes, 1, star);
     //成长任务
-    await taskUtil.accomplishTask(roleId, TASK_TYPE.BATTLE_MAIN, 1, { warId: battleId })
+    await taskUtil.accomplishTask(serverId, roleId, TASK_TYPE.BATTLE_MAIN, 1, { warId: battleId })
 
 }
 

game-server/app/services/thirtyDaysService.ts

@@ -18,7 +18,7 @@ import { deltaDays } from '../pubUtils/util';
    */
 
 export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
     activityArray = activityArray.sort((a, b) => {
         return a.activityId - b.activityId
     });
@@ -41,7 +41,7 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
    *
    */
 export async function getPlayerThirtyDaysData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
     let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
 
@@ -60,7 +60,7 @@ export async function getPlayerThirtyDaysData(activityId: number, serverId: numb
    *
    */
 export async function addPlayerThirtyDaysTask(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
     let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
 

game-server/app/services/yuanbaoService.ts

@@ -15,7 +15,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
    */
 
 export async function yuanbaoActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.YUAN_BAO_SHOP, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, true)
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });
@@ -36,7 +36,7 @@ export async function yuanbaoActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerYuanbaoShopData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerRecord: UserOrderModelType[] = await UserOrderModel.findOrderByActivityID(activityId, roleId);
 
     let playerData = new YuanBaoShopData(activityData);
@@ -57,7 +57,7 @@ export async function getPlayerYuanbaoShopData(activityId: number, serverId: num
 export async function makeYuanbaoShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
     let records = await UserOrderModel.findOrderByProductID(productID, roleId, activityId);
-    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
     let playerData = new YuanBaoShopData(activityData);
     let item = playerData.findItem(productID);
 

gm-server/app/service/Activity.ts

@@ -16,9 +16,11 @@ export default class Activity extends Service {
         const list = await ActivityModel.findByCondition(page, pageSize, type, serverId, current, activityId);
         const total = await ActivityModel.countByCondition(type, serverId, current, activityId);
         return ctx.service.utils.resResult(STATUS.SUCCESS, {
-            list: list.map(cur => { return {
+            list: list.map(cur => {
+                return {
                     ...cur, beginTime: cur.beginTime.getTime(), endTime: cur.endTime.getTime()
-            } }), total
+                }
+            }), total
         });
     }
 

shared/consts/constModules/activityConst.ts

@@ -88,7 +88,7 @@ export enum ORDER_STATE {
 }
 
 //服务器开服时间
-export const SERVER_OPEN_TIME = '2021-02-11T20:03:16.637+08:00';
+export const SERVER_OPEN_TIME = '2021-05-19T20:03:16.637+08:00';
 //玩家等级大于等于15级才能开启vip签到
 export const SIGNIN_VIP_OPEN_LIMIT = 15;
 

shared/db/Activity.ts

@@ -23,20 +23,20 @@ export default class Activity extends BaseModel {
     data: string;					// 活动表中的数据
 
     //根据活动类型查询开启的活动数据
-    public static async findOpenActivityByType(type: number, date: Date, lean = true) {
+    public static async findOpenActivityByType(serverId: number, type: number, date: Date, lean = true) {
-        let result: ActivityModelType[] = await ActivityModel.find({ type, beginTime: { $lte: date }, endTime: { $gte: date } }).lean(lean);
+        let result: ActivityModelType[] = await ActivityModel.find({ serverId, type, beginTime: { $lte: date }, endTime: { $gte: date } }).lean(lean);
         return result;
     }
 
     //根据活动类型查询活动数据
-    public static async findActivityByType(type: number, lean = true) {
+    public static async findActivityByType(serverId: number, type: number, lean = true) {
-        let result: ActivityModelType[] = await ActivityModel.find({ type }).lean(lean);
+        let result: ActivityModelType[] = await ActivityModel.find({ serverId, type }).lean(lean);
         return result;
     }
 
     //根据活动id查询活动数据
-    public static async findActivity(activityId: number, lean = true) {
+    public static async findActivity(serverId: number, activityId: number, lean = true) {
-        let result: ActivityModelType = await ActivityModel.findOne({ activityId }).lean(lean);
+        let result: ActivityModelType = await ActivityModel.findOne({ serverId, activityId }).lean(lean);
         return result;
     }
 

shared/pubUtils/itemUtils.ts

@@ -268,7 +268,7 @@ export async function createHeroes(roleId: string, roleName: string, serverId: n
     let m4 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_LV, heroes, funcs);
     let taskPushMessage = m1.concat(m2, m3, m4);
     //成长任务
-    await accomplishTask(roleId, TASK_TYPE.HERO_NUM, heroNum)
+    await accomplishTask(serverId, roleId, TASK_TYPE.HERO_NUM, heroNum)
     return { role, figureInfo, heroes, calHeroResults, calAllHeroResults, taskPushMessage }
 }
 

shared/pubUtils/taskUtil.ts

@@ -20,18 +20,18 @@ import { ActivityThirtyDaysModel, ActivityThirtyDaysModelType } from '../db/Acti
 
 
 
-export async function checkTaskWithRoles(taskType: number, roles: RoleType[], funcs?: number[]) {
+export async function checkTaskWithRoles(serverId: number, taskType: number, roles: RoleType[], funcs?: number[]) {
     let pushMessage = new Array<TaskListReturn>();
     for (let role of roles) {
         if (role) {
-            let singlePush = await checkTaskWithRole(role.roleId, taskType, role, funcs);
+            let singlePush = await checkTaskWithRole(serverId, role.roleId, taskType, role, funcs);
             pushMessage.concat(singlePush);
         }
     }
     return pushMessage
 }
 
-export async function checkTaskWithRole(roleId: string, taskType: number, role: RoleType, funcs?: number[]) {
+export async function checkTaskWithRole(serverId: number, roleId: string, taskType: number, role: RoleType, funcs?: number[]) {
     let pushMessage = new Array<TaskListReturn>();
 
     if (taskType == TASK_TYPE.LOGIN_SUM) {
@@ -39,7 +39,7 @@ export async function checkTaskWithRole(roleId: string, taskType: number, role:
         if (today > role.loginTime) {
             pushMessage = await checkTask(roleId, taskType, 1, true, {}, funcs);
             //成长任务-累计登录游戏天数
-            await accomplishTask(roleId, taskType, 1)
+            await accomplishTask(serverId, roleId, taskType, 1)
         }
     }
     else if (taskType == TASK_TYPE.LOGIN_SERIES) {
@@ -481,9 +481,9 @@ function checkRecResult(rec: UserTaskRecType, id: number) {
    * @param {number} parma 参数
    *
    */
-export async function accomplishTask(roleId: string, taskType: TASK_TYPE, count: number, parma?: any) {
+export async function accomplishTask(serverId: number, roleId: string, taskType: TASK_TYPE, count: number, parma?: any) {
-    //成长活动统计
+    //七天乐-成长活动统计
-    let allActivity: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.TASK_GROWTH, new Date());
+    let allActivity: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
     for (let activity of allActivity) {
         let growthActivity = new GrowthData(activity);
         let taskArray = growthActivity.findTaskByType(taskType);
@@ -500,7 +500,7 @@ export async function accomplishTask(roleId: string, taskType: TASK_TYPE, count:
     }
 
     //今日挑战统计
-    allActivity = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.TASK_DAILY_CHALLENGES, new Date());
+    allActivity = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_DAILY_CHALLENGES, new Date());
     for (let activity of allActivity) {
         let growthActivity = new DailyChallengesData(activity);
         let taskArray = growthActivity.findTaskByType(taskType, growthActivity.today());
@@ -531,7 +531,7 @@ export async function accomplishTask(roleId: string, taskType: TASK_TYPE, count:
         taskType === TASK_TYPE.EQUIP_QUALITY
 
     ) {
-        allActivity = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.THIRTY_DAYS, new Date());
+        allActivity = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, new Date());
         for (let activity of allActivity) {
             let thirtyDaysActivity = new ThirtyDaysData(activity);
             let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(activity.serverId, activity.activityId, roleId);