军团活动：蛮夷首页添加血量

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

@@ -35,6 +35,7 @@ export class GateActivityHandler {
         const roleName = session.get('roleName');
         const serverId = session.get('serverId');
         const guildCode = session.get('guildCode');
+        if(!guildCode) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
 
         let statusResult = getGuildActivityStatus(this.aid);
         if(!statusResult) return resResult(STATUS.DIC_DATA_NOT_FOUND);
@@ -48,9 +49,12 @@ export class GateActivityHandler {
 
         let ranks = await getGateActivityRank(guildCode, serverId, roleId, roleName);
 
+        let obj = getGateActivityObj();
+        let gateHp = obj.getGateHpAndInc(guildCode);
         return resResult(STATUS.SUCCESS, {
             ...statusResult,
             challengeCnt: GUILDACTIVITY.GATEACTIVITY_CHALLENGE_TIMES - challengeCnt,
+            gateHp,
             ...ranks
         });
     }
@@ -297,7 +301,7 @@ export class GateActivityHandler {
     async debugStartActivity(msg: { aid: number }, session: BackendSession) {
         let { aid } = msg;
         let dic = gameData.guildActivity.get(aid);
-        let result = await guildActivityStart(dic);
+        let result = await pinus.app.rpc.systimer.systimerRemote.guildActivityStart.toServer('systimer-server-1', dic);
         if(!result) {
             return resResult(STATUS.GUILD_ACTIVITY_IS_OPEN)
         }
@@ -320,9 +324,9 @@ export class GateActivityHandler {
     async debugEndActivity(msg: { aid: number }, session: BackendSession) {
         let { aid } = msg;
         if(aid == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {
-            await gateActivityEnd();
+            await pinus.app.rpc.systimer.systimerRemote.gateActivityEnd.toServer('systimer-server-1');
         } else if (aid == GUILD_ACTIVITY_TYPE.CITY_ACTIVITY) {
-            await cityActivityEnd();
+            await pinus.app.rpc.systimer.systimerRemote.cityActivityEnd.toServer('systimer-server-1');
         }
         return resResult(STATUS.SUCCESS);
     }

game-server/app/servers/systimer/remote/systimerRemote.ts

@@ -1,6 +1,7 @@
 import { Application, ChannelService } from 'pinus';
-import { resetPvpSeasonTime, setPvpDefResult } from '../../../services/timeTaskService';
+import { resetPvpSeasonTime, setPvpDefResult, guildActivityStart, gateActivityEnd, cityActivityEnd } from '../../../services/timeTaskService';
 import PvpDefenseType from '../../../db/PvpDefense';
+import { DicGuildActivity } from '../../../pubUtils/dictionary/DicGuildActivity';
 export default function (app: Application) {
     return new SystimerRemote(app);
 }
@@ -20,4 +21,16 @@ export class SystimerRemote {
     public async setPvpDefResult(pvpDefense: PvpDefenseType, seasonNum: number, seasonEndTime:number) {
         return await setPvpDefResult(pvpDefense, seasonNum, seasonEndTime);
     }
+
+    public async guildActivityStart(dicGuildActivity: DicGuildActivity) {
+        return await guildActivityStart(dicGuildActivity);
+    }
+
+    public async gateActivityEnd() {
+        return await gateActivityEnd();
+    }
+
+    public async cityActivityEnd() {
+        return await cityActivityEnd();
+    }
 }

game-server/app/services/timeTaskService.ts

@@ -342,9 +342,9 @@ export async function reportOneOnline(roleId: string, userCode: string, sid: str
 async function guildActivitySchedule() {
     /***********guildActivitySchedule***********/
 
-    scheduleJob('guildActivityStart', '0 0 20 * * ?', guildActivityStartSchedule);
-
     let dicGuildActivity = getTodayGuildActivity();
+    scheduleJob('guildActivityStart', `0 0 ${dicGuildActivity.startTime} * * ?`, guildActivityStartSchedule);
+
     let statusResult = getGuildActivityByDic(dicGuildActivity);
     if(!statusResult) return;
 

game-server/app/util/routeUtil.ts

@@ -57,7 +57,8 @@ export function guild(session: Session, msg: any, app: Application, cb: (err: Er
         for (let arg of msg.args) {
             if (!arg.route) continue;
             
-            if (['guild.gateActivityHandler.checkBattle',      // 军团活动蛮夷入侵路由，按军团路由
+            if (['guild.gateActivityHandler.getGateActivity',
+                 'guild.gateActivityHandler.checkBattle',      // 军团活动蛮夷入侵路由，按军团路由
                  'guild.gateActivityHandler.action',
                  'guild.gateActivityHandler.hitGate',
                  'guild.gateActivityHandler.battleEnd',

shared/resource/warJsons/7001.json

@@ -370,13 +370,13 @@
     {
         "warId": 7001,
         "actorName": "狼",
-        "actorId": 1004,
+        "actorId": 1014,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 10,
+        "x": 9,
-        "y": 2,
+        "y": 3,
         "var": 1510,
         "lv": 30,
         "hide": 1,
@@ -393,13 +393,13 @@
     {
         "warId": 7001,
         "actorName": "怒狼王",
-        "actorId": 1004,
+        "actorId": 1035,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 11,
+        "x": 13,
-        "y": 2,
+        "y": 3,
         "var": 1511,
         "lv": 30,
         "hide": 1,
@@ -409,19 +409,19 @@
         "seid": 0,
         "star": 0,
         "spine": 0,
-        "bossStage": 0,
+        "bossStage": 1,
         "enemyType": 4,
         "dest_oppo": 1001
     },
     {
         "warId": 7001,
         "actorName": "狼",
-        "actorId": 1004,
+        "actorId": 1014,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 12,
+        "x": 11,
         "y": 2,
         "var": 1512,
         "lv": 30,