✨ feat(gvg): 添加红点

shared/db/GVGLeagueApply.ts

@@ -41,6 +41,11 @@ export default class GVGLeagueApply extends BaseModel {
         return result;
     }
 
+    public static async findApplyFromLeagueWithoutPopulate(leagueCode: string) {
+        const result: GVGLeagueApplyType[] = await GVGLeagueApplyModel.find({ leagueCode, type: GVG_APPLY_TYPE.APPLY }).select('_id').lean();
+        return result;
+    }
+
     public static async findApplyFromLeague(leagueCode: string) {
         const result: GVGLeagueApplyType[] = await GVGLeagueApplyModel.find({ leagueCode, type: GVG_APPLY_TYPE.APPLY })
         .select({ _id: 0, guild: 1, guildCode: 1 })
@@ -63,6 +68,11 @@ export default class GVGLeagueApply extends BaseModel {
         return result;
     }
 
+    public static async findInviteFromGuildWithoutPopulate(guildCode: string) {
+        const result: GVGLeagueApplyType[] = await GVGLeagueApplyModel.find({ guildCode, type: GVG_APPLY_TYPE.INVITE }).select('_id').lean();
+        return result;
+    }
+
     public static async findInviteFromGuild(guildCode: string) {
         const result: GVGLeagueApplyType[] = await GVGLeagueApplyModel.find({ guildCode, type: GVG_APPLY_TYPE.INVITE })
         .select({ _id: 0, guild: 1, guildCode: 1 })

shared/db/GVGUserItem.ts

@@ -25,7 +25,7 @@ export default class GVGUserItem extends BaseModel {
     expireTime: number;  
 
     public static async findByRole(configId: number, leagueCode: string, roleId: string) {
-        const result: GVGUserItemType[] = await GVGUserItemModel.find({ configId, leagueCode, roleId, expireTime: { $gte: nowSeconds() } }, { _id: 0, id: 1, count: 1 }).lean();
+        const result: GVGUserItemType[] = await GVGUserItemModel.find({ configId, leagueCode, roleId, expireTime: { $gte: nowSeconds() }, count: { $gt: 0 } }, { _id: 0, id: 1, count: 1 }).lean();
         return result;
     }
 

shared/domain/gvgField/returnData.ts

@@ -1,6 +1,6 @@
 import { RoleType } from "../../db/Role";
 import { GVGLeagueType } from "../../db/GVGLeague";
-import { GVGLeaguePrepareType } from "../../db/GVGLeaguePrepare";
+import { GVGLeaguePrepareType, Tech } from "../../db/GVGLeaguePrepare";
 import { GVGUserDataType } from "../../db/GVGUserData";
 import { GuildType } from "../../db/Guild";
 import { GVGLeagueFarmType } from "../../db/GVGLeagueFarm";
@@ -82,9 +82,11 @@ export class GVGMainData {
     // 内政相关
     resources: LeagueResource = new LeagueResource(); // 联盟的物资
     activeTech: number[] = [];            // 已激活了的科技树的id
+    techQueue: Tech[];
     maxMemberCnt: number;               // 进入备战期总玩家人数
     producerCnt: number;               // 贤臣人数
     fighterCnt: number;               // 猛将人数
+    constribute: LeagueContributeInfo[];
 
     sumTime: number = 0;             // 今日贡献结算时间 10位时间戳
 
@@ -147,6 +149,14 @@ export class GVGMainData {
     setCities(cities: number[]) {
         this.cities = cities;
     }
+
+    setTechQueue(techQueue: Tech[]) {
+        this.techQueue = techQueue;
+    }
+
+    setConstribute(constribute: LeagueContributeInfo[]) {
+        this.constribute = constribute;
+    }
 }
 
 export class LeagueListInfo {