From 90e729b68612bff1cdf04f552e67e5bfb3c00dca Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 7 Jun 2022 13:31:20 +0800 Subject: [PATCH 1/8] =?UTF-8?q?jenkins=EF=BC=9Adebug=E7=94=A8=E6=8B=8D?= =?UTF-8?q?=E5=8D=96=E8=A1=8C=E6=B5=8B=E8=AF=95=E5=87=BA=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/guild/handler/auctionHandler.ts | 6 +++--- game-server/app/services/auctionService.ts | 4 +++- game-server/test/auction.test.ts | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) 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..3962820ca 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, 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, max: true, magicWord: DEBUG_MAGIC_WORD }, (res) => { checkSuccessResponse(res); checkLot(res.data.lot); if(res.data.dividend) { From a283d8c32773a677dac149709ebf1b32c77072b1 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 7 Jun 2022 13:33:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?jenkins=EF=BC=9A=E6=8B=8D=E5=8D=96=E8=A1=8C?= =?UTF-8?q?offer=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/test/auction.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game-server/test/auction.test.ts b/game-server/test/auction.test.ts index 3962820ca..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, magicWord: DEBUG_MAGIC_WORD }, (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, magicWord: DEBUG_MAGIC_WORD }, (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) { From 44ec199b7050f7adb9088fdef068ae64794163cf Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 7 Jun 2022 13:55:51 +0800 Subject: [PATCH 3/8] =?UTF-8?q?jenkins=EF=BC=9A=E6=AF=8F=E6=97=A5=E5=85=B3?= =?UTF-8?q?=E5=8D=A1=E4=BF=9D=E5=BA=95=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/test/battle.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game-server/test/battle.test.ts b/game-server/test/battle.test.ts index f589e7c3b..298639e94 100644 --- a/game-server/test/battle.test.ts +++ b/game-server/test/battle.test.ts @@ -119,7 +119,7 @@ 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) { From c612ded6076868e701aa4b41769e6749511a9309 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 7 Jun 2022 14:03:07 +0800 Subject: [PATCH 4/8] =?UTF-8?q?jenkins:=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/test/battle.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/game-server/test/battle.test.ts b/game-server/test/battle.test.ts index 298639e94..074ce7871 100644 --- a/game-server/test/battle.test.ts +++ b/game-server/test/battle.test.ts @@ -129,6 +129,7 @@ describe('战斗测试', function () { } } } + console.log('#####', dailyList, type, battleId) pinusClient.request('battle.dailyBattleHandler.debugResetNum', { magicWord: DEBUG_MAGIC_WORD, type }, (res) => { checkSuccessResponse(res, false); checkBattle(pinusClient, paramHeroes, battleId, 'daily', data => { From 63d7b3463704b19e3bc35f7578f93b922905768f Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 7 Jun 2022 14:16:48 +0800 Subject: [PATCH 5/8] =?UTF-8?q?jenkins:=20=E6=AF=8F=E6=97=A5=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/dailyBattleHandler.ts | 3 +-- game-server/test/battle.test.ts | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) 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/test/battle.test.ts b/game-server/test/battle.test.ts index 074ce7871..298639e94 100644 --- a/game-server/test/battle.test.ts +++ b/game-server/test/battle.test.ts @@ -129,7 +129,6 @@ describe('战斗测试', function () { } } } - console.log('#####', dailyList, type, battleId) pinusClient.request('battle.dailyBattleHandler.debugResetNum', { magicWord: DEBUG_MAGIC_WORD, type }, (res) => { checkSuccessResponse(res, false); checkBattle(pinusClient, paramHeroes, battleId, 'daily', data => { From 779e68e9c2e5eeb5431c64001ece350e2cc55ff3 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 7 Jun 2022 14:47:13 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=85=BB=E6=88=90=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=87=8D=E7=94=9F=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=9A?= =?UTF-8?q?=E6=89=A3=E9=99=A4=E5=85=83=E5=AE=9D=E4=BD=86=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E9=87=8D=E7=94=9F=E6=88=90=E5=8A=9F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/role/calCe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game-server/app/services/role/calCe.ts b/game-server/app/services/role/calCe.ts index 6dd05f9e1..dea778c72 100644 --- a/game-server/app/services/role/calCe.ts +++ b/game-server/app/services/role/calCe.ts @@ -696,7 +696,7 @@ class CalCeData { } public getEquipAttrsByHid(hid: number) { - let keys = this.equipAttrsByHid.get(hid); + let keys = this.equipAttrsByHid.get(hid)||[]; return keys.map(key => this.equipAttrs.get(key)); } From 6505f5021ebfbd46b8cf4c70faff178e99e93609 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 7 Jun 2022 15:39:58 +0800 Subject: [PATCH 7/8] =?UTF-8?q?jenkins:=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/test/battle.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/game-server/test/battle.test.ts b/game-server/test/battle.test.ts index 298639e94..13a5f0af4 100644 --- a/game-server/test/battle.test.ts +++ b/game-server/test/battle.test.ts @@ -622,6 +622,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'); From ad2e176550f4ce55f2dbe282736d7b93b3a762e5 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 7 Jun 2022 15:54:29 +0800 Subject: [PATCH 8/8] =?UTF-8?q?jenkins:=20=E6=AF=8F=E6=97=A5=E5=85=B3?= =?UTF-8?q?=E5=8D=A1=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/test/battle.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game-server/test/battle.test.ts b/game-server/test/battle.test.ts index 13a5f0af4..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 = 1, battleId = 3001; + let type = 1; + battleId = 3001; for(let data of dailyList) { for(let war of data.wars) { if(war.status != 0) {