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

邮件：循环邮件优化

Browse Source
This commit is contained in:
luying
2022-02-23 20:02:10 +08:00
parent 76fcd98c75
commit e71e1d0850
8 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/gm/handler/gmHandler.ts
+1 -11
View File
@@ -104,17 +104,7 @@ export class GmHandler {
await f.pushToUsers();
// await f.saveRecord(uid);
}
let sendTime = '';
if(isPass) {
if(timeType == MAIL_TIME_TYPE.IMMEDIATE) {
sendTime = moment().format('YYYY-MM-DD HH:mm:ss');
} else if (timeType == MAIL_TIME_TYPE.DELAY) {
sendTime = moment(startTime * 1000).format('YYYY-MM-DD HH:mm:ss');
} else if (timeType == MAIL_TIME_TYPE.CIRCLE) {
sendTime = (circleDay == 0?'每天': '每周'+circleDay) + ' ' + circleHour;
}
}
await GMMailModel.updateMailById(id, { status: isPass? GM_MAIL_STATUS.PASS: GM_MAIL_STATUS.NOT_PASS, viewAt: new Date(), viewBy: uid, sendTime }, uid);
await GMMailModel.updateMailById(id, { status: isPass? GM_MAIL_STATUS.PASS: GM_MAIL_STATUS.NOT_PASS, viewAt: new Date(), viewBy: uid }, uid);
return resResult(STATUS.SUCCESS);
}
game-server/app/servers/gm/handler/gmServerHandler.ts
-2
View File
@@ -7,8 +7,6 @@ import { RegionModel, RegionType } from '../../../db/Region';
import { gameData } from '../../../pubUtils/data';
import { Maintenance, ServerlistModel, ServerlistUpdate } from '../../../db/Serverlist';
import { nowSeconds } from '../../../pubUtils/timeUtil';
import { GM_MAIL_TYPE, MAIL_TIME_TYPE, REF_CIRCLE_MAIL_TIME } from '../../../consts';
import { SendMailFun } from '../../../services/mailService';
import { createNewServer, sendOpenServerMail } from '../../../services/gmService';
import { initAutoCreateServer, initMaintenance, stopMaintenance } from '../../../services/timeTaskService';
import { isNumber } from 'util';
game-server/app/servers/guild/handler/guildRefineHandler.ts
-3
View File
@@ -55,7 +55,6 @@ export class GuildRefineHandler {
let dicGoods = gameData.goods.get(id);
if(!dicGoods) return resResult(STATUS.DIC_DATA_NOT_FOUND);
let dicItid = ITID.get(dicGoods.itid);
console.log('####', dicItid.type, CONSUME_TYPE.DRAWING)
if(!dicItid || dicItid.type != CONSUME_TYPE.DRAWING) return resResult(STATUS.GUILD_CANNOT_REFINE_THIS);
let { guildCode: code } = userGuild;
@@ -66,10 +65,8 @@ export class GuildRefineHandler {
let { scienceTrees } = guildRefine;
let dicDevelopConsume: DicArmyDevelopConsume;
for(let scienceTree of scienceTrees) {
console.log('####', scienceTree.endTime)
if(scienceTree.endTime && scienceTree.endTime >= nowSeconds()) continue; // 没有炼完
let _dicDevelopConsume = getArmyDevelopConsumeById(scienceTree.id);
console.log('####', _dicDevelopConsume.quality, dicGoods.quality)
if(_dicDevelopConsume.quality != dicGoods.quality) continue; // 品质错误
if(!dicDevelopConsume || dicDevelopConsume.qualityLevel < _dicDevelopConsume.qualityLevel) { // 选择等级最高的
dicDevelopConsume = _dicDevelopConsume;