军团活动：诸侯混战城门血量

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

@@ -1,7 +1,7 @@
 import { Application, ChannelService, BackendSession, pinus, HandlerService, } from "pinus";
 import { GUILD_ACTIVITY_TYPE, STATUS, REDIS_KEY, GUILD_POINT_WAYS, CITY_STATUS, TASK_TYPE, ITEM_CHANGE_REASON } from "../../../consts";
 import { resResult } from "../../../pubUtils/util";
-import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg, getMedianCe } from "../../../services/guildActivity/guildActivityService";
+import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg, getPreDayActiveData } from "../../../services/guildActivity/guildActivityService";
 import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
 import { gameData } from "../../../pubUtils/data";
 import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
@@ -17,6 +17,7 @@ import { Rank } from "../../../services/rankService";
 import { checkActivityTask, checkTask } from "../../../services/taskService";
 import { guildInter } from "../../../pubUtils/interface";
 import { dispatch } from "../../../pubUtils/dispatcher";
+import { ServerRecordModel } from "../../../db/ServerRecords";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -68,7 +69,7 @@ export class CityActivityHandler {
         let dicCity = gameData.cityActivity.get(cityId);
         if (!dicCity) return resResult(STATUS.DIC_DATA_NOT_FOUND);
         let obj = getCityActivityObj();
-        let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
+        let {gateHp, maxHp} = await obj.getGateHpAndInc(serverId, cityId);
 
         let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid);
         if (!guildActivityRec) return resResult(STATUS.WRONG_PARMS);
@@ -99,7 +100,7 @@ export class CityActivityHandler {
             cityId,
             ...statusResult,
             cityStatus,
-            gateHp,
+            gateHp, maxHp,
             challengeTime,
             ...ranks
         });
@@ -112,8 +113,6 @@ export class CityActivityHandler {
         const serverId = session.get('serverId');
         const guildCode = session.get('guildCode');
 
-        //TODO 权限校验&时间校验
-
         let { cityId } = msg;
         let dicCity = gameData.cityActivity.get(cityId);
         if (dicCity.preCity.length > 0) return resResult(STATUS.CAN_NOT_DECLARE);
@@ -158,7 +157,7 @@ export class CityActivityHandler {
 
         const dicCity = gameData.cityActivity.get(cityId);
 
-        let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
+        let { gateHp, maxHp } = await obj.getGateHpAndInc(serverId, cityId);
         if (gateHp <= 0) return resResult(STATUS.GATE_HP_IS_ZERO);
 
         let statusResult = getGuildActivityStatus(this.aid);
@@ -188,6 +187,8 @@ export class CityActivityHandler {
 
         const dbCities = await GuildActivityCityModel.getAllCities(serverId);
         let cityStatus = pubGetCityStatus(guildCode, cityId, dicCity, dbCities);
+        // 全服活跃统计
+        await ServerRecordModel.addActiveGuild(serverId, guildCode);
 
         // 任务
         await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
@@ -195,14 +196,14 @@ export class CityActivityHandler {
         await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
 
         // 前一天中位数战力
-        let medianCe = await getMedianCe(serverId);
+        let medianCe = await getPreDayActiveData(serverId);
 
         return resResult(STATUS.SUCCESS, {
             code,
             cityId,
             cityStatus,
             ...statusResult,
-            gateHp,
+            gateHp, maxHp,
             guildScore,
             myScore: 0,
             medianCe
@@ -252,7 +253,7 @@ export class CityActivityHandler {
 
         const dicCity = gameData.cityActivity.get(cityId);
         let obj = getCityActivityObj();
-        let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
+        let { gateHp, maxHp } = await obj.getGateHpAndInc(serverId, cityId);
         if (gateHp <= 0) return resResult(STATUS.GATE_HP_IS_ZERO);
 
         let statusResult = getGuildActivityStatus(this.aid);
@@ -272,14 +273,14 @@ export class CityActivityHandler {
         let guildScore = await r.setRankWithGuildInfo(guildCode, damage, Date.now(), null, true);
         await r.setExpire(tomorrow);
 
-        gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp, -1 * damage);
+        ({gateHp, maxHp} = await obj.getGateHpAndInc(serverId, cityId, -1 * damage));
         if (gateHp <= 0) {
             // 推送 停止活动并结算奖励
             await sendSingleCityActEndMsg(cityId, serverId);
         }
         // 推送 城门血量
         let chatSid = await getCityChannelSid(cityId);
-        pinus.app.rpc.chat.guildRemote.pushCityGateHp.toServer(chatSid, cityId, gateHp);
+        pinus.app.rpc.chat.guildRemote.pushCityGateHp.toServer(chatSid, cityId, gateHp, maxHp);
         await pinus.app.rpc.guild.guildActivityRemote.sendRankToGuilds.broadcast(this.aid);
 
         return resResult(STATUS.SUCCESS, {
@@ -326,7 +327,7 @@ export class CityActivityHandler {
         let myScore = await myR.getMyScore({ roleId });
         let r = new Rank(REDIS_KEY.CITY_ACTIVITY, { serverId, cityId }, true);
         let guildScore = await r.getMyScore({ guildCode });
-        let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
+        let { gateHp, maxHp } = await obj.getGateHpAndInc(serverId, cityId);
 
         return resResult(STATUS.SUCCESS, {
             isSuccess,
@@ -335,6 +336,7 @@ export class CityActivityHandler {
             guildScore,
             myScore,
             gateHp,
+            maxHp,
             challengeTime: myGuildActivityRec.challengeTime
         });
     }