From 01ea13a37e03faeaa0e4121c3d9fb6432e678b01 Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Tue, 19 Jan 2021 15:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=EF=BC=9B?=
 =?UTF-8?q?=E6=88=98=E6=96=97=E8=AE=B0=E5=BD=95=E6=8C=89=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=9B=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../battle/handler/comBattleHandler.ts        |  3 ++-
 game-server/test/comBattle.test.ts            | 22 +++++++++++++++++--
 shared/db/ComBattleTeam.ts                    |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index 0e1c65396..74b3a004a 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -291,7 +291,8 @@ export class ComBattleHandler {
         let sid = session.get('sid');
         let { teamCode, isFrd } = msg;
         let teamStatus = this.teamMap.get(teamCode);
-        if (!teamStatus || teamStatus.status !== COM_TEAM_STATUS.DEFAULT || teamStatus.roleIds.length === 3) return resResult(STATUS.COM_BATTLE_MEMBER_LIMIT);
+        if (!teamStatus || teamStatus.status !== COM_TEAM_STATUS.DEFAULT) return resResult(STATUS.COM_BATTLE_TEAM_INVALID);
+        if (teamStatus.roleIds.length === 3) return resResult(STATUS.COM_BATTLE_MEMBER_LIMIT);
         if (teamStatus.roleIds.indexOf(roleId) !== -1) return resResult(STATUS.COM_BATTLE_DUP_ENTER);
         let { lv = 1, headHid = 19, topFiveCe = 0, sHid = 19 } = await Role.findByRoleId(roleId);
 
diff --git a/game-server/test/comBattle.test.ts b/game-server/test/comBattle.test.ts
index 2de8cf8e8..ee233306b 100644
--- a/game-server/test/comBattle.test.ts
+++ b/game-server/test/comBattle.test.ts
@@ -13,6 +13,8 @@ describe('寻宝创建队伍', function() {
   var pinusClient;
   var roleInfo;
 
+  const loginParm = {token:'mgn0njiajb6kapid3eekvt7tssxelig9zi2oq2bzkxr4zzi9w9', serverId: 1};
+  const createTeamParm = {blueprtId: 33001, pub: true, ceLimit: 0};
   beforeEach(function(done) {
     pinusClient = new PinusWSClient();
     pinusClient.on(PinusWSClientEvent.EVENT_IO_ERROR, (event) => {
@@ -42,7 +44,7 @@ describe('寻宝创建队伍', function() {
         // 连接成功执行函数
         console.log('gate连接成功', data);
         // done();
-        pinusClient.request('connector.entryHandler.enter', {token:'mgn0njiajb6kapid3eekvt7tssxelig9zi2oq2bzkxr4zzi9w9', serverId: 1} , (ret) => {
+        pinusClient.request('connector.entryHandler.enter', loginParm, (ret) => {
           // 消息回调
           console.log('connector返回', JSON.stringify(ret));
           roleInfo = ret.role;
@@ -57,12 +59,28 @@ describe('寻宝创建队伍', function() {
   });
 
   it('直接返回队伍', function(done) {
-    pinusClient.request('battle.comBattleHandler.createTeam', {blueprtId: 33001, pub: true, ceLimit: 0}, (res) => {
+    pinusClient.request('battle.comBattleHandler.createTeam', createTeamParm, (res) => {
       expect(res).to.be.an('object');
       expect(res.code).equal(0);
       expect(res.data).to.be.an('object');
       expect(res.data.teamCode).to.be.a('string');
       expect(res.data.roleStatus).to.be.an('array');
+      res.data.roleStatus.forEach(roleSt => {
+        expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'headHid', 'sHid', 'topFiveCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg');
+      });
+      done();
+    });
+  });
+
+  it('获取寻宝记录', function(done) {
+    pinusClient.request('battle.comBattleHandler.getTeamRec', {}, (res) => {
+      expect(res).to.be.an('object');
+      expect(res.code).equal(0);
+      expect(res.data).to.be.an('object');
+      expect(res.data.teamInfos).to.be.an('array');
+      res.data.teamInfos.forEach(info => {
+        expect(info).to.have.contains.keys('teamCode', 'roleIds', 'pub', 'blueprtId', 'quality', 'status', 'roleStatus', 'capId', 'ceLimit', 'roleCnt', 'bossHpArr', 'createdAt');
+      });
       done();
     });
   });
diff --git a/shared/db/ComBattleTeam.ts b/shared/db/ComBattleTeam.ts
index 0d7a73bb6..4f359cf5d 100644
--- a/shared/db/ComBattleTeam.ts
+++ b/shared/db/ComBattleTeam.ts
@@ -229,7 +229,7 @@ export default class ComBattleTeam extends BaseModel {
         if (isAssist) {
             query = Object.assign(query, {capId: {$ne: roleId}});
         }
-        const teams: ComBattleTeamType[] = await ComBattleTeamModel.find(query).limit(limitCnt).lean(lean);
+        const teams: ComBattleTeamType[] = await ComBattleTeamModel.find(query).limit(limitCnt).sort({createdAt: -1}).lean(lean);
         return teams;
     }