diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index 69bb84e7d..26c27762c 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -139,7 +139,7 @@ export class GachaHandler { } return resResult(STATUS.SUCCESS, { gachaId, activityId, - freeCount, refFreeTime: resultRefFreeTime, count, point, floor, + freeCount, refFreeTime: resultRefFreeTime, count, point, floor, hope, heroes, result: resultList }); } diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts index 37a8ba929..df41becde 100644 --- a/game-server/app/servers/role/handler/friendHandler.ts +++ b/game-server/app/servers/role/handler/friendHandler.ts @@ -10,7 +10,7 @@ import { FriendRelationModel, Relation } from "../../../db/FriendRelation"; import { isRoleOnline, getServerName, getRoleOnlineInfo } from "../../../services/redisService"; import { increaseFrdCnt, getRecommendType, sortByBeSentHeart } from "../../../services/friendService"; import { FriendPointModel } from "../../../db/FriendPoint"; -import { gameData } from "../../../pubUtils/data"; +import { gameData, getDicFriendByLv } from "../../../pubUtils/data"; import { addItems, handleCost } from "../../../services/rewardService"; import { getFriendPointObject } from "../../../pubUtils/itemUtils"; import { RewardInter } from "../../../pubUtils/interface"; @@ -509,7 +509,7 @@ export class FriendHandler { let canSendList = await sortByBeSentHeart(roleId, arr); let {lv} = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV); - let dicFriendLv = gameData.roleFriend.get(lv); + let dicFriendLv = getDicFriendByLv(lv); if(!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND); // 情谊值有上限,送到上限为止 @@ -576,7 +576,7 @@ export class FriendHandler { let canReceiveList = await sortByBeSentHeart(roleId, arr); let {lv} = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV); - let dicFriendLv = gameData.roleFriend.get(lv); + let dicFriendLv = getDicFriendByLv(lv); if(!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND); // 情谊值有上限,到上限为止