diff --git a/game-server/app/services/battleService.ts b/game-server/app/services/battleService.ts index 12b4b68d9..6097b81ba 100644 --- a/game-server/app/services/battleService.ts +++ b/game-server/app/services/battleService.ts @@ -8,7 +8,6 @@ import { shouldRefresh, resResult, cal, getRandEelmWithWeight, genCode, } from ' import { STATUS } from '../consts/statusCode'; import { HangUpSpdUpRecModel } from '../db/HangUpSpdUpRec'; import { TaskHero, TowerTaskRecModel, TowerTaskRecType } from '../db/TowerTaskRec'; -import { cloneDeep } from 'lodash'; import { Rank } from './rankService'; import { checkActivityTask, checkTask } from './taskService'; import { getRandExpedition, gameData } from '../pubUtils/data'; @@ -595,19 +594,6 @@ export function getRandRobot(cnt = 1, withAttr = false) { return robots; } -/** - * 拷贝敌军数组并添加当前血量字段 - * @param source 原敌军数组,不包含当前血量字段 - */ -export function transBossHpArr(source: Array<{ dataId: number, hp: number, actorId: number }>): Array<{ dataId: number, hp: number, curHp: number, actorId: number }> { - let desArr = []; - source.forEach(elem => { - let { hp } = elem; - desArr.push(Object.assign(elem, { curHp: hp })); - }); - return cloneDeep(desArr); -} - /** * 获得下一次刷新派遣的花费 * @param times 玩家表上的次数 diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts index 7fbf1787c..0126f5cb0 100644 --- a/game-server/app/services/comBattleService.ts +++ b/game-server/app/services/comBattleService.ts @@ -8,7 +8,7 @@ import { STATUS } from './../consts/statusCode'; import { COM_TEAM_STATUS, FRIEND_DROP_TYPE, COM_BTL_CONST, FRIEND_DROP_MAX } from './../consts'; import { RoleStatus, ComBattleTeamModel, ComBattleTeamType } from './../db/ComBattleTeam'; import { getRandEelm, getRandValue, resResult, ratioReward, getRandValueByMinMax, getRandEelmWithWeight, getRobotInfo } from "../pubUtils/util"; -import { getRandRobot, transBossHpArr } from "./battleService"; +import { getRandRobot } from "./battleService"; import { Channel, ChannelService, pinus } from 'pinus'; import { TREASURE, EXTERIOR } from '../pubUtils/dicParam'; import { getFriendLvAdd } from './friendService'; diff --git a/shared/domain/activityField/firstGiftField.ts b/shared/domain/activityField/firstGiftField.ts index 2cff14629..b49c51434 100644 --- a/shared/domain/activityField/firstGiftField.ts +++ b/shared/domain/activityField/firstGiftField.ts @@ -1,5 +1,4 @@ import moment = require('moment'); -import { pick } from 'underscore'; import { FIRST_GIFT_STATE } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; import { ActivityFirstGiftModelType } from '../../db/ActivityFirstGift'; diff --git a/shared/domain/activityField/rechargeMoneyField.ts b/shared/domain/activityField/rechargeMoneyField.ts index 7efc241da..dd32c4d87 100644 --- a/shared/domain/activityField/rechargeMoneyField.ts +++ b/shared/domain/activityField/rechargeMoneyField.ts @@ -1,5 +1,3 @@ -import moment = require('moment'); -import { random } from 'underscore'; import { ActivityModelType } from '../../db/Activity'; import { ActivityRechargeMoneyModelType } from '../../db/ActivityRechargeMoney'; import { getRandEelmWithWeight, getRandSingleEelm } from '../../pubUtils/util'; diff --git a/shared/domain/activityField/timeLimitRankField.ts b/shared/domain/activityField/timeLimitRankField.ts index 4fe5b80f4..9a57041cb 100644 --- a/shared/domain/activityField/timeLimitRankField.ts +++ b/shared/domain/activityField/timeLimitRankField.ts @@ -1,9 +1,5 @@ -import { pick } from 'underscore'; import { RANK_TYPE } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; -import { ActivityTurntableModelType, TurntableRecord } from '../../db/ActivityTurntableRec'; -import { RewardInter } from '../../pubUtils/interface'; -import { getRandEelmWithWeight, parseGoodStr } from '../../pubUtils/util'; import { ActivityBase } from './activityField'; interface TimeLimitRewardInDb { diff --git a/shared/domain/battleField/ComBattleTeamField.ts b/shared/domain/battleField/ComBattleTeamField.ts index 0ebfe4b9c..52aac9abf 100644 --- a/shared/domain/battleField/ComBattleTeamField.ts +++ b/shared/domain/battleField/ComBattleTeamField.ts @@ -1,7 +1,22 @@ import { COM_TEAM_STATUS } from '../../consts'; import { getBossHpByBlueprtId, getDicBlueprtById } from '../../pubUtils/data'; -import { transBossHpArr } from '../../services/battleService'; import ComBattleTeam from './../../db/ComBattleTeam'; +import { cloneDeep } from 'lodash' + +/** + * 拷贝敌军数组并添加当前血量字段 + * @param source 原敌军数组,不包含当前血量字段 + */ + export function transBossHpArr(source: Array<{ dataId: number, hp: number, actorId: number }>): Array<{ dataId: number, hp: number, curHp: number, actorId: number }> { + let desArr = []; + source.forEach(elem => { + let { hp } = elem; + desArr.push(Object.assign(elem, { curHp: hp })); + }); + return cloneDeep(desArr); +} + + export class MemComBtlTeam extends ComBattleTeam { bossCurHp: number; curRnd: number; diff --git a/shared/domain/battleField/guildActivity.ts b/shared/domain/battleField/guildActivity.ts index ce50b643c..f3471ced0 100644 --- a/shared/domain/battleField/guildActivity.ts +++ b/shared/domain/battleField/guildActivity.ts @@ -3,7 +3,7 @@ import { SimpleGuildRankParam, SimpleRoleRankParam } from '../rank' import { prop } from "@typegoose/typegoose"; import { CITY_STATUS, RACE_ACTIVITY_STATUS, RACE_EVENT } from "../../consts"; import { gameData, getRaceEventItems } from "../../pubUtils/data"; -import { getRandEelm, getRandResultByMember, getRandValueByMinMax, sortArrRandom } from "../../pubUtils/util"; +import { getRandEelm, getRandResultByMember, } from "../../pubUtils/util"; import { RewardInter } from "../../pubUtils/interface"; export class GateMembersRec { diff --git a/shared/resource/jsons/dic_zyz_activityType.json b/shared/resource/jsons/dic_zyz_activityType.json index 23a3750d2..1ea02195d 100644 --- a/shared/resource/jsons/dic_zyz_activityType.json +++ b/shared/resource/jsons/dic_zyz_activityType.json @@ -238,5 +238,11 @@ "activityType": 40, "name": "LUCKY_TURNTABLE", "string": "幸运转盘" + }, + { + "id": 41, + "activityType": 41, + "name": "TIME_LIMIT_RANK", + "string": "限时排行榜" } ] \ No newline at end of file