军团：修改定时任务活跃奖励逻辑

shared/consts/constModules/guildConst.ts

@@ -71,6 +71,7 @@ export enum GUILD_OPERATE {
     BE_SET_AUTH = 27,               // 被授权头衔
     BE_IMPEACH = 28,                // 被弹劾
     RECEIVE_ACTIVE = 29,            // 领取每日活跃宝箱
+    GET_ACTIVE_RANK = 30,           // 查看活跃排行榜
 }
 
 // 军团状态

shared/db/UserGuild.ts

@@ -34,7 +34,7 @@ export default class UserGuild extends BaseModel {
     @prop({ required: true, default: 0 })
     activeDaily: number;
     
-    @prop({ required: true, default: Date.now() })
+    @prop({ required: true, default: nowSeconds() })
     activeUpdateTime: number;
 
     @prop({ required: true, default: USER_GUILD_STATUS.ON, enum: USER_GUILD_STATUS})
@@ -128,7 +128,6 @@ export default class UserGuild extends BaseModel {
     }
 
     public static async updateInfo(roleId: string, update: UserGuildUpdateParam, incParam: { activeDaily?: number, activeWeekly?: number, trainCount?: number }, select?: string) {
-        console.log(roleId, JSON.stringify(update))
         const result: UserGuildType = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON }, { $set: update, $inc: incParam }, { new: true }).select(select).lean();
         return result;
     }

shared/pubUtils/data.ts

@@ -355,10 +355,10 @@ export function getTrainBaseByLv(lv: number) {
     return gameData.trainBase.get(lv);
 }
 
-export function getGuildActiveWeekReward(point: number) {
+export function getGuildActiveWeekReward(rank: number) {
     let result = gameData.guildActiveWeekReward.find(cur => {
-        let {weekPointMax, weekPointMin} = cur;
-        return point >= weekPointMin && point <= (weekPointMax || weekPointMax == -1);
+        let {rankMax, rankMin} = cur;
+        return rank >= rankMin && rank <= (rankMax || rankMax == -1);
     });
     let reward = new Array<RewardInter>();
     if(result) reward = result.reward;

shared/pubUtils/dictionary/DicGuildActiveWeekReward.ts

@@ -8,9 +8,9 @@ export interface DicGuildActiveWeekReward {
     // id
     readonly id: number;
     // 周最低点数
-    readonly weekPointMin: number;
+    readonly rankMin: number;
     // 周最高点数
-    readonly weekPointMax: number;
+    readonly rankMax: number;
     // 奖励
     readonly reward: RewardInter[];
 

shared/pubUtils/dictionary/DicStructure.ts

@@ -156,12 +156,14 @@ export const dicTrainBase = new Map<number, DicTrainBase>(); // 练兵场
 export const dicDonateBase = new Map<number, DicDonateBase>(); // 捐献所
 export const dicWishPoolBase = new Map<number, DicWishPoolBase>(); // 许愿池
 export const dicStoreBase = new Map<number, DicWishPoolBase>(); // 许愿池
+export let maxMemberCnt = 0; // 满配最大人数
 
 // 中军大帐
 const strCenter = readJsonFile(FILENAME.DIC_GUILD_STRUCTURE_CENTER);
 let arrCenter = JSON.parse(strCenter);
 arrCenter.forEach(o => {
     setStructureConsume(o);
+    if(o.peopleNum > maxMemberCnt) maxMemberCnt = o.peopleNum;
     dicCenterBase.set(o.level, _.pick(o, Object.keys(DicCenterKeys)));
 });
 arrCenter = undefined;

shared/resource/jsons/dic_army_authority.json

@@ -143,5 +143,10 @@
         "id": 29,
         "name": "领取活跃宝箱",
         "authority": "1&2&3"
+    },
+    {
+        "id": 30,
+        "name": "查看军团活跃排行榜",
+        "authority": "1&2&3&4"
     }
 ]