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

军团活动：修复粮草先行code不传的问题

Browse Source
This commit is contained in:
luying
2021-12-28 17:40:29 +08:00
parent 4262e04903
commit 1ce862b719
8 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
game-server/app/servers/guild/handler/raceActivityHandler.ts
View File

@@ -10,6 +10,7 @@ import { Rank } from "../../../services/rankService";
import { checkActivityTask, checkTask } from "../../../services/taskService";
import { guildInter } from "../../../pubUtils/interface";
import { RaceActivityObject } from "../../../services/guildActivityObjService";
import { getGuildChannelSid } from "../../../services/chatService";
export default function (app: Application) {
new HandlerService(app, {});
@@ -42,11 +43,13 @@ export class RaceActivityHandler {
let events = obj.getEvents(guildCode, woodenHorse.distance);
let ranks = await getRaceActivityRank(guildCode, serverId);
let hasJoin = obj.hasJoin(guildCode, roleId);
let hasJoin = obj.getMember(guildCode, roleId);
return resResult(STATUS.SUCCESS, {
...statusResult,
hasJoin,
hasJoin: !!hasJoin,
code: hasJoin?.code||'',
woodenHorse,
...ranks,
events
@@ -68,23 +71,25 @@ export class RaceActivityHandler {
let obj = getRaceActivityObj();
let hasJoin = obj.hasJoin(guildCode, roleId);
let hasJoin = !!obj.getMember(guildCode, roleId);
if (hasJoin) {
return resResult(STATUS.RACE_HAS_JOIN);
}
let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid, obj.getEvents(guildCode, 0));
if (!guildActivityRec) return resResult(STATUS.INTERNAL_ERR);
if (!guildActivityRec) return resResult(STATUS.WRONG_PARMS);
let { code: sourceCode } = guildActivityRec;
let myGuildActivityRec = await UserGuildActivityRecModel.getRecord(roleId, roleName, guildCode, serverId, sourceCode, this.aid);
let myGuild = await UserGuildModel.getMyGuild(roleId, 'job');
let woodenHorse = await obj.joinWoodenHorse(guildCode, roleId, roleName, serverId, sid, myGuild.job);
let woodenHorse = await obj.joinWoodenHorse(guildCode, roleId, roleName, serverId, sid, myGuild.job, myGuildActivityRec.code);
if (!woodenHorse) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let events = obj.getEvents(guildCode, woodenHorse.distance);
let chatSid = await getGuildChannelSid(guildCode);
this.app.rpc.chat.guildRemote.pushRaceHorseJoin.toServer(chatSid, guildCode, woodenHorse);
return resResult(STATUS.SUCCESS, {
code: myGuildActivityRec.code,
@@ -115,7 +120,7 @@ export class RaceActivityHandler {
if (!woodenHorse) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let events = obj.getEvents(guildCode, woodenHorse.distance);
let hasJoin = obj.hasJoin(guildCode, roleId);
let hasJoin = !!obj.getMember(guildCode, roleId);
let items = obj.getItem(roleId);
let woodenHorseList = await getWoodenHorseList(guildCode, serverId);
@@ -168,7 +173,7 @@ export class RaceActivityHandler {
// 更新userGuildActivityRecord
let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid);
let myGuildActivityRec = await UserGuildActivityRecModel.updateInfo(code, { isSuccess, isCompleted: true });
if (!guildActivityRec || !myGuildActivityRec) return resResult(STATUS.INTERNAL_ERR);
if (!guildActivityRec || !myGuildActivityRec) return resResult(STATUS.WRONG_PARMS);
let hasShow = !!myGuildActivityRec.hasShow;
if(!hasShow) {