diff --git a/game-server/app/servers/activity/handler/activityMonopolyHandler.ts b/game-server/app/servers/activity/handler/activityMonopolyHandler.ts index 41cb293d4..5a8de76d0 100644 --- a/game-server/app/servers/activity/handler/activityMonopolyHandler.ts +++ b/game-server/app/servers/activity/handler/activityMonopolyHandler.ts @@ -5,7 +5,7 @@ import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../../../db/Ac import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../../../db/ActivityMonopolyLand'; import { getPlayerMonopolyData, nextPosition } from '../../../services/activity/monopolyService'; import { random } from 'underscore'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { getPlayerRefreshShopDataByRoundIndex } from '../../../services/activity/refreshShopService'; import { ActivityRefreshShopModel } from '../../../db/ActivityRefreshShop'; diff --git a/game-server/app/servers/activity/handler/dailyCoinHandler.ts b/game-server/app/servers/activity/handler/dailyCoinHandler.ts index 045832c62..64c2c0190 100644 --- a/game-server/app/servers/activity/handler/dailyCoinHandler.ts +++ b/game-server/app/servers/activity/handler/dailyCoinHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, HandlerService } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, ITEM_CHANGE_REASON, STATUS } from '../../../consts'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { getPlayerDailyCoinData, mergeData } from '../../../services/activity/dailyCoinService'; import { ConsumeExchangeFormulaItem, CoinRewardFormulaItem } from '../../../domain/activityField/dailyCoinField'; import { ActivityDailyCoinModel } from '../../../db/ActivityDailyCoin'; diff --git a/game-server/app/servers/activity/handler/dailyGiftsHandler.ts b/game-server/app/servers/activity/handler/dailyGiftsHandler.ts index fc2106725..14c5c5ea8 100644 --- a/game-server/app/servers/activity/handler/dailyGiftsHandler.ts +++ b/game-server/app/servers/activity/handler/dailyGiftsHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { STATUS, ACTIVITY_RESOURCES_TYPE, ITEM_CHANGE_REASON } from '../../../consts'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { getPlayerDailyGiftsData } from '../../../services/activity/dailyGiftsService'; import { DailyGiftItem } from '../../../domain/activityField/dailyGiftsField'; import { ActivityDailyGiftsModel } from '../../../db/ActivityDailyGifts'; diff --git a/game-server/app/servers/activity/handler/dailyMealHandler.ts b/game-server/app/servers/activity/handler/dailyMealHandler.ts index c7722f9e4..72aa71410 100644 --- a/game-server/app/servers/activity/handler/dailyMealHandler.ts +++ b/game-server/app/servers/activity/handler/dailyMealHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { ITEM_CHANGE_REASON, STATUS } from '../../../consts'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { getPlayerDailyMealData } from '../../../services/activity/dailyMealService'; import { DailyMealItem } from '../../../domain/activityField/dailyMealField'; import { ActivityDailyMealModel } from '../../../db/ActivityDailyMeal'; diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index 8d11509e8..afc6be553 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -7,7 +7,7 @@ import { UserGachaModel } from "../../../db/UserGacha"; import { refreshGacha, getGachaList, getVisitedHeroList, getAllHeroByQuality, GachaPull } from "../../../services/activity/gachaService"; import { RoleModel } from "../../../db/Role"; import { HeroModel } from "../../../db/Hero"; -import { handleCost, createHeroes, addItems } from "../../../services/rewardService"; +import { handleCost, createHeroes, addItems } from "../../../services/role/rewardService"; import { getZeroPointD, getTimeFun } from "../../../pubUtils/timeUtil"; import { UserGachaRecModel } from "../../../db/UserGachaRec"; import { ActivityModel } from "../../../db/Activity"; diff --git a/game-server/app/servers/activity/handler/limitPackageHandler.ts b/game-server/app/servers/activity/handler/limitPackageHandler.ts index cc069d8e9..f5d2ceafa 100644 --- a/game-server/app/servers/activity/handler/limitPackageHandler.ts +++ b/game-server/app/servers/activity/handler/limitPackageHandler.ts @@ -6,7 +6,7 @@ import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../s import { ActivityShopModel } from '../../../db/ActivityShop'; import moment = require('moment'); import { RoleModel } from '../../../db/Role'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; export default function (app: Application) { new HandlerService(app, {}); diff --git a/game-server/app/servers/activity/handler/luckyTurntableHandler.ts b/game-server/app/servers/activity/handler/luckyTurntableHandler.ts index faf8898fe..68c3b4d62 100644 --- a/game-server/app/servers/activity/handler/luckyTurntableHandler.ts +++ b/game-server/app/servers/activity/handler/luckyTurntableHandler.ts @@ -2,7 +2,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { ITEM_CHANGE_REASON, STATUS } from '../../../consts'; import { getPlayerLuckyTurntableDataShow, getPlayerLuckyTurntableData } from '../../../services/activity/luckyTurntableService'; -import { addItems, combineItems, handleCost } from '../../../services/rewardService'; +import { addItems, combineItems, handleCost } from '../../../services/role/rewardService'; import { ActivityTurntableModel } from '../../../db/ActivityTurntableRec'; import { pick } from 'underscore'; import { addReward, stringToRewardInter, stringToRewardParam } from '../../../services/activity/giftPackageService'; diff --git a/game-server/app/servers/activity/handler/newHeroGachaHandler.ts b/game-server/app/servers/activity/handler/newHeroGachaHandler.ts index bf1c16b1b..f6f85a2a5 100644 --- a/game-server/app/servers/activity/handler/newHeroGachaHandler.ts +++ b/game-server/app/servers/activity/handler/newHeroGachaHandler.ts @@ -5,7 +5,7 @@ import { getPlayerNewHeroGachaData } from '../../../services/activity/newHeroGac import { RoleModel } from '../../../db/Role'; import { HeroModel } from '../../../db/Hero'; import { GachaPull } from '../../../services/activity/gachaService'; -import { addItems, createHeroes, handleCost } from '../../../services/rewardService'; +import { addItems, createHeroes, handleCost } from '../../../services/role/rewardService'; import { ActivityNewHeroGachaModel } from '../../../db/ActivityNewHeroGacha'; import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { RewardParam } from '../../../domain/activityField/rewardField'; diff --git a/game-server/app/servers/activity/handler/popUpShopHandler.ts b/game-server/app/servers/activity/handler/popUpShopHandler.ts index 673f6bfc6..e1f3b026a 100644 --- a/game-server/app/servers/activity/handler/popUpShopHandler.ts +++ b/game-server/app/servers/activity/handler/popUpShopHandler.ts @@ -7,7 +7,7 @@ import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../../../db/ import { PopUpShopData } from '../../../domain/activityField/popUpShopField'; import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { RewardParam } from '../../../domain/activityField/rewardField'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import moment = require('moment'); import { getActivityById } from '../../../services/activity/activityService'; diff --git a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts index c475ef0c2..457d62e54 100644 --- a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts +++ b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts @@ -6,7 +6,7 @@ import { RechargeMoneyPool } from '../../../domain/activityField/rechargeMoneyFi import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { RewardParam } from '../../../domain/activityField/rewardField'; import { ActivityRechargeMoneyModel } from '../../../db/ActivityRechargeMoney'; -import { addItems } from '../../../services/rewardService'; +import { addItems } from '../../../services/role/rewardService'; export default function (app: Application) { diff --git a/game-server/app/servers/activity/handler/refreshShopHandler.ts b/game-server/app/servers/activity/handler/refreshShopHandler.ts index 7a6875b72..81e32d19e 100644 --- a/game-server/app/servers/activity/handler/refreshShopHandler.ts +++ b/game-server/app/servers/activity/handler/refreshShopHandler.ts @@ -4,7 +4,7 @@ import { ITEM_CHANGE_REASON, STATUS } from '../../../consts'; import { getPlayerRefreshShopData } from '../../../services/activity/refreshShopService'; import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { ActivityRefreshShopModel } from '../../../db/ActivityRefreshShop'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; export default function (app: Application) { new HandlerService(app, {}); diff --git a/game-server/app/servers/activity/handler/selfServiceShopHandler.ts b/game-server/app/servers/activity/handler/selfServiceShopHandler.ts index 145ba6614..ced66c4fd 100644 --- a/game-server/app/servers/activity/handler/selfServiceShopHandler.ts +++ b/game-server/app/servers/activity/handler/selfServiceShopHandler.ts @@ -2,7 +2,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult, splitString } from '../../../pubUtils/util'; import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts'; import { SelfServiceShopData } from '../../../domain/activityField/selfServiceShopField'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../../../db/ActivitySelfServiceShop'; import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService'; import { ActivitySelfServiceGoodsModel } from '../../../db/ActivitySelfServiceGoods'; diff --git a/game-server/app/servers/activity/handler/sevenDaysHandler.ts b/game-server/app/servers/activity/handler/sevenDaysHandler.ts index dd28fdbcd..13bea4ce5 100644 --- a/game-server/app/servers/activity/handler/sevenDaysHandler.ts +++ b/game-server/app/servers/activity/handler/sevenDaysHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { STATUS, ACTIVITY_RESOURCES_TYPE, ITEM_CHANGE_REASON } from '../../../consts'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { ActivityGrowthModel } from '../../../db/ActivityGrowth'; import { ActivityDailyGiftsModel } from '../../../db/ActivityDailyGifts'; import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService'; diff --git a/game-server/app/servers/activity/handler/signInHandler.ts b/game-server/app/servers/activity/handler/signInHandler.ts index 8b2910082..79c2b88c0 100644 --- a/game-server/app/servers/activity/handler/signInHandler.ts +++ b/game-server/app/servers/activity/handler/signInHandler.ts @@ -2,7 +2,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { STATUS, ACTIVITY_TYPE, SERVER_OPEN_TIME, ITEM_CHANGE_REASON, } from '../../../consts'; import { canBuyVip, getPlayerSignInData } from '../../../services/activity/signInService'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { SignInItem } from '../../../domain/activityField/signInField'; import { ActivitySignInModel } from '../../../db/ActivitySignIn'; import moment = require('moment'); diff --git a/game-server/app/servers/activity/handler/taskPassHandler.ts b/game-server/app/servers/activity/handler/taskPassHandler.ts index beccbdcb9..b87262bb8 100644 --- a/game-server/app/servers/activity/handler/taskPassHandler.ts +++ b/game-server/app/servers/activity/handler/taskPassHandler.ts @@ -8,7 +8,7 @@ import { nowSeconds } from '../../../pubUtils/timeUtil'; import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { ItemInter } from '../../../pubUtils/interface'; import { isNumber, pick } from 'underscore'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; export default function (app: Application) { new HandlerService(app, {}); diff --git a/game-server/app/servers/activity/handler/timeLimitRankHandler.ts b/game-server/app/servers/activity/handler/timeLimitRankHandler.ts index b01972fbc..22576c73e 100644 --- a/game-server/app/servers/activity/handler/timeLimitRankHandler.ts +++ b/game-server/app/servers/activity/handler/timeLimitRankHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { DEBUG_MAGIC_WORD, getRedisKeyByRankType, HERO_SELECT, ITEM_CHANGE_REASON, RANK_TYPE, ROLE_SELECT, STATUS } from '../../../consts'; -import { addItems, combineItems, handleCost } from '../../../services/rewardService'; +import { addItems, combineItems, handleCost } from '../../../services/role/rewardService'; import { ActivityTurntableModel } from '../../../db/ActivityTurntableRec'; import { pick } from 'underscore'; import { addReward, stringToRewardInter, stringToRewardParam } from '../../../services/activity/giftPackageService'; diff --git a/game-server/app/servers/activity/handler/treasureHuntHandler.ts b/game-server/app/servers/activity/handler/treasureHuntHandler.ts index 137c3fb82..8924f31a4 100644 --- a/game-server/app/servers/activity/handler/treasureHuntHandler.ts +++ b/game-server/app/servers/activity/handler/treasureHuntHandler.ts @@ -4,7 +4,7 @@ import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts'; import { getPlayerTreasureHuntData, getTreasureHuntData, getPlayerTreasureHuntShopData, getPlayerTreasureHuntTaskData, getPlayerTreasureHuntTreasureShopData, getPlayerTreasureHuntChallengeData, getPlayerTreasureHuntFirstPageData } from '../../../services/activity/treasureHuntService'; import { ActivityTreasureHuntShopModel } from '../../../db/ActivityTreasureHuntShop'; import { ActivityTreasureHuntTaskModel } from '../../../db/ActivityTreasureHuntTask'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { RewardParam } from '../../../domain/activityField/rewardField'; import { ActivityTreasureHuntTreasureShopModel } from '../../../db/ActivityTreasureHuntTreasureShop'; diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index efe6cfbb5..69649b4ce 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -13,7 +13,7 @@ import { Application, BackendSession } from 'pinus'; import { resResult, getRandSingleEelm, cal } from '../../../pubUtils/util'; import { RoleStatus, ComBattleTeamModel, ComBattleTeamType, BossHp, ComRoleStatusHero } from '../../../db/ComBattleTeam'; import { ItemModel, ItemType } from '../../../db/Item'; -import { addItems, handleCost } from '../../../services/rewardService'; +import { addItems, handleCost } from '../../../services/role/rewardService'; import { checkRoleInQueue, rmRoleFromQueue, setTeamSearchReq } from '../../../services/redisService'; import { getRandBlueprtId, clearComBtlTimer, getFrd, updateRobotHurtByTime, comBtlLvInvalid, clearRobotHurtTimer, setDismissTimer, dismissTeam, handleComBtlProgress, getComBattleFriendAdd, teammateInBlackList, blueprtIdValid, hasEnoughBlueprt, addRoleToTeam, addRoleStToTeam, addValidSearchingRoles, validToJoin, addRobotsToTeam, addRobotsLater, teamIsFullToStart, oneTeamNotInBlack, getAllAssistCnt, checkHasMyTeam } from '../../../services/comBattleService'; import { setAp } from '../../../services/actionPointService'; diff --git a/game-server/app/servers/battle/handler/dailyBattleHandler.ts b/game-server/app/servers/battle/handler/dailyBattleHandler.ts index 824feee30..616333602 100644 --- a/game-server/app/servers/battle/handler/dailyBattleHandler.ts +++ b/game-server/app/servers/battle/handler/dailyBattleHandler.ts @@ -4,7 +4,7 @@ import { STATUS } from '../../../consts/statusCode'; import { resResult } from '../../../pubUtils/util'; import { RoleModel } from '../../../db/Role'; import { getDailyNum, getDailyBattleList, getDailyBuyCountCost } from '../../../services/dailyBattleService'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { getGoldObject } from '../../../pubUtils/itemUtils'; import { gameData } from '../../../pubUtils/data'; import { DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON } from '../../../consts'; diff --git a/game-server/app/servers/battle/handler/dungeonBattleHandler.ts b/game-server/app/servers/battle/handler/dungeonBattleHandler.ts index 857bb0aa5..437b91629 100644 --- a/game-server/app/servers/battle/handler/dungeonBattleHandler.ts +++ b/game-server/app/servers/battle/handler/dungeonBattleHandler.ts @@ -2,7 +2,7 @@ import { Application, BackendSession } from 'pinus'; import { STATUS } from '../../../consts/statusCode'; import { resResult, shouldRefresh } from '../../../pubUtils/util'; import { RoleModel } from '../../../db/Role'; -import { handleCost } from '../../../services/rewardService'; +import { handleCost } from '../../../services/role/rewardService'; import { getGoldObject } from '../../../pubUtils/itemUtils'; import { getDungeonData, getDungeonBuyCountCost } from '../../../services/dungeonService'; import * as dicParam from '../../../pubUtils/dicParam'; diff --git a/game-server/app/servers/battle/handler/eventBattleHandler.ts b/game-server/app/servers/battle/handler/eventBattleHandler.ts index dc9f473cd..173962347 100644 --- a/game-server/app/servers/battle/handler/eventBattleHandler.ts +++ b/game-server/app/servers/battle/handler/eventBattleHandler.ts @@ -3,7 +3,7 @@ import { EventRecordModel } from '../../../db/EventRecord'; import { RoleModel } from '../../../db/Role'; import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_ANSWER_STATUS, TASK_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON } from '../../../consts'; import { checkEventStatus, getEventSuccessStatus, getEvent, checkQuiz, startEvent, refreshEvent, getEventTime } from '../../../services/eventSercive'; -import { addItems } from '../../../services/rewardService'; +import { addItems } from '../../../services/role/rewardService'; import { STATUS } from '../../../consts/statusCode'; import { resResult } from '../../../pubUtils/util'; import { checkActivityTask, checkTask } from '../../../services/taskService'; diff --git a/game-server/app/servers/battle/handler/expeditionBattleHandler.ts b/game-server/app/servers/battle/handler/expeditionBattleHandler.ts index 29b720c54..060799371 100644 --- a/game-server/app/servers/battle/handler/expeditionBattleHandler.ts +++ b/game-server/app/servers/battle/handler/expeditionBattleHandler.ts @@ -8,7 +8,7 @@ import { calculateSumCE, genCode, getWarTypeName } from '../../../pubUtils/util' import { getPointRewardStatus, getResetRemainCnt, findOrCreateEnemies, getExpeditionStatus } from '../../../services/expeditionService'; import { DEBUG_MAGIC_WORD, EXPEDITION_WAR_RECORD_STATUS, ITEM_CHANGE_REASON, KING_EXP_RATIO_TYPE, LINEUP_NUM, TASK_TYPE, TA_EVENT } from '../../../consts'; import { WarReward } from '../../../services/warRewardService'; -import { addItems } from '../../../services/rewardService'; +import { addItems } from '../../../services/role/rewardService'; import { getAp, setAp } from '../../../services/actionPointService'; import { STATUS } from '../../../consts/statusCode'; import { resResult } from '../../../pubUtils/util'; diff --git a/game-server/app/servers/battle/handler/normalBattleHandler.ts b/game-server/app/servers/battle/handler/normalBattleHandler.ts index 32923830d..ebb936111 100644 --- a/game-server/app/servers/battle/handler/normalBattleHandler.ts +++ b/game-server/app/servers/battle/handler/normalBattleHandler.ts @@ -28,7 +28,7 @@ import { reportTAEvent } from '../../../services/sdkService'; import { getVipRegretCnt } from '../../../services/activity/monthlyTicketService'; import { isArray, isNumber } from 'underscore'; import { RewardInter } from '../../../pubUtils/interface'; -import { addItems } from '../../../services/rewardService'; +import { addItems } from '../../../services/role/rewardService'; export default function (app: Application) { new HandlerService(app, {}); diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts index 6dbaa5f5b..a3276d29b 100644 --- a/game-server/app/servers/battle/handler/pvpHandler.ts +++ b/game-server/app/servers/battle/handler/pvpHandler.ts @@ -15,7 +15,7 @@ import { Attack, AttackHero, Defense, DefenseHero, PvpDataReturn } from '../../. import { DEBUG_MAGIC_WORD, FIGURE_UNLOCK_CONDITION, ITEM_CHANGE_REASON, LINEUP_NUM, REDIS_KEY, TASK_TYPE } from '../../../consts'; import { PVP } from '../../../pubUtils/dicParam'; import { getGoldObject } from '../../../pubUtils/itemUtils'; -import { addItems, handleCost, unlockFigure } from '../../../services/rewardService'; +import { addItems, handleCost, unlockFigure } from '../../../services/role/rewardService'; import { pick } from "underscore"; import { HeroModel } from '../../../db/Hero'; import PvpHistoryOpp, { PvpHistoryOppModel } from '../../../db/PvpHistoryOpp'; diff --git a/game-server/app/servers/battle/handler/towerBattleHandler.ts b/game-server/app/servers/battle/handler/towerBattleHandler.ts index c92b7af53..865659bc4 100644 --- a/game-server/app/servers/battle/handler/towerBattleHandler.ts +++ b/game-server/app/servers/battle/handler/towerBattleHandler.ts @@ -8,7 +8,7 @@ import { TowerRecordModel } from './../../../db/TowerRecord'; import { Application, BackendSession } from 'pinus'; import { resResult, genCode, shouldRefresh } from '../../../pubUtils/util'; import { calcuHangUpReward, refreshTasks, treatTask, getRemainTime, getTowerStatus, getHungupRewards, getTasks, checkTaskRewards, getTowerTaskCostGold, getHangSpdUpCostGold, getManyHangSpdUpCostGold, getTaskStatus, checkForbiddenChar, checkAndStartHungUp, createNewTowerRecord, getTowerRecByLv } from '../../../services/battleService'; -import { addItems, handleCost } from '../../../services/rewardService'; +import { addItems, handleCost } from '../../../services/role/rewardService'; import { checkBattleHeroes } from '../../../services/normalBattleService'; import { getGoldObject } from '../../../pubUtils/itemUtils'; import { gameData } from '../../../pubUtils/data'; diff --git a/game-server/app/servers/gm/handler/gmRoleHandler.ts b/game-server/app/servers/gm/handler/gmRoleHandler.ts index 9c844411c..73367dbd3 100644 --- a/game-server/app/servers/gm/handler/gmRoleHandler.ts +++ b/game-server/app/servers/gm/handler/gmRoleHandler.ts @@ -2,7 +2,7 @@ import { Application, BackendSession, pinus } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { STATUS } from '../../../consts/statusCode'; import { getRoleOnlineInfo, updateUserInfo } from '../../../services/redisService'; -import { addItems, createHeroes } from '../../../services/rewardService'; +import { addItems, createHeroes } from '../../../services/role/rewardService'; import { RewardInter } from '../../../pubUtils/interface'; import { gameData, getExpByLv, getHeroExpByLv, getHeroLvByExp, getLvByExp } from '../../../pubUtils/data'; import { RoleModel, RoleType } from '../../../db/Role'; diff --git a/game-server/app/servers/guild/handler/auctionHandler.ts b/game-server/app/servers/guild/handler/auctionHandler.ts index 5b1c234fa..2c62ca259 100644 --- a/game-server/app/servers/guild/handler/auctionHandler.ts +++ b/game-server/app/servers/guild/handler/auctionHandler.ts @@ -5,7 +5,7 @@ import { LotModel } from "../../../db/Lot"; import { ItemReward } from "../../../domain/dbGeneral"; import { genCode, resResult } from "../../../pubUtils/util"; import { auctionStage, calculateDividend, genAuction, sendUngotDividend, startGuildAuction, startWorldAuction, stopAuction, todayGuildBegin, getBasePrice, debugAuctionLots, officialAuctionLots, auctionBidStatus, getMaxPrice, guildBidStatus, getAuction, pushAuctionOver, treatSingleLotTime, treatLotsTime } from "../../../services/auctionService"; -import { addItems, handleCost } from '../../../services/rewardService'; +import { addItems, handleCost } from '../../../services/role/rewardService'; import { getSimpleRoleInfo } from '../../../services/roleService'; import { getRoleOnlineInfo } from '../../../services/redisService'; import { lockData } from '../../../services/redLockService'; diff --git a/game-server/app/servers/guild/handler/cityActivityHandler.ts b/game-server/app/servers/guild/handler/cityActivityHandler.ts index f890c723e..f9e6b09c1 100644 --- a/game-server/app/servers/guild/handler/cityActivityHandler.ts +++ b/game-server/app/servers/guild/handler/cityActivityHandler.ts @@ -11,7 +11,7 @@ import { GuildActivityRecordModel } from "../../../db/GuildActivityRec"; import { nowSeconds, getTimeFun } from "../../../pubUtils/timeUtil"; import { getGoldObject } from "../../../pubUtils/itemUtils"; import { GUILDACTIVITY, SERVER_DEBUG_MODE } from "../../../pubUtils/dicParam"; -import { handleCost } from "../../../services/rewardService"; +import { handleCost } from "../../../services/role/rewardService"; import { addActive } from "../../../services/guildService"; import { Rank } from "../../../services/rankService"; import { checkActivityTask, checkTask } from "../../../services/taskService"; diff --git a/game-server/app/servers/guild/handler/donateHandler.ts b/game-server/app/servers/guild/handler/donateHandler.ts index bcd6f4d0e..0f55877a1 100644 --- a/game-server/app/servers/guild/handler/donateHandler.ts +++ b/game-server/app/servers/guild/handler/donateHandler.ts @@ -6,7 +6,7 @@ import { DonationModel } from '../../../db/Donation'; import { nowSeconds } from '../../../pubUtils/timeUtil'; import { getArmyDonateBaseByLv, getArmyDonateBoxBaseById } from '../../../pubUtils/data'; import { GuildModel } from '../../../db/Guild'; -import { handleCost, addItems } from '../../../services/rewardService'; +import { handleCost, addItems } from '../../../services/role/rewardService'; import { CHAT_SERVER, GUILD_POINT_WAYS } from '../../../consts'; import { addFund, getDonation } from '../../../services/donateService'; import { getUserGuildWithRefActive, refreshUserGuild } from '../../../services/guildService'; diff --git a/game-server/app/servers/guild/handler/guildBossHandler.ts b/game-server/app/servers/guild/handler/guildBossHandler.ts index 448ad7247..931de2615 100644 --- a/game-server/app/servers/guild/handler/guildBossHandler.ts +++ b/game-server/app/servers/guild/handler/guildBossHandler.ts @@ -16,7 +16,7 @@ import { lockData } from '../../../services/redLockService'; import { pushGuildBossSucMsg, getGuildChannelSid } from '../../../services/chatService'; import { checkTask } from '../../../services/taskService'; import { guildInter } from '../../../pubUtils/interface'; -import { addItems, handleCost } from '../../../services/rewardService'; +import { addItems, handleCost } from '../../../services/role/rewardService'; import * as dicParam from '../../../pubUtils/dicParam'; import { getGoldObject } from '../../../pubUtils/itemUtils'; import { RoleModel } from '../../../db/Role'; diff --git a/game-server/app/servers/guild/handler/guildHandler.ts b/game-server/app/servers/guild/handler/guildHandler.ts index 14db3c0e4..0bf5e488d 100644 --- a/game-server/app/servers/guild/handler/guildHandler.ts +++ b/game-server/app/servers/guild/handler/guildHandler.ts @@ -6,7 +6,7 @@ import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, import { GuildModel, GuildType, GuildUpdateParam } from '../../../db/Guild'; import { RoleModel, RoleType } from '../../../db/Role'; import { ARMY } from '../../../pubUtils/dicParam'; -import { handleCost, addItems } from '../../../services/rewardService'; +import { handleCost, addItems } from '../../../services/role/rewardService'; import { getGoldObject } from '../../../pubUtils/itemUtils'; import { nowSeconds, getTimeFun, getSeconds } from '../../../pubUtils/timeUtil'; import { GuildListInfo, GuildMemberParam } from '../../../domain/battleField/guild'; diff --git a/game-server/app/servers/guild/handler/guildRefineHandler.ts b/game-server/app/servers/guild/handler/guildRefineHandler.ts index 1d249ec06..d9a4eef4f 100644 --- a/game-server/app/servers/guild/handler/guildRefineHandler.ts +++ b/game-server/app/servers/guild/handler/guildRefineHandler.ts @@ -5,7 +5,7 @@ import { STATUS, GUILD_OPERATE, TASK_TYPE, ITEM_CHANGE_REASON, ITID, CONSUME_TYP import { GuildRefineModel } from '../../../db/GuildRefine'; import { gameData, getArmyDevelopConsumeById, getGoodById } from '../../../pubUtils/data'; import { nowSeconds } from '../../../pubUtils/timeUtil'; -import { handleCost, addItems, checkGoods } from '../../../services/rewardService'; +import { handleCost, addItems, checkGoods } from '../../../services/role/rewardService'; import { GuildModel } from '../../../db/Guild'; import { findIndex, findWhere } from 'underscore'; import { lockData } from '../../../services/redLockService'; diff --git a/game-server/app/servers/guild/handler/guildTrainHandler.ts b/game-server/app/servers/guild/handler/guildTrainHandler.ts index 342ca85db..c9da81f7d 100644 --- a/game-server/app/servers/guild/handler/guildTrainHandler.ts +++ b/game-server/app/servers/guild/handler/guildTrainHandler.ts @@ -12,7 +12,7 @@ import { UserGuildModel } from '../../../db/UserGuild'; import { GuildModel } from '../../../db/Guild'; import { getArmyTrainJuDian, getTrainBaseByLv, gameData } from '../../../pubUtils/data'; import { CURRENCY_BY_TYPE, CURRENCY_TYPE } from '../../../consts/constModules/itemConst'; -import { handleCost, addItems } from '../../../services/rewardService'; +import { handleCost, addItems } from '../../../services/role/rewardService'; import { ARMY } from '../../../pubUtils/dicParam'; import { addActive } from '../../../services/guildService'; import { GuildTrainReportModel } from '../../../db/GuildTrainReport'; diff --git a/game-server/app/servers/guild/handler/wishPoolHandler.ts b/game-server/app/servers/guild/handler/wishPoolHandler.ts index 8ab6f473e..165421b1d 100644 --- a/game-server/app/servers/guild/handler/wishPoolHandler.ts +++ b/game-server/app/servers/guild/handler/wishPoolHandler.ts @@ -5,7 +5,7 @@ import { WishPoolReportModel } from '../../../db/WishPoolReport'; import { resResult, genCode } from '../../../pubUtils/util'; import { ITEM_CHANGE_REASON, STATUS } from '../../../consts'; import { getArmyWishPoolBaseByLv, getGoodById, getWishPoolReward } from '../../../pubUtils/data'; -import { addItems, checkGoods, checkHeroEquips, checkHeroes } from '../../../services/rewardService'; +import { addItems, checkGoods, checkHeroEquips, checkHeroes } from '../../../services/role/rewardService'; import { ITID, CONSUME_TYPE } from '../../../consts/constModules/itemConst'; import { GUILD_STRUCTURE } from '../../../consts/constModules/guildConst'; import { refreshUserGuild, getWishPool, getUserGuildWithRefActive } from '../../../services/guildService'; diff --git a/game-server/app/servers/role/handler/equipHandler.ts b/game-server/app/servers/role/handler/equipHandler.ts index bfb861a32..4bf608703 100644 --- a/game-server/app/servers/role/handler/equipHandler.ts +++ b/game-server/app/servers/role/handler/equipHandler.ts @@ -3,7 +3,7 @@ import { STATUS, HERO_SYSTEM_TYPE, ITEM_CHANGE_REASON, TASK_TYPE } from "../../. import { ItemInter, RewardInter } from "../../../pubUtils/interface"; import { resResult, parseGoodStr } from "../../../pubUtils/util"; -import { addItems, handleCost, combineItems, CheckMeterial } from "../../../services/rewardService"; +import { addItems, handleCost, combineItems, CheckMeterial } from "../../../services/role/rewardService"; import { HeroModel, EPlace } from "../../../db/Hero"; import { calPlayerCeAndSave } from "../../../services/playerCeService"; import { gameData, getEquipByJobClassAndEPlace, getNextEquipQuality, getEquipStarIdByEquipId, getNextEquipStar } from "../../../pubUtils/data"; diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts index 5a7a3f361..fbe025f2b 100644 --- a/game-server/app/servers/role/handler/friendHandler.ts +++ b/game-server/app/servers/role/handler/friendHandler.ts @@ -11,7 +11,7 @@ import { isRoleOnline, getServerName, getRoleOnlineInfo } from "../../../service import { increaseFrdCnt, getRecommendType, sortByBeSentHeart, getApplyList, getFriendList, getMyApplyParam, getMyParamAsFriend } from "../../../services/friendService"; import { FriendPointModel } from "../../../db/FriendPoint"; import { gameData, getDicFriendByLv } from "../../../pubUtils/data"; -import { addItems, handleCost } from "../../../services/rewardService"; +import { addItems, handleCost } from "../../../services/role/rewardService"; import { getFriendPointObject } from "../../../pubUtils/itemUtils"; import { RewardInter } from "../../../pubUtils/interface"; import { FriendPresentLogModel } from '../../../db/FriendPresentLog'; diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts index 9f8cddd3d..be80e12a9 100644 --- a/game-server/app/servers/role/handler/heroHandler.ts +++ b/game-server/app/servers/role/handler/heroHandler.ts @@ -1,5 +1,5 @@ import { Application, BackendSession, ChannelService, HandlerService, } from 'pinus'; -import { handleCost, addItems, unlockFigure, createHeroes, createHero, CheckMeterial } from '../../../services/rewardService'; +import { handleCost, addItems, unlockFigure, createHeroes, createHero, CheckMeterial } from '../../../services/role/rewardService'; import { calPlayerCeAndSave, calAllHeroCe } from '../../../services/playerCeService'; import { resResult, deepCopy, reduceCe } from '../../../pubUtils/util'; import { STATUS } from '../../../consts/statusCode'; diff --git a/game-server/app/servers/role/handler/itemHandler.ts b/game-server/app/servers/role/handler/itemHandler.ts index d1855a9a2..194c77e71 100644 --- a/game-server/app/servers/role/handler/itemHandler.ts +++ b/game-server/app/servers/role/handler/itemHandler.ts @@ -3,7 +3,7 @@ import { STATUS, CONSUME_TYPE, DEBUG_MAGIC_WORD, GIFT_GENERATE_TYPE, ITEM_CHANGE import { RewardInter } from "../../../pubUtils/interface"; import { resResult } from "../../../pubUtils/util"; -import { addItems, handleCost } from "../../../services/rewardService"; +import { addItems, handleCost } from "../../../services/role/rewardService"; import { RoleModel } from "../../../db/Role"; import { gameData } from "../../../pubUtils/data"; import { ITID } from "../../../consts/constModules/itemConst"; diff --git a/game-server/app/servers/role/handler/mailHandler.ts b/game-server/app/servers/role/handler/mailHandler.ts index 5fc5e49a8..21b5cb742 100644 --- a/game-server/app/servers/role/handler/mailHandler.ts +++ b/game-server/app/servers/role/handler/mailHandler.ts @@ -4,7 +4,7 @@ import { GroupMailModel, GroupMailType } from '../../../db/GroupMail'; import { resResult } from '../../../pubUtils/util'; import { STATUS } from '../../../consts/statusCode'; import { MAIL_STATUS, GM_MAIL_TYPE } from '../../../consts/constModules/mailConst'; -import { addItems } from '../../../services/rewardService'; +import { addItems } from '../../../services/role/rewardService'; import { checkMailGoods, getMails } from '../../../services/mailService'; import { ServerMailModel, ServerMailType } from '../../../db/ServerMail'; import { MailParam } from '../../../domain/roleField/mail'; diff --git a/game-server/app/servers/role/handler/rankHandler.ts b/game-server/app/servers/role/handler/rankHandler.ts index 527028be3..c74641b47 100644 --- a/game-server/app/servers/role/handler/rankHandler.ts +++ b/game-server/app/servers/role/handler/rankHandler.ts @@ -7,7 +7,7 @@ import { GuildModel } from "../../../db/Guild"; import { Rank, getGeneralRank, getRankFirstReward, getRankInHandler } from "../../../services/rankService"; import { nowSeconds } from "../../../pubUtils/timeUtil"; import { gameData } from "../../../pubUtils/data"; -import { addItems } from "../../../services/rewardService"; +import { addItems } from "../../../services/role/rewardService"; import { HeroModel, HeroUpdate } from "../../../db/Hero"; import { RewardInter } from "../../../pubUtils/interface"; import { GuildRankInfo, RoleAndGuildRankInfo, RoleRankInfo } from "../../../domain/rank"; diff --git a/game-server/app/servers/role/handler/roleHandler.ts b/game-server/app/servers/role/handler/roleHandler.ts index c00aa655e..79baecbc1 100644 --- a/game-server/app/servers/role/handler/roleHandler.ts +++ b/game-server/app/servers/role/handler/roleHandler.ts @@ -3,7 +3,7 @@ import { RoleModel, RoleUpdate } from './../../../db/Role'; import { HeroModel, HeroUpdate } from '../../../db/Hero'; import { resResult, decodeIdCntArrayStr, parseGoodStr, genCode } from '../../../pubUtils/util'; import { Application, BackendSession, pinus, HandlerService, } from 'pinus'; -import { handleCost, addItems } from '../../../services/rewardService'; +import { handleCost, addItems } from '../../../services/role/rewardService'; import { getTitle, getTeraph, gameData, getScollByStar, getFriendLvByExp, getHeroExpByLv, getExpByLv } from '../../../pubUtils/data'; import { SCHOOL, SCROLL, EXTERIOR, SCRIPT } from '../../../pubUtils/dicParam'; import { getAtrrNameById } from '../../../consts/constModules/abilityConst' diff --git a/game-server/app/servers/role/handler/shopHandler.ts b/game-server/app/servers/role/handler/shopHandler.ts index 473e69afe..e06413960 100644 --- a/game-server/app/servers/role/handler/shopHandler.ts +++ b/game-server/app/servers/role/handler/shopHandler.ts @@ -4,7 +4,7 @@ import { parseGoodStr, resResult } from "../../../pubUtils/util"; import { STATUS, GUILD_STRUCTURE, ITID, CONSUME_TYPE, HERO_QUALITY_TYPE, HERO_GROW_MAX, ITEM_CHANGE_REASON } from "../../../consts"; import { DicShopListModel } from "../../../db/DicShopList"; import { UserShopModel } from "../../../db/UserShop"; -import { handleCost, addItems } from "../../../services/rewardService"; +import { handleCost, addItems } from "../../../services/role/rewardService"; import { GuildModel } from "../../../db/Guild"; import { SHOP } from "../../../pubUtils/dicParam"; import { getHonourObject } from "../../../pubUtils/itemUtils"; diff --git a/game-server/app/servers/role/handler/taskHandler.ts b/game-server/app/servers/role/handler/taskHandler.ts index e9e21ae03..c58b0a2e4 100644 --- a/game-server/app/servers/role/handler/taskHandler.ts +++ b/game-server/app/servers/role/handler/taskHandler.ts @@ -3,7 +3,7 @@ import { resResult, parseGoodStr, getRandSingleEelm } from "../../../pubUtils/ut import { STATUS, TASK_FUN_TYPE, SHOP_REFRESH_TYPE, KING_EXP_RATIO_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, ACTIVITY_TYPE } from "../../../consts"; import { gameData } from "../../../pubUtils/data"; import { UserTaskRecModel } from "../../../db/UserTaskRec"; -import { addItems } from "../../../services/rewardService"; +import { addItems } from "../../../services/role/rewardService"; import { UserTaskModel } from "../../../db/UserTask"; import { nowSeconds, getZeroPointD } from "../../../pubUtils/timeUtil"; import { DicDailyTask, DicAchievement, DicMainTask } from "../../../pubUtils/dictionary/DicTask"; diff --git a/game-server/app/services/activity/giftPackageService.ts b/game-server/app/services/activity/giftPackageService.ts index 6f96d6284..f69947c64 100644 --- a/game-server/app/services/activity/giftPackageService.ts +++ b/game-server/app/services/activity/giftPackageService.ts @@ -1,6 +1,6 @@ import { GIFT_PACKAGE_TYPE, ACTIVITY_RESOURCES_TYPE, ITEM_CHANGE_REASON } from '../../consts'; import { gameData } from '../../pubUtils/data'; -import { addItems, createHeroes } from './../rewardService'; +import { addItems, createHeroes } from '../role/rewardService'; import { RewardParam } from '../../domain/activityField/rewardField'; import { CreateHeroParam } from '../../domain/roleField/hero'; import { DicGiftPackage } from '../../pubUtils/dictionary/DicGiftPackage'; diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts index 0126f5cb0..1c39dd4c8 100644 --- a/game-server/app/services/comBattleService.ts +++ b/game-server/app/services/comBattleService.ts @@ -18,7 +18,7 @@ import { addUserToChannel } from './roleService'; import { ChannelUser } from '../domain/ChannelUser'; import { getRewardByBlueprtId, gameData, getBossHpByBlueprtId, getDicBlueprtById } from '../pubUtils/data'; import { getZeroPointD, nowSeconds } from '../pubUtils/timeUtil'; -import { handleCost } from './rewardService'; +import { handleCost } from './role/rewardService'; /** * 在给定的品质列表中随机返回一定数量的藏宝图Id diff --git a/game-server/app/services/rewardService.ts b/game-server/app/services/role/rewardService.ts similarity index 94% rename from game-server/app/services/rewardService.ts rename to game-server/app/services/role/rewardService.ts index f3b4e9957..a3eb15ffa 100644 --- a/game-server/app/services/rewardService.ts +++ b/game-server/app/services/role/rewardService.ts @@ -1,33 +1,33 @@ -import { ITID, CONSUME_TYPE, ITEM_TABLE, CURRENCY, CURRENCY_TYPE, MAIL_TYPE, HANDLE_REWARD_TYPE, HERO_SYSTEM_TYPE, CURRENCY_BY_TYPE, ITEM_CHANGE_REASON, TA_USERSET_TYPE, TA_EVENT, POP_UP_SHOP_CONDITION_TYPE } from './../consts'; -import { getRandSingleEelm, resResult } from '../pubUtils/util'; -import { RoleModel, RoleType } from '../db/Role'; -import { setAp } from './actionPointService'; -import { pushCalAllHeroCe, calPlayerCeAndSave } from './playerCeService'; -import { ItemModel, ItemType } from '../db/Item'; -import { STATUS } from '../consts/statusCode'; +import { ITID, CONSUME_TYPE, ITEM_TABLE, CURRENCY, CURRENCY_TYPE, MAIL_TYPE, HANDLE_REWARD_TYPE, HERO_SYSTEM_TYPE, CURRENCY_BY_TYPE, ITEM_CHANGE_REASON, TA_USERSET_TYPE, TA_EVENT, POP_UP_SHOP_CONDITION_TYPE } from '../../consts'; +import { getRandSingleEelm, resResult } from '../../pubUtils/util'; +import { RoleModel, RoleType } from '../../db/Role'; +import { setAp } from '../actionPointService'; +import { pushCalAllHeroCe, calPlayerCeAndSave } from '../playerCeService'; +import { ItemModel, ItemType } from '../../db/Item'; +import { STATUS } from '../../consts/statusCode'; import { pinus } from 'pinus'; -import { addJewels, addBags, addSkin, addFigure, unlockFigure as pubUnlockFigure, transPiece, getGoldObject, getCoinObject, getApObject } from '../pubUtils/itemUtils'; -import { ItemInter, RewardInter, } from '../pubUtils/interface'; -import { gameData } from '../pubUtils/data'; +import { addJewels, addBags, addSkin, addFigure, unlockFigure as pubUnlockFigure, transPiece, getGoldObject, getCoinObject, getApObject } from '../../pubUtils/itemUtils'; +import { ItemInter, RewardInter, } from '../../pubUtils/interface'; +import { gameData } from '../../pubUtils/data'; import { uniq } from 'underscore'; -import { EPlace, HeroModel, HeroType, HeroUpdate } from '../db/Hero'; -import { Figure } from '../domain/dbGeneral'; -import { Rank } from './rankService'; -import { pushTaskUpdate } from './taskService'; -import { CreateHeroParam, HeroShowParam } from '../domain/roleField/hero'; -import { HeroSkin } from '../db/Hero'; -import { errlogger } from '../util/logger'; -import { BAG } from '../pubUtils/dicParam'; -import { sendMailByContent } from './mailService'; -import { SkinUpdate } from '../db/Skin'; -import { getInitHeroById } from './roleService'; -import { getActivities } from './activity/activityService'; -import { reportTAEvent, reportTAUserSet } from './sdkService'; -import { saveCoinChangeLog, saveFigureInfoLog, saveGoldChangeLog, saveItemChangeLog } from '../pubUtils/logUtil'; -import { JewelModel, JewelType } from '../db/Jewel'; -import { updateEplaces } from './equipService'; -import { checkPopUpConditionInCreateHero } from './activity/popUpShopService'; -import { CreateHeroes } from './role/createHero'; +import { EPlace, HeroModel, HeroType, HeroUpdate } from '../../db/Hero'; +import { Figure } from '../../domain/dbGeneral'; +import { Rank } from '../rankService'; +import { pushTaskUpdate } from '../taskService'; +import { CreateHeroParam, HeroShowParam } from '../../domain/roleField/hero'; +import { HeroSkin } from '../../db/Hero'; +import { errlogger } from '../../util/logger'; +import { BAG } from '../../pubUtils/dicParam'; +import { sendMailByContent } from '../mailService'; +import { SkinUpdate } from '../../db/Skin'; +import { getInitHeroById } from '../roleService'; +import { getActivities } from '../activity/activityService'; +import { reportTAEvent, reportTAUserSet } from '../sdkService'; +import { saveCoinChangeLog, saveFigureInfoLog, saveGoldChangeLog, saveItemChangeLog } from '../../pubUtils/logUtil'; +import { JewelModel, JewelType } from '../../db/Jewel'; +import { updateEplaces } from '../equipService'; +import { checkPopUpConditionInCreateHero } from '../activity/popUpShopService'; +import { CreateHeroes } from './createHero'; export class CheckMeterial { private roleId: string; diff --git a/game-server/app/services/roleService.ts b/game-server/app/services/roleService.ts index ae84f99fe..7a4985a63 100644 --- a/game-server/app/services/roleService.ts +++ b/game-server/app/services/roleService.ts @@ -8,7 +8,7 @@ import { SCHOOL } from '../pubUtils/dicParam'; import { gameData } from '../pubUtils/data'; import { SchoolModel } from '../db/School'; import { SclResultInter, SclPosInter, RewardInter, ItemInter } from '../pubUtils/interface'; -import { CheckMeterial } from './rewardService'; +import { CheckMeterial } from './role/rewardService'; import { HeroUpdate } from '../db/Hero'; import { SkinUpdate } from '../db/Skin'; import { Figure } from '../domain/dbGeneral'; diff --git a/game-server/app/services/warRewardService.ts b/game-server/app/services/warRewardService.ts index 7625534d4..a6677524e 100644 --- a/game-server/app/services/warRewardService.ts +++ b/game-server/app/services/warRewardService.ts @@ -6,7 +6,7 @@ import { BattleDropModel } from '../db/BattleDrop'; import { getRandEelmWithWeight, getRandSingleEelm, getReasonByWarType } from '../pubUtils/util'; import { BATTLE_REWARD_TYPE, BLUEPRT_CONST } from '../consts'; -import { addItems, combineItemAndJewels } from './rewardService'; +import { addItems, combineItemAndJewels } from './role/rewardService'; import { RoleModel } from '../db/Role'; import { gameData } from '../pubUtils/data'; import { DicWar } from '../pubUtils/dictionary/DicWar';