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 18:31:20 +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
game-server/app/services/guildActivityObjService.ts
+13 -13
View File
@@ -47,17 +47,17 @@ export class GateActivityObject {
return this.guilds;
}
public pushMembers(guildCode: string, serverId: number, roleId: string, job: number) {
public pushMembers(guildCode: string, serverId: number, roleId: string, job: number, code: string) {
if(this.members.has(guildCode)) {
let members = this.members.get(guildCode);
if(members.findIndex(cur => cur.roleId == roleId) == -1) {
members.push({ roleId, job });
members.push({ roleId, job, code });
}
} else {
let arr = new Array<string>();
arr.push(roleId);
this.members.set(guildCode, [{ roleId, job }]);
this.members.set(guildCode, [{ roleId, job, code }]);
}
if(this.guilds.has(serverId)) {
let arr = this.guilds.get(serverId);
@@ -164,17 +164,17 @@ export class CityActivityObject {
}
public pushMembers(guildCode: string, roleId: string, job: number) {
public pushMembers(guildCode: string, roleId: string, job: number, code: string) {
if(this.members.has(guildCode)) {
let members = this.members.get(guildCode);
if(members.findIndex(cur => cur.roleId == roleId) == -1) {
members.push({ roleId, job });
members.push({ roleId, job, code });
}
} else {
let arr = new Array<string>();
arr.push(roleId);
this.members.set(guildCode, [{ roleId, job }]);
this.members.set(guildCode, [{ roleId, job, code }]);
}
}
@@ -217,17 +217,17 @@ export class RaceActivityObject {
}
// 是否加入过
public hasJoin(guildCode: string, roleId: string) {
public getMember(guildCode: string, roleId: string) {
let member = this.members.get(guildCode)||[];
return member.findIndex(cur => cur.roleId == roleId) != -1;
return member.find(cur => cur.roleId == roleId);
}
// 加入member
private pushMember(guildCode: string, roleId: string, job: number) {
private pushMember(guildCode: string, roleId: string, job: number, code: string) {
if(!this.members.has(guildCode)) {
this.members.set(guildCode, []);
}
this.members.get(guildCode).push({roleId, job});
this.members.get(guildCode).push({roleId, job, code});
}
public getMembersOfGuild(guildCode: string) {
@@ -238,11 +238,11 @@ export class RaceActivityObject {
return this.woodenHorses;
}
public async joinWoodenHorse(guildCode: string, roleId: string, roleName: string, serverId: number, sid: string, job: number) {
public async joinWoodenHorse(guildCode: string, roleId: string, roleName: string, serverId: number, sid: string, job: number, code: string) {
let woodenHorse = await this.getWoodenHorse(guildCode, serverId);
if(!woodenHorse) return false;
woodenHorse.joinMember(roleId, roleName, sid)
this.pushMember(guildCode, roleId, job);
woodenHorse.joinMember(roleId, roleName, sid, code)
this.pushMember(guildCode, roleId, job, code);
if(this.status == RACE_ACTIVITY_STATUS.START) {
let item = getRaceEventItems();