优化：减少初始以及合成武将时返回的数据

game-server/app/servers/activity/handler/gachaHandler.ts

@@ -103,7 +103,7 @@ export class GachaHandler {
         return resResult(STATUS.SUCCESS, {
             gachaId, activityId,
             freeCount, refFreeTime: userGacha.refFreeTime, count: userGacha.count, point: userGacha.point, floor, hope,
-            heroes: resultHeroes, 
+            // heroes: resultHeroes, 
             addHeros: heroes,
             result: resultList
         });
@@ -223,7 +223,7 @@ export class GachaHandler {
             turntable: userGacha.turntable,
             result: resultList,
             addHeros: heroes,
-            heroes: resultHeroes
+            // heroes: resultHeroes
         });
     }
 
@@ -468,7 +468,7 @@ export class GachaHandler {
         return resResult(STATUS.SUCCESS, {
             hasInit: !!role.gachaHasGuide,
             gachaId, 
-            heroes: resultHeroes, 
+            // heroes: resultHeroes, 
             addHeros: heroes,
             result: resultList
         });

game-server/app/servers/activity/handler/newHeroGachaHandler.ts

@@ -104,7 +104,7 @@ export class NewHeroGachaHandler {
         let commonResult = await addReward(roleId, roleName, sid, serverId, newRewardParamArr, ITEM_CHANGE_REASON.NEW_HERO_GACHA_PULL)
 
         return resResult(STATUS.SUCCESS, {
-            hid, activityId, count, randomReward: { heroes: resultHeroes, result: resultList }, commonReward: commonResult
+            hid, activityId, count, randomReward: { heroes: resultHeroes.map(cur => ({hid: cur.hid})), result: resultList }, commonReward: commonResult
 
         });
     }

game-server/app/servers/connector/handler/entryHandler.ts

@@ -6,7 +6,7 @@ import { Application, HandlerService, pinus, } from 'pinus';
 import { FrontendSession } from 'pinus';
 import { HeroModel } from './../../../db/Hero';
 import { genCode, generateStr, resResult } from '../../../pubUtils/util';
-import { COM_BTL_QUALITY, HERO_SELECT, DEBUG_MAGIC_WORD, REDIS_KEY, TASK_TYPE, ENTERY_ROLE_PICK, COUNTER, DEFAULT_LV, TA_USERSET_TYPE, LOG_TYPE } from '../../../consts';
+import { COM_BTL_QUALITY, HERO_SELECT, DEBUG_MAGIC_WORD, REDIS_KEY, TASK_TYPE, ENTERY_ROLE_PICK, COUNTER, DEFAULT_LV, TA_USERSET_TYPE, LOG_TYPE, JEWEL_SELECT, ITEM_SELECT, SKIN_SELECT } from '../../../consts';
 // import { loginRefresh } from '../../../services/playerEventService';
 import { nowSeconds, getZeroPoint } from '../../../pubUtils/timeUtil';
 import { rmRoleFromQueue, roleLeave, getRoleOnlineInfo, roleLogin } from '../../../services/redisService';
@@ -308,9 +308,9 @@ export class EntryHandler {
 
         let role = await RoleModel.findByRoleId(roleId, '-_id', true, true);
         let heros = await HeroModel.findByRole(role.roleId, [], HERO_SELECT.ENTRY, true);
-        let jewels = await JewelModel.findbyRole(role.roleId);
-        let items = await ItemModel.findbyRole(role.roleId);
-        let skins = await SkinModel.findbyRole(role.roleId);
+        let jewels = await JewelModel.findbyRole(role.roleId, JEWEL_SELECT.ENTRY);
+        let items = await ItemModel.findbyRole(role.roleId, ITEM_SELECT.ENTRY);
+        let skins = await SkinModel.findbyRole(role.roleId, SKIN_SELECT.ENTRY);
 
         role['heros'] = heros.map(hero => new HeroParam(hero));
         role['jewels'] = jewels;

game-server/app/servers/role/handler/friendHandler.ts

@@ -1,6 +1,6 @@
 import { Application, BackendSession, ChannelService, HandlerService, } from "pinus";
 import { resResult, getRandEelm, getResStr, shouldRefresh, sortArrRandom, checkRoleIsRobot, getRobotSysType, makeRobotId, parseNumberList } from "../../../pubUtils/util";
-import { STATUS, ROLE_SELECT, FRIEND_DROP_TYPE, FRIEND_RELATION_TYPE, POPULATE_TYPE, BLOCK_OPEATE, CONSUME_TYPE, ITID, HERO_SELECT, EQUIP_SELECT, REDIS_KEY, MSG_SOURCE, MSG_TYPE, TASK_TYPE, ROBOT_SYS_TYPE, ITEM_CHANGE_REASON } from "../../../consts";
+import { STATUS, ROLE_SELECT, FRIEND_DROP_TYPE, FRIEND_RELATION_TYPE, POPULATE_TYPE, BLOCK_OPEATE, CONSUME_TYPE, ITID, HERO_SELECT, REDIS_KEY, MSG_SOURCE, MSG_TYPE, TASK_TYPE, ROBOT_SYS_TYPE, ITEM_CHANGE_REASON } from "../../../consts";
 import { RoleModel, RoleType } from "../../../db/Role";
 import { getTimeFun, getZeroPointD } from "../../../pubUtils/timeUtil";
 import { FriendApplyModel } from "../../../db/FriendApply";

game-server/app/servers/role/handler/heroHandler.ts

@@ -56,7 +56,7 @@ export class HeroHandler {
         let { heroes, resultHeroes } = await createHero(roleId, roleName, sid, serverId, { hid, count: 1 });
 
         pushComposeOrangeHero(roleId, roleName, serverId, resultHeroes[0]);
-        return resResult(STATUS.SUCCESS, { curHero: new HeroParam(resultHeroes[0]), addHeros: heroes });
+        return resResult(STATUS.SUCCESS, { curHero: {hid}, addHeros: heroes });
     }
 
     // 武将升级

game-server/app/services/connectorService.ts

@@ -8,7 +8,7 @@ import { getCurTask, getPvpTask } from './task/taskService';
 import { RoleType } from '../db/Role';
 import { Application, FrontendOrBackendSession, pinus, RpcClient } from 'pinus';
 import { resResult } from '../pubUtils/util';
-import { STATUS, PUSH_BATCH, PUSH_INTERVAL, CONSUME_TYPE, HERO_SELECT, ENTERY_ROLE_PICK } from '../consts';
+import { STATUS, PUSH_BATCH, PUSH_INTERVAL, CONSUME_TYPE, HERO_SELECT, ENTERY_ROLE_PICK, JEWEL_SELECT, ITEM_SELECT, SKIN_SELECT } from '../consts';
 import { getAllShopList } from './shopService';
 import { getGeneralRank, getRankFirstReward } from './rankService';
 import { getFriendList, getApplyList } from './friendService';
@@ -109,9 +109,9 @@ async function getModuleData(type: string, data: { role: RoleType, session: Fron
     switch (type) {
         case 'role': 
             let heros = await HeroModel.findByRole(role.roleId, [], HERO_SELECT.ENTRY, true);
-            let jewels = await JewelModel.findbyRole(role.roleId);
-            let items = await ItemModel.findbyRole(role.roleId);
-            let skins = await SkinModel.findbyRole(role.roleId);
+            let jewels = await JewelModel.findbyRole(role.roleId, JEWEL_SELECT.ENTRY);
+            let items = await ItemModel.findbyRole(role.roleId, ITEM_SELECT.ENTRY);
+            let skins = await SkinModel.findbyRole(role.roleId, SKIN_SELECT.ENTRY);
 
             role['heros'] = heros.map(hero => new HeroParam(hero));
             role['jewels'] = jewels;

game-server/app/services/role/rewardService.ts

@@ -10,7 +10,7 @@ import { gameData } from '../../pubUtils/data';
 import { uniq } from 'underscore';
 import { EPlace, HeroModel, HeroType, HeroUpdate } from '../../db/Hero';
 import { Figure } from '../../domain/dbGeneral';
-import { CreateHeroParam, HeroShowParam } from '../../domain/roleField/hero';
+import { CreateHeroParam, HeroShowParam, JewelParam } from '../../domain/roleField/hero';
 import { HeroSkin } from '../../db/Hero';
 import { errlogger } from '../../util/logger';
 import { BAG } from '../../pubUtils/dicParam';
@@ -399,9 +399,7 @@ export async function addJewels(roleId: string, roleName: string, jewels: { id:
     }
 
     const jewelResult = await JewelModel.createJewels(roleId, jewelInfo);
-    return { jewels: jewelResult.map(jewel => {
-        return { ...jewel, count: 1, inc: 1, reason }
-    })}
+    return { jewels: jewelResult.map(jewel => new JewelParam(jewel, true, reason))}
 }
 
 export async function getAddJewelInfo(roleId: string, roleName: string, jewel: { id: number, }) {