xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
luying
2020-11-06 17:31:23 +08:00
parent bd93d9dc1c
commit 04ecef03b5
29 changed files with 285 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/consts/consts.ts
View File

@@ -150,6 +150,10 @@ export const TOWER_TASK_CONST = {
MAX_HEROES_NUM: 3
}
export const DAILY_CONST = {
REFRESH_TIME: 5
}
export const WAR_JSON_ATTRIBUTE_TYPE = {
"1": "hp", // 生命
"2": "atk", // 物攻

1
shared/db/BattleRecord.ts
View File

@@ -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();

11
shared/db/DailyRecord.ts
View File

@@ -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;

1
shared/db/ExpeditionRecord.ts
View File

@@ -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 },

1
shared/db/ExpeditionWarRecord.ts
View File

@@ -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}}

2
shared/db/GMUser.ts
View File

@@ -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;
}

2
shared/db/Hero.ts
View File

@@ -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 })

1
shared/db/PvpDefense.ts
View File

@@ -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;
}

17
shared/db/Role.ts
View File

@@ -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);

2
shared/db/TowerRecord.ts
View File

@@ -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;
}

2
shared/db/TowerTaskRec.ts
View File

@@ -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;
}

5
shared/pubUtils/gamedata.ts
View File

@@ -1,5 +1,6 @@
import fs = require('fs');
import path = require('path');
import { decodeStr, decodeStrSingle } from './util';
let gamedata = {};
const wars = ['dic_zyz_gk_main', 'dic_zyz_gk_mainElite', 'dic_zyz_gk_daily', 'dic_zyz_gk_event', 'dic_zyz_gk_tower', 'dic_zyz_gk_expedition']; // 关卡相关的表
@@ -35,7 +36,7 @@ function parseTowerData() {
}
function parseTowerTaskData() {
const towerTaskFile = 'dic_zyz_tower_tasks';
const towerTaskFile = 'dic_zyz_search';
const towerTaskData = gamedata['jsons'][towerTaskFile] || [];
towerTaskData.forEach(elem => {
if (elem && elem.taskId) {
@@ -172,7 +173,6 @@ export function getLvByExp(exp: number) {
let curLv = 0;
let entries = levelInfos.entries();
for (let [lv, {sum}] of entries) {
console.log(lv, sum)
if(exp < sum) {
curLv = lv; break;
}
@@ -182,6 +182,5 @@ export function getLvByExp(exp: number) {
}
export function getExpByLv(lv: number) {
console.log(lv)
return levelInfos.get(lv);
}

20
shared/pubUtils/util.ts
View File

@@ -19,6 +19,7 @@ const moment = require('moment');
if(str == '&'|| !str) {
return []
} else {
console.log(str)
return str.split(splitForm).map(cur => {
return decodeStrSingle(type,cur);
});
@@ -50,7 +51,7 @@ const moment = require('moment');
result = { gid: parseInt(gid), count: parseInt(count), frequency: parseInt(frequency) };
break;
}
case 'eventSuitLevel': {
case 'suitLevel': {
let [min, max] = arr;
if(isNaN(min) || isNaN(max)) throw new Error('data table format wrong');
result = { min: parseInt(min), max: parseInt(max) };
@@ -180,7 +181,7 @@ export function deltaDays(preTime: Date, proTime: Date): number {
*/
export function shouldRefresh(preTime: Date, now: Date, hour: number, deltaDay = 1): boolean {
let curTime = new Date(now.getTime());
let refeshTime = curTime.setHours(hour, 0, 0, 0);
let refeshTime = setLocalHours(hour, curTime);
if (refeshTime - preTime.getTime() > deltaDay * 24 * 60 * 60 * 1000 && curTime.getTime() >= refeshTime) {
return true;
}
@@ -197,9 +198,8 @@ export function getRefTime(now = new Date(), hour: number, day = 0) {
if (curTime.getHours() < hour) {
curTime.setDate(curTime.getDate() - 1);
}
curTime.setHours(hour, 0, 0, 0);
curTime = new Date(curTime.getTime() + day * 24 * 60 * 60 * 1000);
return curTime;
let today = setLocalHours(hour, curTime);
return new Date(today + day * 24 * 60 * 60 * 1000);
}
export function getRandEelm(source: Array<any> = [], cnt = 1): Array<any> {
@@ -301,4 +301,14 @@ export function calculateNum(ratio: {A: number, B: number}, params: {num: number
console.error(e);
return defaultVal;
}
}
export function setLocalHours(hour: number, curTime = new Date()) {
// curTime: 格林威治时间
let offset = curTime.getTimezoneOffset(); // 格林威治时间和本地时间之间的时差(分)
console.log('offset：', offset);
let localTime = new Date(curTime.getTime() - offset * 60 * 1000 + 8 * 60 * 60 * 1000); // 中国时间
localTime.setUTCHours(hour, 0, 0, 0); // 中国的几点
return localTime.getTime() + offset * 60 * 1000 - 8 * 60 * 60 * 1000; // 回到格林威治时间
}

18
shared/resource/jsons/dic_zyz_daily.json
View File

@@ -2,32 +2,32 @@
{
"dailyType": 1,
"name": "护送商人",
"timesPerDay": 5,
"timesCanBuy": 10,
"difficultLvl": "3001&3002&3003&3004&3005",
"timesPerDay": 200,
"timesCanBuy": 200,
"difficultLvl": "3001&3002&3003&3004&3005&3006&3007&3008&3009",
"description": "内有不同难度，可获得大量铜钱"
},
{
"dailyType": 2,
"name": "城池守卫",
"timesPerDay": 5,
"timesCanBuy": 10,
"timesPerDay": 200,
"timesCanBuy": 200,
"difficultLvl": "3010&3011&3012&3013&3014",
"description": "内有不同难度，可获得大量武将经验书"
},
{
"dailyType": 3,
"name": "保护矿产",
"timesPerDay": 5,
"timesCanBuy": 10,
"timesPerDay": 200,
"timesCanBuy": 200,
"difficultLvl": "3020&3021&3022&3023&3024",
"description": "内有不同难度，可获得大量装备材料"
},
{
"dailyType": 4,
"name": "测试测试",
"timesPerDay": 5,
"timesCanBuy": 10,
"timesPerDay": 200,
"timesCanBuy": 200,
"difficultLvl": "3020&3021&3022&3023&3024",
"description": "内有不同难度，测试用"
}

12
shared/resource/jsons/dic_zyz_gk_daily.json
View File

@@ -96,7 +96,7 @@
"dispatchJsonId": 3005,
"bg_img_id": 501,
"script_id": 0,
"fixReward": "31003&1|31004&30|31002&20|31002&20",
"fixReward": "31001&1|31002&30|31002&20|31002&20",
"warType": 4,
"gk_name": "每日&护送商人",
"kingExp": 100,
@@ -227,14 +227,14 @@
"iconName": "新手",
"recommendedPower": 10008,
"previousGk": 0,
"dailyType": 1
"dailyType": 2
},
{
"war_id": 3011,
"dispatchJsonId": 3011,
"bg_img_id": 501,
"script_id": 0,
"fixReward": "10206&1|1&10|2&2|3&3",
"fixReward": "10201&1|1&10|2&2|3&3",
"warType": 4,
"gk_name": "每日&城池守卫",
"kingExp": 100,
@@ -303,7 +303,7 @@
"dispatchJsonId": 3014,
"bg_img_id": 501,
"script_id": 0,
"fixReward": "31003&1|31004&30|31002&20|31002&20",
"fixReward": "31001&1|31002&30|31002&20|31002&20",
"warType": 4,
"gk_name": "每日&城池守卫",
"kingExp": 100,
@@ -342,7 +342,7 @@
"iconName": "新手",
"recommendedPower": 10008,
"previousGk": 0,
"dailyType": 1
"dailyType": 3
},
{
"war_id": 3021,
@@ -418,7 +418,7 @@
"dispatchJsonId": 3024,
"bg_img_id": 501,
"script_id": 0,
"fixReward": "31003&1|31004&30|31002&20|31002&20",
"fixReward": "31001&1|31002&30|31002&20|31002&20",
"warType": 4,
"gk_name": "每日&保护矿产",
"kingExp": 100,

182
shared/resource/jsons/dic_zyz_search.json Normal file
View File

@@ -0,0 +1,182 @@
[
{
"taskId": 1,
"taskName": "调查怪事",
"quality": 1,
"reward": "31001&50|31002&100",
"additionalReward": "10201&5|10202&10",
"termsForAdd": "1&2&2|2&2&1|3&1&1",
"actorNeeded": 2,
"completeTime": 60,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 2,
"taskName": "调查嘻嘻",
"quality": 1,
"reward": "17001&50|17002&100",
"additionalReward": "10305&5|10401&10",
"termsForAdd": "2&1&1|3&2&1",
"actorNeeded": 2,
"completeTime": 60,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 3,
"taskName": "调查呵呵",
"quality": 1,
"reward": "17003&50|17004&100",
"additionalReward": "10402&5|10403&10",
"termsForAdd": "2&3&1|3&3&1",
"actorNeeded": 2,
"completeTime": 60,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 4,
"taskName": "调查多龙巴鲁托",
"quality": 2,
"reward": "17005&50|17006&100",
"additionalReward": "10404&5|10405&10",
"termsForAdd": "2&4&1|3&4&1",
"actorNeeded": 2,
"completeTime": 60,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 5,
"taskName": "调查美纳斯",
"quality": 2,
"reward": "17007&50|17008&100",
"additionalReward": "10501&5|10502&10",
"termsForAdd": "1&1&1|2&4&1|3&5&1",
"actorNeeded": 2,
"completeTime": 60,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 6,
"taskName": "调查凯南",
"quality": 2,
"reward": "10001&50|10002&100",
"additionalReward": "10503&5|10504&10",
"termsForAdd": "3&6&1",
"actorNeeded": 2,
"completeTime": 60,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 7,
"taskName": "调查男枪",
"quality": 3,
"reward": "10003&50|10004&100",
"additionalReward": "10505&5|10601&10",
"termsForAdd": "3&7&1",
"actorNeeded": 2,
"completeTime": 60,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 8,
"taskName": "调查潘森",
"quality": 3,
"reward": "10005&50|10101&100",
"additionalReward": "10602&5|10603&10",
"termsForAdd": "3&8&2",
"actorNeeded": 3,
"completeTime": 60,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 9,
"taskName": "调查卡牌",
"quality": 3,
"reward": "10102&50|10103&100",
"additionalReward": "10604&5|10605&10",
"termsForAdd": "1&1&1|2&1&1|3&1&1",
"actorNeeded": 3,
"completeTime": 60,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 10,
"taskName": "调查瑟提",
"quality": 4,
"reward": "10103&50|10104&100",
"additionalReward": "10701&5|10702&10",
"termsForAdd": "1&2&1|2&2&1|3&2&1",
"actorNeeded": 3,
"completeTime": 120,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 11,
"taskName": "调查班图",
"quality": 4,
"reward": "10105&50|10201&100",
"additionalReward": "10703&5|10704&10",
"termsForAdd": "1&1&1|2&3&1|3&3&1",
"actorNeeded": 3,
"completeTime": 120,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 12,
"taskName": "调查政府",
"quality": 4,
"reward": "10202&50|10203&100",
"additionalReward": "10705&5|12001&10",
"termsForAdd": "1&2&1|2&4&1|3&4&1",
"actorNeeded": 3,
"completeTime": 120,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 13,
"taskName": "调查CIA",
"quality": 5,
"reward": "10204&50|10205&100",
"additionalReward": "12002&5|12003&10",
"termsForAdd": "1&1&1|2&1&1|3&5&1",
"actorNeeded": 3,
"completeTime": 120,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 14,
"taskName": "调查中情局",
"quality": 5,
"reward": "10301&50|10302&100",
"additionalReward": "12004&5|12005&10",
"termsForAdd": "1&2&1|2&2&1|3&6&1",
"actorNeeded": 3,
"completeTime": 120,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 15,
"taskName": "调查王宇一",
"quality": 5,
"reward": "10303&50|10304&100",
"additionalReward": "12006&5|12007&10",
"termsForAdd": "1&1&1|2&3&1|3&7&1",
"actorNeeded": 3,
"completeTime": 120,
"suitFloor": 1,
"weight": 1
}
]

86
shared/resource/jsons/dic_zyz_tower_tasks.json
View File

@@ -1,86 +0,0 @@
[
{
"taskId": 1,
"taskName": "任务1",
"quality": 1,
"reward": "1&2|2&1",
"bonus": "3&2|4&1",
"bonusCondition": "2&2&1",
"actorCnt": 1,
"completeTime": 30,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 2,
"taskName": "任务2",
"quality": 2,
"reward": "1&2|2&1",
"bonus": "3&2|4&1",
"bonusCondition": "1&5&2",
"actorCnt": 2,
"completeTime": 120,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 3,
"taskName": "任务3",
"quality": 3,
"reward": "1&2|2&1",
"bonus": "3&2|4&1",
"bonusCondition": "3&1&1",
"actorCnt": 1,
"completeTime": 500000,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 4,
"taskName": "任务4",
"quality": 4,
"reward": "1&2|2&1",
"bonus": "3&2|4&1",
"bonusCondition": "1&5&2|2&2&1|3&1&1",
"actorCnt": 1,
"completeTime": 50,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 5,
"taskName": "任务5",
"quality": 4,
"reward": "1&2|2&1",
"bonus": "3&2|4&1",
"bonusCondition": "1&5&2|2&2&1|3&1&1",
"actorCnt": 1,
"completeTime": 30,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 6,
"taskName": "任务6",
"quality": 5,
"reward": "1&2|2&1",
"bonus": "3&2|4&1",
"bonusCondition": "1&5&2|2&2&1|3&1&1",
"actorCnt": 1,
"completeTime": 30,
"suitFloor": 1,
"weight": 1
},
{
"taskId": 7,
"taskName": "任务7",
"quality": 5,
"reward": "1&2|2&1",
"bonus": "3&2|4&1",
"bonusCondition": "1&5&2|2&2&1|3&1&1",
"actorCnt": 1,
"completeTime": 30,
"suitFloor": 1,
"weight": 1
}
]