diff --git a/game-server/app/servers/battle/handler/dailyBattleHandler.ts b/game-server/app/servers/battle/handler/dailyBattleHandler.ts index dfafd37a2..8792cc2ff 100644 --- a/game-server/app/servers/battle/handler/dailyBattleHandler.ts +++ b/game-server/app/servers/battle/handler/dailyBattleHandler.ts @@ -64,8 +64,7 @@ export class DailyBattleHandler { return resResult(STATUS.TOKEN_ERR); } let roleId = session.get('roleId'); - await DailyRecordModel.increseBuyCount(roleId, type, 1); - await DailyRecordModel.increseDailyCount(roleId, type, -1); // 减次数,避免超出每日购买最大次数 + await DailyRecordModel.deleteAccount(roleId); return resResult(STATUS.SUCCESS); } } \ No newline at end of file diff --git a/game-server/app/servers/guild/handler/auctionHandler.ts b/game-server/app/servers/guild/handler/auctionHandler.ts index 487f9b57e..83638d2a1 100644 --- a/game-server/app/servers/guild/handler/auctionHandler.ts +++ b/game-server/app/servers/guild/handler/auctionHandler.ts @@ -46,8 +46,8 @@ export class AuctionHandler { } - async offer(msg: { code: string, max: boolean, auctionStage: number }, session: BackendSession) { - const { code, max, auctionStage } = msg; + async offer(msg: { code: string, max: boolean, auctionStage: number, magicWord: string }, session: BackendSession) { + const { code, max, auctionStage, magicWord } = msg; const roleId = session.get('roleId'); const sid = session.get('sid'); const serverId = session.get('serverId'); @@ -71,7 +71,7 @@ export class AuctionHandler { return resResult(STATUS.AUCTION_GUILD_MEMBER_ONLY); } - if(!await checkAuctionStage(auctionStage)) { + if(!await checkAuctionStage(auctionStage, magicWord)) { res.releaseCallback(); return resResult(STATUS.AUCITON_STAGE_ERR); } diff --git a/game-server/app/services/auctionService.ts b/game-server/app/services/auctionService.ts index 276a6b48a..b7736bfe8 100644 --- a/game-server/app/services/auctionService.ts +++ b/game-server/app/services/auctionService.ts @@ -515,7 +515,9 @@ export async function pushAuctionUpdate(lots: LotType[], dividends: DividendType } -export async function checkAuctionStage(auctionStage: number) { +export async function checkAuctionStage(auctionStage: number, magicWord: string) { + if(magicWord == DEBUG_MAGIC_WORD) return true + const curTime = await getCurrentTimeWithSetDay(); if(auctionStage != AUCTION_STAGE.GUILD && auctionStage != AUCTION_STAGE.WORLD) return false; if(auctionStage == AUCTION_STAGE.GUILD) { diff --git a/game-server/test/auction.test.ts b/game-server/test/auction.test.ts index fe7cfb559..7babd8846 100644 --- a/game-server/test/auction.test.ts +++ b/game-server/test/auction.test.ts @@ -129,7 +129,7 @@ describe('拍卖行测试', function () { done(); return; } - pinusClient.request('guild.auctionHandler.offer', { code: unsoldLots[0].code, max: false }, (res) => { + pinusClient.request('guild.auctionHandler.offer', { code: unsoldLots[0].code, auctionStage: AUCTION_STAGE.GUILD, max: false, magicWord: DEBUG_MAGIC_WORD }, (res) => { checkSuccessResponse(res); checkLot(res.data.lot); if (res.data.dividend) { @@ -144,7 +144,7 @@ describe('拍卖行测试', function () { return; } gid = unsoldLots[0].gid; - pinusClient.request('guild.auctionHandler.offer', { code: unsoldLots[0].code, max: true }, (res) => { + pinusClient.request('guild.auctionHandler.offer', { code: unsoldLots[0].code, auctionStage: AUCTION_STAGE.GUILD, max: true, magicWord: DEBUG_MAGIC_WORD }, (res) => { checkSuccessResponse(res); checkLot(res.data.lot); if(res.data.dividend) { diff --git a/game-server/test/battle.test.ts b/game-server/test/battle.test.ts index f589e7c3b..f81b33a2c 100644 --- a/game-server/test/battle.test.ts +++ b/game-server/test/battle.test.ts @@ -119,7 +119,8 @@ describe('战斗测试', function () { }); it('每日关卡开始战斗', function (done) { - let type; + let type = 1; + battleId = 3001; for(let data of dailyList) { for(let war of data.wars) { if(war.status != 0) { @@ -622,6 +623,7 @@ function checkActorData(actordata) { } function battleEnd(pinusClient, heroes, battleId, battleCode, type, cb) { + console.log('#### battleEnd', battleId) pinusClient.request('battle.normalBattleHandler.battleEnd', { battleId, battleCode, heroes, isSuccess: true, stars: [1,1,1] }, (res) => { checkSuccessResponse(res); expect(res.data.battleId).to.be.a('number');