🐞 fix(gvg): 修复防御cd，积分点驻守变更

shared/db/GVGLeague.ts

@@ -4,6 +4,7 @@ import Role, { RoleType } from '../db/Role';
 import { genCode } from '../pubUtils/util';
 import { GuildType } from './Guild';
 import { LEAGUE_AUTH } from '../consts';
+import { GVG } from '../pubUtils/dicParam';
 
 class Member {
     @prop({ required: true }) 
@@ -88,7 +89,7 @@ export default class GVGLeague extends BaseModel {
 
     public static async findByCondition(type: number, serverIds: number[], page: number, name: string) {
         let query = {
-            status: 1, type, serverId: { $in: serverIds }
+            status: 1, type, serverId: { $in: serverIds }, guildCnt: { $lt: GVG.GVG_LEAGUE_COMPOSE }
         };
         if(name) {
             query['name'] = { $regex: new RegExp(name, 'i') };

shared/db/GVGTeam.ts

@@ -273,8 +273,8 @@ export default class GVGTeam extends BaseModel {
     }
 
     // 结算防守方
-    public static async battleEndDefense(teamCode: string, hpInc: number, rebirthAreaId: number, reviveCd: number) {
-        let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { defenseTime: nowSeconds() + GVG.GVG_DEFAULT_DEFENSE_CD, lockTime: 0, lockTeamCode: '' }, $inc: { durability: hpInc } }, { new: true }).lean();
+    public static async battleEndDefense(teamCode: string, hpInc: number, rebirthAreaId: number, defenseCd: number, reviveCd: number) {
+        let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { defenseTime: nowSeconds() + defenseCd, lockTime: 0, lockTeamCode: '' }, $inc: { durability: hpInc } }, { new: true }).lean();
         if(team.durability <= 0) {
             let originPointId = team.pointId;
             team = await GVGTeamModel.teamBreak(teamCode, team.isRobot, team.maxDurability, rebirthAreaId, team.areaId, reviveCd);