军团活动:修复粮草先行重启问题,诸侯混战宣战问题

This commit is contained in:
luying
2022-09-08 20:02:43 +08:00
parent a5241c9089
commit 0f2d247ee4
10 changed files with 152 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
import { Application, ChannelService, BackendSession, HandlerService, } from "pinus";
import { Application, ChannelService, BackendSession, HandlerService, pinus, } from "pinus";
import { GUILD_ACTIVITY_TYPE, STATUS, GUILD_ACTIVITY_STATUS, GUILD_POINT_WAYS, REDIS_KEY, TASK_TYPE, PUSH_ROUTE, RACE_ACTIVITY_STATUS, DEBUG_MAGIC_WORD } from "../../../consts";
import { genCode, resResult } from "../../../pubUtils/util";
import { getGuildActivityStatus, getRaceActivityObj, getWoodenHorseList, getGAIndexInPinus, getJoinIndex } from "../../../services/guildActivity/guildActivityService";
@@ -14,6 +14,9 @@ import { ServerRecordModel } from "../../../db/ServerRecords";
import { sendMessageToGuildWithSuc } from "../../../services/pushService";
import { RaceActivityRankParam } from "../../../domain/battleField/guildActivity";
import { GuildRankInfo } from "../../../domain/rank";
import { ServerlistModel } from "../../../db/Serverlist";
import { RoleModel } from "../../../db/Role";
import { dispatch } from "../../../pubUtils/dispatcher";
export default function (app: Application) {
new HandlerService(app, {});
@@ -35,6 +38,8 @@ export class RaceActivityHandler {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const guildCode = session.get('guildCode');
const sid = session.get('sid');
if (!guildCode) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let statusResult = getGuildActivityStatus(this.aid);
@@ -46,7 +51,7 @@ export class RaceActivityHandler {
let events = obj.getEvents(guildCode, woodenHorse.distance);
let ranks: { myGuildRank?: RaceActivityRankParam, guildRank?: RaceActivityRankParam[] } = {};
let hasJoin = obj.getMember(guildCode, roleId);
let hasJoin = await obj.updateMemberSid(guildCode, serverId, roleId, sid);
if(obj.status == GUILD_ACTIVITY_STATUS.START) {
ranks = await obj.getRanks(serverId, guildCode);
@@ -247,4 +252,17 @@ export class RaceActivityHandler {
return resResult(STATUS.SUCCESS);
}
// 加入木马
async debugResetJoin(msg: { magicWord: string }, session: BackendSession) {
let servers = await ServerlistModel.findByEnv(pinus.app.get('env'));
let guild = pinus.app.getServersByType('guild');
for(let { id: serverId } of servers) {
let sid = dispatch(`${serverId}`, guild);
pinus.app.rpc.guild.guildActivityRemote.debugResetJoin.toServer(sid.id, serverId);
}
return resResult(STATUS.SUCCESS);
}
}