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

粮草先行：加入信息接续

Browse Source
This commit is contained in:
luying
2022-09-27 11:50:16 +08:00
parent 4e1c334a27
commit 10a8215c89
7 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/guild/handler/raceActivityHandler.ts
+1 -16
View File
@@ -103,6 +103,7 @@ export class RaceActivityHandler {
let myGuild = await UserGuildModel.getMyGuild(roleId, 'job');
let woodenHorse = await obj.joinWoodenHorse(guildCode, roleId, roleName, serverId, sid, myGuild.job, myGuildActivityRec.code);
if (!woodenHorse) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
await GuildActivityRecordModel.join(guildCode, serverId, this.aid, joinIndex, { roleId, roleName, job: myGuild.job, code: myGuildActivityRec.code });
let events = obj.getEvents(guildCode, woodenHorse.distance);
await sendMessageToGuildWithSuc(guildCode, PUSH_ROUTE.GUILD_RACE_JOIN, { timestamp: Date.now(), woodenHorse });
@@ -251,20 +252,4 @@ export class RaceActivityHandler {
return resResult(STATUS.SUCCESS);
}
// 加入木马
async debugResetJoin(msg: { magicWord: string }, session: BackendSession) {
const { magicWord } = msg;
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
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);
}
}
game-server/app/servers/guild/remote/guildActivityRemote.ts
+1 -10
View File
@@ -1,5 +1,5 @@
import { Application, ChannelService, HandlerService, } from 'pinus';
import { sendAllGuildRanks, calWoodenHorseAndSend, sendRaceStartMsg, setDicGuildActivity, setDicAuctionTime, settleGuildActivityReward, clearActivityObj, getGAPinusName, getCurGuildActivityIndexByDb, initGuildActivityIndexInPinus, setGuildActivityIndexInPinus, guildActivityStart, debugResetJoin, debugSendGateHp, debugAddHorse } from '../../../services/guildActivity/guildActivityService';
import { sendAllGuildRanks, calWoodenHorseAndSend, sendRaceStartMsg, setDicGuildActivity, setDicAuctionTime, settleGuildActivityReward, clearActivityObj, setGuildActivityIndexInPinus, guildActivityStart, debugSendGateHp, debugAddHorse } from '../../../services/guildActivity/guildActivityService';
import { gameData } from '../../../pubUtils/data';
import { setWeek } from '../../../pubUtils/timeUtil';
import { sendUngotDividend } from '../../../services/auctionService';
@@ -16,7 +16,6 @@ export class GuildActivityRemote {
constructor(private app: Application) {
this.app = app;
initGuildActivityIndexInPinus();
}
private currentTime: number = Date.now();
@@ -191,14 +190,6 @@ export class GuildActivityRemote {
}
}
async debugResetJoin(serverId: number) {
try {
await debugResetJoin(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
}
public async debugSendGateHp(serverId: number, cityId: number) {
try {
await debugSendGateHp(serverId, cityId);