diff --git a/game-server/app/services/gvg/gvgTeamService.ts b/game-server/app/services/gvg/gvgTeamService.ts index cd3450fbc..64340de0a 100644 --- a/game-server/app/services/gvg/gvgTeamService.ts +++ b/game-server/app/services/gvg/gvgTeamService.ts @@ -209,14 +209,14 @@ function getAuthFromManageType(type: LEAGUE_MANAGE_TYPE) { export async function memberJoinGuildToLeague(guild: GuildType, role: RoleType) { if(!guild.leagueCode) return; - let league = await GVGLeagueModel.joinMember(guild.leagueCode, guild.code, role.roleId, role.ce); + let league = await GVGLeagueModel.joinMember(guild.leagueCode, guild.code, role.roleId); // TODO redis联军更新 console.log(league); } export async function memberQuitGuildToLeague(guild: GuildType, role: RoleType) { if(!guild.leagueCode) return; - let league = await GVGLeagueModel.quitMember(guild.leagueCode, role.roleId, role.ce); + let league = await GVGLeagueModel.quitMember(guild.leagueCode, role.roleId); // TODO redis联军更新 console.log(league); } diff --git a/shared/db/GVGLeague.ts b/shared/db/GVGLeague.ts index ca89c951e..7af12e04f 100644 --- a/shared/db/GVGLeague.ts +++ b/shared/db/GVGLeague.ts @@ -64,7 +64,7 @@ export default class GVGLeague extends BaseModel { } public static async createLeague(guild: GuildType, params: GVGLeagueUpdate) { - const { code, name, memberCnt, leader, guildCe, members } = guild; + const { code, name, memberCnt, leader, members } = guild; const doc = new GVGLeagueModel(); const leagueCode = genCode(6); let _leader = leader; @@ -115,7 +115,7 @@ export default class GVGLeague extends BaseModel { } public static async joinGuild(leagueCode: string, guild: GuildType) { - const { code, memberCnt, leader, guildCe, members } = guild; + const { code, memberCnt, leader, members } = guild; let _leader = leader; let _members = members.map(roleId => ({ roleId, auth: _leader.roleId == roleId? LEAGUE_AUTH.SUB_LEADER: LEAGUE_AUTH.MEMBER, guildCode: code })); @@ -134,7 +134,7 @@ export default class GVGLeague extends BaseModel { } public static async quitGuild(leagueCode: string, guild: GuildType) { - const { code, memberCnt, members, guildCe } = guild; + const { code, memberCnt, members } = guild; const league: GVGLeagueType = await GVGLeagueModel.findOneAndUpdate({ leagueCode, status: 1 }, { $pull: { guildCodes: code, members: { roleId: { $in: members } } }, $inc: { guildCnt: -1, memberCnt: -memberCnt } }, { new: true }).lean(); @@ -161,12 +161,12 @@ export default class GVGLeague extends BaseModel { return league; } - public static async joinMember(leagueCode: string, roleId: string, guildCode: string, ce: number) { + public static async joinMember(leagueCode: string, roleId: string, guildCode: string) { const league: GVGLeagueType = await GVGLeagueModel.findOneAndUpdate({ leagueCode, status: 1 }, { $push: { members: { roleId, auth: LEAGUE_AUTH.MEMBER, guildCode } }, $inc: { memberCnt: 1 } }, { new: true }).lean(); return league; } - public static async quitMember(leagueCode: string, roleId: string, ce: number) { + public static async quitMember(leagueCode: string, roleId: string) { const league: GVGLeagueType = await GVGLeagueModel.findOneAndUpdate({ leagueCode, status: 1 }, { $pull: { members: { roleId } }, $inc: { memberCnt: -1 } }, { new: true }).lean(); return league; } diff --git a/shared/db/GVGVestigeLock.ts b/shared/db/GVGVestigeLock.ts index b761aaecb..2f700de5f 100644 --- a/shared/db/GVGVestigeLock.ts +++ b/shared/db/GVGVestigeLock.ts @@ -1,7 +1,7 @@ // 征战中原对手锁 import BaseModel from './BaseModel'; import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; -import { getZeroPoint, nowSeconds } from '../pubUtils/timeUtil'; +import { getZeroPoint } from '../pubUtils/timeUtil'; import { GVG } from '../pubUtils/dicParam'; @index({ day: 1, groupId: 1, vestigeId: 1, rank: 1 }) diff --git a/shared/resource/jsons/server_const.json b/shared/resource/jsons/server_const.json index 8a7d9bb03..e9d1ce6c6 100644 --- a/shared/resource/jsons/server_const.json +++ b/shared/resource/jsons/server_const.json @@ -33,6 +33,6 @@ "DEBUG_TIME": 1, "CHECK_WORD": 1, "CAN_PAY": 1, - "SKIP_ENCODE": 1, + "SKIP_ENCODE": 0, "NEED_REBATE": 0 } \ No newline at end of file