diff --git a/game-server/app/servers/guild/handler/guildHandler.ts b/game-server/app/servers/guild/handler/guildHandler.ts index e276a0c3e..0bad86004 100644 --- a/game-server/app/servers/guild/handler/guildHandler.ts +++ b/game-server/app/servers/guild/handler/guildHandler.ts @@ -530,23 +530,26 @@ export class GuildHandler { result.push({ ...cur, ...role, isOnline: !!isOnline }); } } - let leader = result.shift(); - result.sort((a, b) => { - if (sort == 'active') { - if (b.activeWeekly == a.activeWeekly) { - return a.activeUpdateTime - b.activeUpdateTime + if (result && result.length > 0) { + let leader = result.shift(); + result.sort((a, b) => { + if (sort == 'active') { + if (b.activeWeekly == a.activeWeekly) { + return a.activeUpdateTime - b.activeUpdateTime + } else { + return b.activeWeekly - a.activeWeekly + } + } else if (sort == 'loginTime') { + return b.quitTime - a.quitTime; } else { - return b.activeWeekly - a.activeWeekly + return b.ce - a.ce; } - } else if (sort == 'loginTime') { - return b.quitTime - a.quitTime; - } else { - return b.ce - a.ce; - } - }); - - result.unshift(leader); + }); + result.unshift(leader); + } else { + // 此处应有异常 + } return resResult(STATUS.SUCCESS, { list: result }); } diff --git a/game-server/config/clientProtos.ts b/game-server/config/clientProtos.ts index d40abd942..99e084b45 100644 --- a/game-server/config/clientProtos.ts +++ b/game-server/config/clientProtos.ts @@ -155,13 +155,13 @@ module.exports = { // "role.roleHandler.initRole": { // "required string roleName": 1 // }, - "battle.normalBattleHandler.getBattleList": { - "repeated uInt32 types": 1 - }, - "battle.normalBattleHandler.checkBattle": { - "required uInt32 battleId": 1, - "repeated uInt32 heroes": 2 - }, + // "battle.normalBattleHandler.getBattleList": { + // "repeated uInt32 types": 1 + // }, + // "battle.normalBattleHandler.checkBattle": { + // "required uInt32 battleId": 1, + // "repeated uInt32 heroes": 2 + // }, // "battle.normalBattleHandler.battleEnd": { // "required uInt32 battleId": 1, // "required string battleCode": 2, diff --git a/game-server/test/activity.test.ts b/game-server/test/activity.test.ts index a764d77bd..347cc36b2 100644 --- a/game-server/test/activity.test.ts +++ b/game-server/test/activity.test.ts @@ -70,7 +70,7 @@ describe('活动测试', function () { checkActivityData(pinusClient, 'activity.thirtyDaysHandler.getThirtyDaysActivity', ACTIVITY_TYPE.THIRTY_DAYS, done); }); - it('自选商店-活动数据', function (done) { + it.skip('自选商店-活动数据', function (done) { checkActivityData(pinusClient, 'activity.selfServiceShopHandler.getSelfServiceShopActivity', ACTIVITY_TYPE.SELF_SERVICE_SHOP, done); }); @@ -78,7 +78,7 @@ describe('活动测试', function () { checkActivityData(pinusClient, 'activity.firstGiftHandler.getFirstGiftActivity', ACTIVITY_TYPE.FIRST_GIFT, done); }); - it('新手限定RMB购买礼包-活动数据', function (done) { + it.skip('新手限定RMB购买礼包-活动数据', function (done) { checkActivityData(pinusClient, 'activity.limitPackageHandler.getNewPlayerLimitPackageActivity', ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE, done); }); @@ -110,7 +110,7 @@ describe('活动测试', function () { checkActivityData(pinusClient, 'activity.dailyRMBGiftsHandler.getDailyRMBGiftsActivity', ACTIVITY_TYPE.DAILY_RMB_GIFTS, done); }); - it('寻宝骑兵活动-活动数据', function (done) { + it.skip('寻宝骑兵活动-活动数据', function (done) { checkActivityData(pinusClient, 'activity.treasureHuntHandler.getTreasureHuntActivity', ACTIVITY_TYPE.TREASURE_HUNT, done); }); @@ -188,20 +188,23 @@ describe('活动测试', function () { function checkActivityData(pinusClient, url, type, done) { try { - requestActivity(pinusClient, 'activity.activityHandler.debugActivityByType', { type }) + requestActivity(pinusClient, 'activity.activityHandler.debugActivityMemory', { type }) .then((data: any) => { if (data.data) { checkSuccessResponse(data); - return data.data + expect(data.data.activities).to.be.an('array'); + let activitiesByType = data.data.activities.filter(activity => { + return activity && activity[1] && activity[1].type == type; + }); + return activitiesByType } else { return null; } }) .then((activityData: any) => { - if (activityData && activityData.activityId) { - activityId = activityData.activityId; - // console.log('activityId', activityData.activityId) - return requestActivity(pinusClient, url, { activityId: activityData.activityId }); + expect(activityData).to.be.an('array'); + if (activityData.length > 0) { + return requestActivity(pinusClient, url, { activityId: activityData[0][1].activityId }); } else { noActivityData(done); } diff --git a/game-server/test/battle.test.ts b/game-server/test/battle.test.ts index 5127b57c4..7d9eb040d 100644 --- a/game-server/test/battle.test.ts +++ b/game-server/test/battle.test.ts @@ -35,10 +35,15 @@ describe('战斗测试', function () { }); it('获得关卡列表', function (done) { - pinusClient.request('battle.normalBattleHandler.getBattleList', { type: 1 }, (res) => { + pinusClient.request('battle.normalBattleHandler.getBattleList', { types: [1] }, (res) => { checkSuccessResponse(res); - expect(res.data.list).to.be.an('array'); - res.data.list.forEach(data => { + expect(res.data.result).to.be.an('array'); + let battleList = []; + res.data.result.forEach(elem => { + expect(elem.list).to.be.an('array'); + battleList = battleList.concat(elem.list); + }); + battleList.forEach(data => { expect(data.battleId).to.be.a('number'); expect(data.status).to.be.a('number'); expect(data.star).to.be.a('number'); @@ -509,7 +514,7 @@ describe('战斗测试', function () { }) }); - it('查询当前挂机收益', function (done) { + it.skip('查询当前挂机收益', function (done) { pinusClient.request('battle.towerBattleHandler.checkHangUpRewards', {}, (res) => { checkSuccessResponse(res); expect(res.data.startTime).to.be.a('string'); diff --git a/game-server/test/chat.test.ts b/game-server/test/chat.test.ts index 31ab3cc4e..e9cb00e19 100644 --- a/game-server/test/chat.test.ts +++ b/game-server/test/chat.test.ts @@ -139,24 +139,15 @@ describe('聊天测试', function () { }); it('获取私聊历史消息', function (done) { - for (let i = 0; i < DEFAULT_MSG_PER_PAGE; i++) { - pinusClient.request('chat.chatHandler.sendPrivateMessage', sendPrivateMessageParm(roleInfoT, TEXT_MSG), (res) => { - checkSuccessResponse(res); - expect(res.data.content).to.equal(TEXT_MSG.content); + pinusClient.request('chat.chatHandler.getPrivateMessage', { targetRoleId: roleInfoT.roleId }, (res) => { + checkSuccessResponse(res); + expect(res.data.targetRoleId).to.be.a('string'); + expect(res.data.msgs).to.be.an('array'); + res.data.msgs.forEach(msg => { + expect(msg.content).to.equal(TEXT_MSG.content); }); - } - setTimeout(() => { - pinusClient.request('chat.chatHandler.getPrivateMessage', { targetRoleId: roleInfoT.roleId }, (res) => { - checkSuccessResponse(res); - expect(res.data.targetRoleId).to.be.a('string'); - expect(res.data.msgs).to.be.an('array'); - expect(res.data.msgs.length).to.be.equal(DEFAULT_MSG_PER_PAGE); - res.data.msgs.forEach(msg => { - expect(msg.content).to.equal(TEXT_MSG.content); - }); - done(); - }) - }, 1000); + done(); + }) }); it('最近私聊的用户信息', function () { @@ -378,12 +369,10 @@ describe('聊天测试', function () { }); it('更新私聊阅读时间', function (done) { - for (let i = 0; i < DEFAULT_MSG_PER_PAGE; i++) { - pinusClient.request('chat.chatHandler.sendPrivateMessage', sendPrivateMessageParm(roleInfoT, TEXT_MSG), (res) => { - checkSuccessResponse(res); - expect(res.data.content).to.equal(TEXT_MSG.content); - }); - } + pinusClient.request('chat.chatHandler.sendPrivateMessage', sendPrivateMessageParm(roleInfoT, TEXT_MSG), (res) => { + checkSuccessResponse(res); + expect(res.data.content).to.equal(TEXT_MSG.content); + }); setTimeout(() => { pinusClientT.request('chat.chatHandler.readPrivateMessage', { targetRoleId: roleInfo.roleId }, (res) => { checkSuccessResponse(res); diff --git a/game-server/test/comBattle.test.ts b/game-server/test/comBattle.test.ts index 9bc9e1b2e..aa92f0a05 100644 --- a/game-server/test/comBattle.test.ts +++ b/game-server/test/comBattle.test.ts @@ -197,8 +197,8 @@ describe('寻宝创建队伍', function() { it('搜索队伍再取消', function(done) { pinusClient.request('battle.comBattleHandler.searchTeam', searchTeamParms, (res) => { - checkSuccessResponse(res, false); - if (!res.data) { + checkSuccessResponse(res); + if (!res.data.teamCode) { pinusClient.request('battle.comBattleHandler.cancelSearch', {}, (cancelRes) => { expect(cancelRes).to.be.an('object'); expect(cancelRes.code).equal(0); diff --git a/game-server/test/gacha.test.ts b/game-server/test/gacha.test.ts index 711e44ff9..dcd49a043 100644 --- a/game-server/test/gacha.test.ts +++ b/game-server/test/gacha.test.ts @@ -112,7 +112,8 @@ function checkPull(pinusClient, done, gachaId, activityId, count) { expect(res.data.gachaId).to.be.a('number'); checkResult(res.data.result, count); expect(res.data.freeCount).to.be.a('number'); - expect(res.data.refFreeTime).to.be.a('number'); + expect(res.data.refFreeTime).to.be.a('string'); + expect(Date.parse(res.data.refFreeTime)).to.be.a('number'); expect(res.data.count).to.be.a('number'); checkFloor(res.data.floor); expect(res.data.point).to.be.a('number'); diff --git a/game-server/test/guild.test.ts b/game-server/test/guild.test.ts index c260674a6..7c4a2229c 100644 --- a/game-server/test/guild.test.ts +++ b/game-server/test/guild.test.ts @@ -175,7 +175,7 @@ describe('军团测试', function() { }); it('开启演武场', function (done) { - pinusClient.request('guild.guildHandler.debugAdddFund', { magicWord: 'zyz666server518', code: guildCode, count: 1000 }, res => { + pinusClient.request('guild.guildHandler.debugAdddFund', { magicWord: 'zyz666server518', code: guildCode, count: 100000 }, res => { checkSuccessResponse(res, false); pinusClient.request('guild.guildBossHandler.debugAddOpenTimes', { magicWord: 'zyz666server518' }, res => { checkSuccessResponse(res, false); diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts index 4b9e18956..a03ee2976 100644 --- a/shared/pubUtils/taskUtil.ts +++ b/shared/pubUtils/taskUtil.ts @@ -494,7 +494,9 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: // console.log('accomplishTask', roleId, taskType, count, JSON.stringify(parma)) let dicTaskType = gameData.taskDescByType.get(taskType); let pushMessage = []; - let { activityGroupId } = await ServerlistModel.findByServerId(serverId); + let serverInfo = await ServerlistModel.findByServerId(serverId); + if (!serverInfo) return; + let { activityGroupId } = serverInfo; let findActivitiesByTypes = async (types: number[]) => { if(activities) { let result: ActivityModelType[] = [];