添加天梯排行榜，修复setHour有时差的bug

shared/db/BattleRecord.ts

@@ -54,7 +54,6 @@ export default class BattleRecord extends BaseModel {
   public static async getBattleList( roleId: string, warType: number, lean = true) {
     const searchObj = { roleId, warType, status: 1 };
     const count = await BattleRecordModel.countDocuments(searchObj);
-    console.log(roleId, warType, count);
     const limit = 1000;
     const page = Math.ceil(count/limit);
     let result = new Array();

shared/db/DailyRecord.ts

@@ -1,5 +1,8 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop } from '@typegoose/typegoose';
+import { DAILY_CONST } from './../consts/consts';
+import { setLocalHours } from './../pubUtils/util';
+
 
 /**
   * 战斗记录接口
@@ -27,11 +30,11 @@ export default class DailyRecord extends BaseModel {
     const dailyRecord = await DailyRecordModel.findOne({ roleId, type }).lean(lean);
     let {count = 0, refTime = 0, buyCount = 0} = dailyRecord||{};
     let now = new Date();
-    let today = now.setHours(0, 0, 0, 0);
+    let today = setLocalHours(DAILY_CONST.REFRESH_TIME, now);
+
+    console.log('******dailyTime*******', today, now, new Date(), refTime);
     if(today > refTime) {
-        refTime = today;
-        count = 0;
-        buyCount = 0;
+        refTime = today; count = 0; buyCount = 0;
     }
     let result = await DailyRecordModel.findOneAndUpdate({roleId, type}, {$set: {refTime, count, buyCount}}, {new: true, upsert: true});
     return result;

shared/db/ExpeditionRecord.ts

@@ -56,7 +56,6 @@ export default class ExpeditionRecord extends BaseModel {
                 pushArr.push({hid: actorId, hp, ap})
             }
         }
-        console.log(JSON.stringify(oldHeroes), JSON.stringify(heroes), JSON.stringify(pushArr), JSON.stringify(updateArr))
         for(let {hid, hp, ap} of updateArr) {
             await ExpeditionRecordModel.findOneAndUpdate(
                 {expeditionCode, 'heroes.hid': hid },

shared/db/ExpeditionWarRecord.ts

@@ -93,7 +93,6 @@ export default class ExpeditionWarRecord extends BaseModel {
     public static async updateEnemiesStatus(expeditionCode: string, expeditionId: number, battleStatus: number, enemies: Array<{dataId: number, hp: number, ap: number}>, lean = true) {
 
         for(let {dataId, hp, ap} of enemies) {
-            console.log('updateEnemiesStatus',ap)
             await ExpeditionWarRecordModel.findOneAndUpdate(
                 {expeditionCode, expeditionId, 'enemies.dataId': dataId },
                 {$set: {'enemies.$.attribute.hp': hp, 'enemies.$.attribute.ap': ap}}

shared/db/GMUser.ts

@@ -44,7 +44,7 @@ export default class GMUser extends BaseModel {
   }
 
   public static async getGmAccountByToken(token: string, lean = true) {
-    console.log(token)
+    // console.log(token)
     const user = await GMUserModel.findOne({token}).select('uid username name token').lean(lean);
     return user;
   }

shared/db/Hero.ts

@@ -29,6 +29,8 @@ export default class Hero extends BaseModel {
 
   @prop({ required: true })
   star: number;						// 星级
+  @prop({ required: true })
+  fire: number;						// 觉醒的火，在满星了之后会继续进行觉醒，显示类似6星1火
   @prop({ required: true, default: 1 })
   rank: number;						// 阶数
   @prop({ required: true, default: 0 })

shared/db/PvpDefense.ts

@@ -41,7 +41,6 @@ export default class PvpDefense extends BaseModel {
   }
 
   public static async findByScale(roleId: string, min: number, max: number, lean = true) {
-    console.log(min, max);
     const result = await PvpDefenseModel.find({ roleId: {$ne: roleId}, ce: { $lte: max, $gte: min } }).sort({updatedAt: -1}).limit(100).lean(lean);
     return result;
   }

shared/db/Role.ts

@@ -8,6 +8,7 @@ import { shouldRefresh } from '../pubUtils/util';
   * 角色字段接口
 */
 @index({ roleId: 1 })
+@index({ towerLv: -1, towerUpTime: 1 })
 // @index({ userInfo.uid: 1, serverId: 1 })
 export default class Role extends BaseModel {
 
@@ -100,6 +101,8 @@ export default class Role extends BaseModel {
   // 天梯相关
   @prop({ required: true, default: 1 })
   towerLv: number;						// 天梯当前层数
+  @prop({ required: true, default: new Date() })
+  towerUpTime: Date;					// 天梯爬到这一层的时间
 
   @prop({ required: true, default: HANG_UP_CONSTS.MAX_SPD_UP_CNT})
   hangUpSpdUpCnt: number; // 挂机加速次数
@@ -155,7 +158,7 @@ export default class Role extends BaseModel {
   }
   
   public static async towerLvUp(roleId: string, lean = true) {
-    let role = await RoleModel.findOneAndUpdate({roleId}, {$inc: {towerLv: 1}}, {new: true}).lean(lean);
+    let role = await RoleModel.findOneAndUpdate({roleId}, {$inc: {towerLv: 1}, towerUpTime: new Date()}, {new: true}).lean(lean);
     return role;
   }
 
@@ -179,7 +182,6 @@ export default class Role extends BaseModel {
   }
 
   public static async levelup(roleId: string, lv: number, exp: number, lean = true) {
-    console.log(lv, exp)
     let role = await RoleModel.findOneAndUpdate({roleId}, {$set: { exp, lv }}, {new: true}).lean(lean);
     return role;
   }
@@ -254,6 +256,17 @@ export default class Role extends BaseModel {
     }
     return role;
   }
+
+  // 获取排行榜
+  public static async getRank(type: string, fields: Array<string>, page = 1, limit = 100, lean = true) {
+    let sortBy = {};
+    if(type == 'tower') {
+      sortBy['towerLv'] = -1;
+      sortBy['towerUpTime'] = 1;
+    }
+    const ranks = await RoleModel.find().select(fields.join(' ')).sort(sortBy).limit(limit).skip((page - 1) * limit).lean(lean);
+    return ranks;
+  }
 }
 
 export const RoleModel = getModelForClass(Role);

shared/db/TowerRecord.ts

@@ -37,7 +37,7 @@ export default class TowerRecord extends BaseModel {
     const recDoc = new TowerRecordModel();
     const update = Object.assign(recDoc.toJSON(), towerInfo );
     const { roleId, lv } = towerInfo;
-    console.log(JSON.stringify(towerInfo))
+    // console.log(JSON.stringify(towerInfo))
     let rec = await TowerRecordModel.findOneAndUpdate({roleId, lv}, {$set: update}, {upsert: true, new: true}).lean(lean);
     return rec;
   }

shared/db/TowerTaskRec.ts

@@ -101,7 +101,7 @@ export default class TowerTaskRec extends BaseModel {
   public static async refreshTask(roleId: string, lean = true) {
     let curTime = new Date();
     const refTime = getRefTime(curTime, TOWER_TASK_CONST.REFRESH_TIME);
-    console.log(refTime)
+    // console.log(refTime)
     const recs = await TowerTaskRecModel.updateMany({roleId, createdAt: {$gte: refTime}, refreshStatus: 1}, {refreshStatus: 0}, {new: true}).lean(lean);
     return recs;
   }