xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

军团活动：修复bug

Browse Source
This commit is contained in:
luying
2021-03-23 20:43:04 +08:00
parent 1c43045e9a
commit 207ff906e3
9 changed files with 115 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/guild/handler/cityActivityHandler.ts
+8 -4
View File
@@ -1,7 +1,7 @@
import { Application, ChannelService, BackendSession, pinus } from "pinus";
import { GUILD_ACTIVITY_TYPE, STATUS, REDIS_KEY, GUILD_POINT_WAYS } from "../../../consts";
import { GUILD_ACTIVITY_TYPE, STATUS, REDIS_KEY, GUILD_POINT_WAYS, CITY_STATUS } from "../../../consts";
import { resResult } from "../../../pubUtils/util";
import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank } from "../../../services/guildActivityService";
import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg } from "../../../services/guildActivityService";
import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
import { gameData } from "../../../pubUtils/data";
import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
@@ -77,6 +77,9 @@ export class CityActivityHandler {
const dbCities = await GuildActivityCityModel.getAllCities(serverId);
let cityStatus = pubGetCityStatus(guildCode, cityId, dicCity.preCity, dbCities);
if(cityStatus == CITY_STATUS.DECLARED) {
obj.pushGuild(guildCode, serverId, cityId);
}
let historyCity = obj.getHistoryCity(roleId);
if(historyCity) {
@@ -219,9 +222,10 @@ export class CityActivityHandler {
let pushResult = await UserGuildActivityRecModel.pushCityRecord(code, { round, hid, damage });
if(!pushResult) return resResult(STATUS.WRONG_PARMS);
gateHp = obj.getGateHpAndInc(serverId, cityId, -1 * damage);
gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp, -1 * damage);
if(gateHp <= 0) {
// TODO 推送 停止活动并结算奖励
// 推送 停止活动并结算奖励
await sendSingleCityActEndMsg(cityId, serverId);
}
// 推送 城门血量
let chatSid = await getCityChannelSid(cityId);