修改天梯派遣星级条件

This commit is contained in:
luying
2020-11-09 13:48:36 +08:00
parent 04ecef03b5
commit 541e8a391d
4 changed files with 5 additions and 10 deletions
+3 -4
View File
@@ -165,7 +165,7 @@ export async function calcuHangUpReward(roleId: string, speedUp = false, speedUp
let multi = Math.floor(deltaTime / HANG_UP_CONSTS.UNIT_TIME); // 结算奖励的倍数,受最大时间限制 let multi = Math.floor(deltaTime / HANG_UP_CONSTS.UNIT_TIME); // 结算奖励的倍数,受最大时间限制
console.log(deltaTime, multi, baseReward); // console.log(deltaTime, multi, baseReward);
for(let {gid, count} of baseReward) { for(let {gid, count} of baseReward) {
let newCount = cal.mul(count, multi); let newCount = cal.mul(count, multi);
let oldGoods = notReceivedGoods.find(cur => cur.gid == gid); let oldGoods = notReceivedGoods.find(cur => cur.gid == gid);
@@ -197,10 +197,9 @@ async function checkCond(roleId: string, heroes, type: number, param: number, cn
switch (type) { switch (type) {
case 1: case 1:
let field = param == 1?'star': 'fire'; // fire:觉醒的火,在满星了之后会继续进行觉醒,显示类似6星1火
for(let hid of heroes) { for(let hid of heroes) {
const rec = await HeroModel.findByHidAndRole(hid, roleId); const rec = await HeroModel.findByHidAndRole(hid, roleId);
if (rec[field] >= param) { if (rec.star >= param) {
heroCnt++; heroCnt++;
} }
} }
@@ -277,7 +276,7 @@ export function treatTask(recs: Array<any>, curTime: Date) {
let { heroes, batchCode, taskId, taskCode, status, completeTime} = cur; let { heroes, batchCode, taskId, taskCode, status, completeTime} = cur;
let remainTime = 0; let remainTime = 0;
if(status == 1) { if(status == 1) {
console.log(curTime.getTime(), completeTime.getTime()) // console.log(curTime.getTime(), completeTime.getTime())
remainTime = Math.floor((completeTime.getTime() - curTime.getTime())/1000); remainTime = Math.floor((completeTime.getTime() - curTime.getTime())/1000);
if(remainTime < 0) { if(remainTime < 0) {
status = 2; remainTime = 0; status = 2; remainTime = 0;
+2 -3
View File
@@ -23,7 +23,7 @@ export async function checkEventBattle(roleId: string, eventStatus: number, batt
if (!result) { if (!result) {
if(refTime) { if(refTime) {
let preTime = getEventTime(new Date(refTime - 1)); let preTime = getEventTime(new Date(refTime - 1));
console.log('preTime:', preTime); // console.log('preTime:', preTime);
result = await EventRecordModel.setBattleCode(roleId, battleId, preTime, battleCode); result = await EventRecordModel.setBattleCode(roleId, battleId, preTime, battleCode);
} }
} }
@@ -73,7 +73,6 @@ export function getEventTime(now: Date) {
} else if (curTime >= todayB) { } else if (curTime >= todayB) {
t = todayB; t = todayB;
} }
console.log('getEventTime', curTime, todayA, todayB, yesterdayB, t);
return t return t
} }
@@ -353,7 +352,7 @@ export function getEventSuccessStatus(type: number, status: number, question: Ar
} else if (type == EVENT_TYPE.QUIZ) { } else if (type == EVENT_TYPE.QUIZ) {
isSuccess = true; isSuccess = true;
for(let { status = EVENT_ANSWER_STATUS.WAITING } of question) { for(let { status = EVENT_ANSWER_STATUS.WAITING } of question) {
console.log(status); // console.log(status);
if(status == EVENT_ANSWER_STATUS.WRONG) { if(status == EVENT_ANSWER_STATUS.WRONG) {
isSuccess = false; isSuccess = false;
} else if(status == EVENT_ANSWER_STATUS.WAITING) { } else if(status == EVENT_ANSWER_STATUS.WAITING) {
-1
View File
@@ -32,7 +32,6 @@ export default class DailyRecord extends BaseModel {
let now = new Date(); let now = new Date();
let today = setLocalHours(DAILY_CONST.REFRESH_TIME, now); let today = setLocalHours(DAILY_CONST.REFRESH_TIME, now);
console.log('******dailyTime*******', today, now, new Date(), refTime);
if(today > refTime) { if(today > refTime) {
refTime = today; count = 0; buyCount = 0; refTime = today; count = 0; buyCount = 0;
} }
-2
View File
@@ -19,7 +19,6 @@ const moment = require('moment');
if(str == '&'|| !str) { if(str == '&'|| !str) {
return [] return []
} else { } else {
console.log(str)
return str.split(splitForm).map(cur => { return str.split(splitForm).map(cur => {
return decodeStrSingle(type,cur); return decodeStrSingle(type,cur);
}); });
@@ -307,7 +306,6 @@ export function calculateNum(ratio: {A: number, B: number}, params: {num: number
export function setLocalHours(hour: number, curTime = new Date()) { export function setLocalHours(hour: number, curTime = new Date()) {
// curTime: 格林威治时间 // curTime: 格林威治时间
let offset = curTime.getTimezoneOffset(); // 格林威治时间和本地时间之间的时差(分) let offset = curTime.getTimezoneOffset(); // 格林威治时间和本地时间之间的时差(分)
console.log('offset', offset);
let localTime = new Date(curTime.getTime() - offset * 60 * 1000 + 8 * 60 * 60 * 1000); // 中国时间 let localTime = new Date(curTime.getTime() - offset * 60 * 1000 + 8 * 60 * 60 * 1000); // 中国时间
localTime.setUTCHours(hour, 0, 0, 0); // 中国的几点 localTime.setUTCHours(hour, 0, 0, 0); // 中国的几点
return localTime.getTime() + offset * 60 * 1000 - 8 * 60 * 60 * 1000; // 回到格林威治时间 return localTime.getTime() + offset * 60 * 1000 - 8 * 60 * 60 * 1000; // 回到格林威治时间