军团：补发活跃宝箱

shared/db/Guild.ts

@@ -64,17 +64,11 @@ export default class Guild extends BaseModel {
     @prop({ required: true, default: 0 })
     refTodayFund: Date;
 
-    @prop({ required: true, default: 0 })
-    activeDaily: number;
-
     @prop({ required: true, default: 0 })
     activeWeekly: number;
 
     @prop({ required: true, default: nowSeconds() })
     activeUpdateTime: number;
-    
-    @prop({ required: true, default: new Date(), select: false })
-    refTimeDaily: Date;
 
     @prop({ required: true, default: 0 })
     guildCe: number;                         // 总战力

shared/db/GuildActive.ts

@@ -0,0 +1,31 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+
+@index({ guildCode: 1, refTime: 1   })
+export default class GuildActive extends BaseModel {
+
+    @prop({ required: true })
+    guildCode: string;       // 军团
+
+    @prop({ required: true })
+    refTime: Date;       // 刷新时间
+
+    @prop({ required: true, default: 0 })
+    active: number;        // 活跃
+
+    // 更新
+    public static async addActive(guildCode: string, refTime: Date, active: number) {
+        let rec: GuildActiveType = await GuildActiveModel.findOneAndUpdate({ guildCode, refTime }, { $inc: { active } }, { new: true, upsert: true }).lean();
+        return rec;
+    }
+
+    public static async getActive(guildCode: string, refTime: Date) {
+        let rec: GuildActiveType = await GuildActiveModel.findOne({ guildCode, refTime }).lean();
+        return rec;
+    }
+}
+
+export const GuildActiveModel = getModelForClass(GuildActive);
+
+export interface GuildActiveType extends Pick<DocumentType<GuildActive>, keyof GuildActive> { };
+export type GuildActiveUpdateParam = Partial<GuildActiveType>; // 将所有字段变成可选项

shared/db/UserGuild.ts

@@ -11,7 +11,7 @@ class ActiveRecord {
     count: number;
 }
 
-class WishGood {
+export class WishGood {
     @prop({ required: true })
     id: string;//随机生成的唯一id
     @prop({ required: true })

shared/pubUtils/timeUtil.ts

@@ -489,6 +489,16 @@ export function getZeroPointD(refreshType: SHOP_REFRESH_TYPE = SHOP_REFRESH_TYPE
     }
 }
 
+export function getZeroPointOfTimeD(refTime: Date, refreshType: SHOP_REFRESH_TYPE = SHOP_REFRESH_TYPE.DAILY) {
+    let t = new Time(TIME_OUTPUT_TYPE.DATE, refTime);
+    if(refreshType == SHOP_REFRESH_TYPE.DAILY) {
+        return <Date>t.getDayZeroPoint();
+    } else if (refreshType == SHOP_REFRESH_TYPE.WEEKLY) {
+        return <Date>t.getWeekZeroPoint();
+    } else if (refreshType == SHOP_REFRESH_TYPE.MONTHLY) {
+        return <Date>t.getMonthZeroPoint();
+    }
+}
 
 /**
  * 根据 yy-dd-mm格式获取年龄

shared/resource/jsons/server_const.json

@@ -14,6 +14,7 @@
         { "id": 5, "desc": "发送弹幕", "route": "battle.barrageHandler.sendBarrage", "param": {}, "interval": 1000 },
         { "id": 6, "desc": "获取信息", "route": "connector.entryHandler.getData", "param": {}, "interval": 1000 },
         { "id": 7, "desc": "刷新信息", "route": "connector.entryHandler.refresh", "param": {}, "interval": 1000 },
-        { "id": 8, "desc": "捐赠", "route": "guild.donateHandler.donate", "param": {}, "interval": 200 }
+        { "id": 8, "desc": "捐赠", "route": "guild.donateHandler.donate", "param": {}, "interval": 200 },
+        { "id": 9, "desc": "碾压镇念塔", "route": "battle.towerBattleHandler.skipTower", "param": {}, "interval": 200 }
     ]
 }