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

拍卖行：显示时间

Browse Source
This commit is contained in:
luying
2021-10-25 14:15:21 +08:00
parent 254648610f
commit 411e1bcf2d
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/auctionService.ts
+18 -3
View File
@@ -2,8 +2,8 @@ import { DividendModel } from './../db/Dividend';
import { LOT_CODE_LEN, AUCTION_STAGE, AUCTION_TIME, DIVIDEND_CODE_LEN, DIVIDEND_STATUS, LOT_STATUS, MAIL_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, DIVIDENDMAXRATIO, DIVIDENDPOSITIONMAXRATIO, ROLE_RECEIVE_STATUS, AUCTION_BID_STATUS, DEBUG_MAGIC_WORD, AUCTION_SOURCE } from './../consts'; import { LOT_CODE_LEN, AUCTION_STAGE, AUCTION_TIME, DIVIDEND_CODE_LEN, DIVIDEND_STATUS, LOT_STATUS, MAIL_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, DIVIDENDMAXRATIO, DIVIDENDPOSITIONMAXRATIO, ROLE_RECEIVE_STATUS, AUCTION_BID_STATUS, DEBUG_MAGIC_WORD, AUCTION_SOURCE } from './../consts';
import { DividendRec, ItemReward } from "../domain/dbGeneral"; import { DividendRec, ItemReward } from "../domain/dbGeneral";
import { genCode, getRandSingleEelm } from '../pubUtils/util'; import { genCode, getRandSingleEelm } from '../pubUtils/util';
import { LotModel, LotParam } from '../db/Lot'; import { LotModel, LotParam, LotType } from '../db/Lot';
import { getCurDay, getTimeFunD, getTimeFunM } from '../pubUtils/timeUtil'; import { getCurDay, getTimeFunD, getTimeFunM, nowSeconds } from '../pubUtils/timeUtil';
import { gameData, getGoodById } from '../pubUtils/data'; import { gameData, getGoodById } from '../pubUtils/data';
import { DividendParam, DividendType } from '../db/Dividend'; import { DividendParam, DividendType } from '../db/Dividend';
import { sendMailByContent } from './mailService'; import { sendMailByContent } from './mailService';
@@ -44,12 +44,24 @@ export async function officialAuctionLots(session: FrontendOrBackendSession, beg
const serverId = session.get('serverId'); const serverId = session.get('serverId');
const guildCode = session.get('guildCode'); const guildCode = session.get('guildCode');
const stage = await auctionStage(); const stage = await auctionStage();
let lots = []; let lots: LotType[] = [];
if (stage === AUCTION_STAGE.DEFAULT || stage === AUCTION_STAGE.GUILD) { if (stage === AUCTION_STAGE.DEFAULT || stage === AUCTION_STAGE.GUILD) {
lots = await LotModel.findGuildLotsByBegin(guildCode, begin); lots = await LotModel.findGuildLotsByBegin(guildCode, begin);
} else if (stage === AUCTION_STAGE.WORLD) { } else if (stage === AUCTION_STAGE.WORLD) {
lots = await LotModel.findWorldLotsByBegin(serverId, begin); lots = await LotModel.findWorldLotsByBegin(serverId, begin);
} }
if(dicParam.SERVER_DEBUG_MODE.CURRENT_TIME == 1) {
let current = await getCurrentTime();
if(Math.floor(current/1000) != nowSeconds()) {
lots = lots.map(cur => {
cur.begin.setHours(20, 20, 0, 0);
cur.end.setHours(22, 0, 0, 0);
return {...cur, begin: cur.begin, end: cur.end}
});
}
}
return lots; return lots;
} }
@@ -261,6 +273,7 @@ export async function startGuildAuction() {
let day = getCurDay(); let day = getCurDay();
let time = <number>getTimeFunM().getTimeWithWeek(day, 20, 20, 0); let time = <number>getTimeFunM().getTimeWithWeek(day, 20, 20, 0);
pinus.app.rpc.guild.guildActivityRemote.setCurrentTime.broadcast(time); pinus.app.rpc.guild.guildActivityRemote.setCurrentTime.broadcast(time);
await pushCurrentTime(time);
} }
return true; return true;
@@ -282,6 +295,7 @@ export async function startWorldAuction() {
let day = getCurDay(); let day = getCurDay();
let time = <number>getTimeFunM().getTimeWithWeek(day, 20, 40, 0); let time = <number>getTimeFunM().getTimeWithWeek(day, 20, 40, 0);
pinus.app.rpc.guild.guildActivityRemote.setCurrentTime.broadcast(time); pinus.app.rpc.guild.guildActivityRemote.setCurrentTime.broadcast(time);
await pushCurrentTime(time);
} }
return true; return true;
} catch (e) { } catch (e) {
@@ -301,6 +315,7 @@ export async function stopAuction() {
let day = getCurDay(); let day = getCurDay();
let time = <number>getTimeFunM().getTimeWithWeek(day, 22, 0, 0); let time = <number>getTimeFunM().getTimeWithWeek(day, 22, 0, 0);
pinus.app.rpc.guild.guildActivityRemote.setCurrentTime.broadcast(time); pinus.app.rpc.guild.guildActivityRemote.setCurrentTime.broadcast(time);
await pushCurrentTime(time);
} }
return true; return true;
} catch (e) { } catch (e) {