练兵场：fix压制成功战报

game-server/app/servers/battle/handler/comBattleHandler.ts

@@ -19,7 +19,7 @@ import { checkRoleInQueue, rmRoleFromQueue, setTeamSearchReq } from '../../../se
 import { getRandBlueprtId, clearComBtlTimer, getAssistTimesByQuality, getFrd, updateRobotHurtByTime, comBtlLvInvalid, clearRobotHurtTimer, setDismissTimer, dismissTeam, incEquipPrintDrop, randEquipPrintId, handleComBtlProgress, getComBattleFriendAdd, teammateInBlackList, blueprtIdValid, createComTeamData, hasEnoughBlueprt, addRoleToTeam, addRoleStToTeam, addValidSearchingRoles, validToJoin, addRobotsToTeam, addRobotsLater, teamIsFullToStart, oneTeamNotInBlack } from '../../../services/comBattleService';
 import { setAp } from '../../../services/actionPointService';
 import { roleLevelup } from '../../../services/normalBattleService';
-import { addUserToChannel } from '../../../services/roleService';
+import { addUserToChannel, getSimpleRoleInfo } from '../../../services/roleService';
 import { ChannelUser } from '../../../domain/ChannelUser';
 import { pushComBtlTeamMsg, pushFriendTeamInviteMsg, pushNormalItemMsg, pushTeamInviteMsg } from '../../../services/chatService';
 import { EXTERIOR } from '../../../pubUtils/dicParam';
@@ -694,7 +694,9 @@ export class ComBattleHandler {
         const { teamCode, targetRoleId } = msg;
         const msgData = await pushFriendTeamInviteMsg(roleId, roleName, teamCode, targetRoleId);
         if (!msgData) return resResult(STATUS.WRONG_PARMS);
-        return resResult(STATUS.SUCCESS, msgData);
+        const roleInfo = await getSimpleRoleInfo(targetRoleId);
+
+        return resResult(STATUS.SUCCESS, {...msgData, roleInfo});
     }
 
     /**

game-server/app/servers/battle/handler/guildTrainHandler.ts

@@ -235,11 +235,13 @@ export class GuildTrainHandler {
                 }
                 let progress = instance.progress;
                 guildTrain = await GuildTrainModel.updateGuildTrainProgress(code, trainId, hid, progress, ranks, isComplete);
+                
+                //type 1：失败， 2：成功，3：表示系统战报即：被成功压制
+                reports.push({ type: 3, time:nowSeconds(), score: addScore, roleName, trainId, hid, difficulty: battleRecord.record.difficulty });
+                pushGuildTrainSucMsg(roleId, roleName, code, hid);
+                
                 if (needLockNext) { 
-                    //type 1：失败， 2：成功，3：表示系统战报即：被成功压制
-                    reports.push({ type: 3, time:nowSeconds(), score: addScore, roleName, trainId, hid, difficulty: battleRecord.record.difficulty });
                     guildTrain = await unlockTrain(code, trainId + 1);
-                    pushGuildTrainSucMsg(roleId, roleName, code, hid);
                 }
                 res.releaseCallback();//解锁
             } else {

shared/resource/jsons/dic_army_trainRecord.json

@@ -9,6 +9,6 @@
     },
     {
         "id": 3,
-        "str": "军团据点%d被压制成功，对应试炼宝藏已成功开启，请各位成为前往领取奖励"
+        "str": "军团据点%d被压制成功，对应据点宝藏已成功开启，请各位成为前往领取奖励"
     }
 ]