diff --git a/game-server/app/servers/activity/handler/selfServiceShopHandler.ts b/game-server/app/servers/activity/handler/selfServiceShopHandler.ts index ca94b4677..0b7254f90 100644 --- a/game-server/app/servers/activity/handler/selfServiceShopHandler.ts +++ b/game-server/app/servers/activity/handler/selfServiceShopHandler.ts @@ -6,11 +6,10 @@ import { handleCost } from '../../../services/role/rewardService'; import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../../../db/ActivitySelfServiceShop'; import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService'; import { ActivitySelfServiceGoodsModel } from '../../../db/ActivitySelfServiceGoods'; -import { ActivityModel, ActivityModelType } from '../../../db/Activity'; +import { ActivityModelType } from '../../../db/Activity'; import { addSelfServiceShopGiftReward, getSelfServiceShopActivityData, getPlayerActivityData } from '../../../services/activity/selfServiceShopActivityService'; import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { random } from 'underscore'; -import { RoleModel } from '../../../db/Role'; import { getActivityById } from '../../../services/activity/activityService'; import { getRoleCreateTime, getServerCreateTime } from '../../../services/redisService'; diff --git a/game-server/app/services/activity/dailyChallengesService.ts b/game-server/app/services/activity/dailyChallengesService.ts index f16c5479a..145a6016f 100644 --- a/game-server/app/services/activity/dailyChallengesService.ts +++ b/game-server/app/services/activity/dailyChallengesService.ts @@ -1,8 +1,6 @@ import { ACTIVITY_TYPE } from '../../consts'; -import { ActivityModel, ActivityModelType } from '../../db/Activity'; +import { ActivityModelType } from '../../db/Activity'; import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../../db/ActivityDailyChallenges'; -import { RoleModel } from '../../db/Role'; -import { ServerlistModel } from '../../db/Serverlist'; import { DailyChallengesData } from '../../domain/activityField/dailyChallengesField'; import { getRoleCreateTime, getServerCreateTime } from '../redisService'; import { getActivitiesByType, getActivityById } from './activityService'; diff --git a/game-server/app/services/activity/dailyCoinService.ts b/game-server/app/services/activity/dailyCoinService.ts index d90fbf2be..7e2aeb4e9 100644 --- a/game-server/app/services/activity/dailyCoinService.ts +++ b/game-server/app/services/activity/dailyCoinService.ts @@ -1,12 +1,10 @@ import { ACTIVITY_TYPE, MAIL_TYPE, REFRESH_TIME } from '../../consts'; -import { ActivityModel, ActivityModelType } from '../../db/Activity'; +import { ActivityModelType } from '../../db/Activity'; import { ActivityDailyCoinModel, ActivityDailyCoinModelType } from '../../db/ActivityDailyCoin'; -import { RoleModel } from '../../db/Role'; -import { ServerlistModel, ServerlistType } from '../../db/Serverlist'; +import { ServerlistType } from '../../db/Serverlist'; import { DailyCoinData } from '../../domain/activityField/dailyCoinField'; import { RewardInter } from '../../pubUtils/interface'; import { stringWithTypeToRewardInter } from '../../pubUtils/roleUtil'; -import { getZeroPointD, getZeroPointOfTimeD } from '../../pubUtils/timeUtil'; import { sendMailByContent } from '../mailService'; import { getRoleCreateTime, getServerCreateTime } from '../redisService'; import { getActivitiesByType, getActivityById } from './activityService'; diff --git a/game-server/app/services/activity/dailyGKService.ts b/game-server/app/services/activity/dailyGKService.ts index 64e419159..7409ec4da 100644 --- a/game-server/app/services/activity/dailyGKService.ts +++ b/game-server/app/services/activity/dailyGKService.ts @@ -1,8 +1,6 @@ import { ACTIVITY_TYPE } from '../../consts'; -import { ActivityModel, ActivityModelType } from '../../db/Activity'; +import { ActivityModelType } from '../../db/Activity'; import { ActivityDailyGKModel, ActivityDailyGKModelType } from '../../db/ActivityDailyGK'; -import { RoleModel } from '../../db/Role'; -import { ServerlistModel } from '../../db/Serverlist'; import { DailyGKData } from '../../domain/activityField/dailyGKField'; import { getRoleCreateTime, getServerCreateTime } from '../redisService'; import { getActivitiesByType, getActivityById } from './activityService'; diff --git a/game-server/app/services/activity/dailyGiftsService.ts b/game-server/app/services/activity/dailyGiftsService.ts index 9ee70e951..0d03df1e5 100644 --- a/game-server/app/services/activity/dailyGiftsService.ts +++ b/game-server/app/services/activity/dailyGiftsService.ts @@ -1,8 +1,6 @@ import { ACTIVITY_TYPE } from '../../consts'; -import { ActivityModel, ActivityModelType } from '../../db/Activity'; +import { ActivityModelType } from '../../db/Activity'; import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../../db/ActivityDailyGifts'; -import { RoleModel } from '../../db/Role'; -import { ServerlistModel } from '../../db/Serverlist'; import { DailyGiftsData } from '../../domain/activityField/dailyGiftsField'; import { getRoleCreateTime, getServerCreateTime } from '../redisService'; import { getActivitiesByType, getActivityById } from './activityService'; diff --git a/game-server/app/services/activity/dailyMealService.ts b/game-server/app/services/activity/dailyMealService.ts index 72d07f510..3e09b0a03 100644 --- a/game-server/app/services/activity/dailyMealService.ts +++ b/game-server/app/services/activity/dailyMealService.ts @@ -1,8 +1,6 @@ import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../../consts'; -import { ActivityModel, ActivityModelType } from '../../db/Activity'; +import { ActivityModelType } from '../../db/Activity'; import { ActivityDailyMealModel, ActivityDailyMealModelType } from '../../db/ActivityDailyMeal'; -import { RoleModel } from '../../db/Role'; -import { ServerlistModel } from '../../db/Serverlist'; import { DailyMealData } from '../../domain/activityField/dailyMealField'; import { getRoleCreateTime, getServerCreateTime } from '../redisService'; import { getActivitiesByType, getActivityById } from './activityService'; diff --git a/game-server/app/services/activity/luckyTurntableService.ts b/game-server/app/services/activity/luckyTurntableService.ts index 170264f33..113cb4d59 100644 --- a/game-server/app/services/activity/luckyTurntableService.ts +++ b/game-server/app/services/activity/luckyTurntableService.ts @@ -1,5 +1,4 @@ import { ActivityTurntableModel } from "../../db/ActivityTurntableRec"; -import { RoleModel } from "../../db/Role"; import { LuckyTurntableData } from "../../domain/activityField/luckyTurntableField"; import { shouldRefresh } from "../../pubUtils/util"; import { getRoleCreateTime, getServerCreateTime } from "../redisService"; diff --git a/game-server/app/services/activity/monopolyService.ts b/game-server/app/services/activity/monopolyService.ts index a6c222d7f..4709d5936 100644 --- a/game-server/app/services/activity/monopolyService.ts +++ b/game-server/app/services/activity/monopolyService.ts @@ -1,9 +1,7 @@ import { ACTIVITY_TYPE } from '../../consts'; -import { ActivityModel, ActivityModelType } from '../../db/Activity'; +import { ActivityModelType } from '../../db/Activity'; import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../../db/ActivityMonopoly'; import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../../db/ActivityMonopolyLand'; -import { RoleModel } from '../../db/Role'; -import { ServerlistModel } from '../../db/Serverlist'; import { MonopolyData } from '../../domain/activityField/monopolyField'; import { getRoleCreateTime, getServerCreateTime } from '../redisService'; import { getActivitiesByType, getActivityById } from './activityService'; diff --git a/game-server/app/services/activity/rechargeMoneyService.ts b/game-server/app/services/activity/rechargeMoneyService.ts index aa5af5c62..05c2cf8e4 100644 --- a/game-server/app/services/activity/rechargeMoneyService.ts +++ b/game-server/app/services/activity/rechargeMoneyService.ts @@ -1,7 +1,5 @@ import { ActivityRechargeMoneyModel, ActivityRechargeMoneyModelType } from '../../db/ActivityRechargeMoney'; import { RechargeMoneyData } from '../../domain/activityField/rechargeMoneyField'; -import moment = require('moment'); -import { RoleModel } from '../../db/Role'; import { getActivitiesByType, getActivityById, pushActivities, pushActivityInter } from './activityService'; import { ACTIVITY_TYPE } from '../../consts'; import { getRoleCreateTime, getRoleOnlineInfo, getServerCreateTime } from '../redisService'; diff --git a/game-server/app/services/activity/selfServiceShopActivityService.ts b/game-server/app/services/activity/selfServiceShopActivityService.ts index 9a85f5d03..df7b5ba90 100644 --- a/game-server/app/services/activity/selfServiceShopActivityService.ts +++ b/game-server/app/services/activity/selfServiceShopActivityService.ts @@ -1,14 +1,12 @@ import { ACTIVITY_TYPE, ITEM_CHANGE_REASON, REFRESH_TIME, STATUS } from '../../consts'; -import { ActivityModel, ActivityModelType } from '../../db/Activity'; +import { ActivityModelType } from '../../db/Activity'; import { ActivitySelfServiceGoodsModel, ActivitySelfServiceGoodsModelType } from '../../db/ActivitySelfServiceGoods'; import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../../db/ActivitySelfServiceShop'; import { ActivitySelfServiceModel } from '../../db/ActivitySelfService'; -import { ServerlistModel } from '../../db/Serverlist'; import { RewardParam } from '../../domain/activityField/rewardField'; import { SelfServiceShopData, SelfServiceShopItem } from '../../domain/activityField/selfServiceShopField'; import { addReward, stringToRewardParam } from './giftPackageService'; import moment = require('moment'); -import { RoleModel } from '../../db/Role'; import { getActivitiesByType, getActivityById } from './activityService'; import { getRoleCreateTime, getServerCreateTime } from '../redisService'; diff --git a/game-server/app/services/activity/signInService.ts b/game-server/app/services/activity/signInService.ts index be1965dc5..e1908d4bb 100644 --- a/game-server/app/services/activity/signInService.ts +++ b/game-server/app/services/activity/signInService.ts @@ -120,7 +120,6 @@ export async function canBuyVip(lv: number) { if (moment(openTime).valueOf() + 24 * 60 * 60 * 1000 * 8 > moment(new Date()).valueOf()) {//开服时间8天后才能开启vip签到 return false; } - // let { lv } = await RoleModel.findByRoleId(roleId); if (lv < SIGNIN_VIP_OPEN_LIMIT) {//玩家等级大于等于15级才能开启vip签到 return false } diff --git a/game-server/app/services/activity/taskPassService.ts b/game-server/app/services/activity/taskPassService.ts index 2ad2f4037..1f6ea4df8 100644 --- a/game-server/app/services/activity/taskPassService.ts +++ b/game-server/app/services/activity/taskPassService.ts @@ -1,7 +1,6 @@ import { ACTIVITY_TYPE, STATUS } from "../../consts"; import { ActivityModelType } from "../../db/Activity"; import { ActivityTaskPassModel } from "../../db/ActivityTaskPass"; -import { RoleModel } from "../../db/Role"; import { TaskPassData } from "../../domain/activityField/taskPassField"; import { getRoleCreateTime, getServerCreateTime } from "../redisService"; import { getActivitiesByType, getActivityById, pushActivityInter } from "./activityService"; diff --git a/game-server/app/services/activity/vipRechargeMoneyService.ts b/game-server/app/services/activity/vipRechargeMoneyService.ts index b25e43678..b8ec30d35 100644 --- a/game-server/app/services/activity/vipRechargeMoneyService.ts +++ b/game-server/app/services/activity/vipRechargeMoneyService.ts @@ -1,9 +1,6 @@ import { ACTIVITY_TYPE } from '../../consts'; -import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityVipRechargeMoneyModel, ActivityVipRechargeMoneyModelType } from '../../db/ActivityVipRechargeMoney'; import { VipRechargeMoneyData } from '../../domain/activityField/vipRechargeMoneyField'; -import { ServerlistModel } from '../../db/Serverlist'; -import { RoleModel } from '../../db/Role'; import { getActivitiesByType, getActivityById } from './activityService'; import { getRoleCreateTime, getServerCreateTime } from '../redisService'; diff --git a/game-server/app/services/activity/yuanbaoService.ts b/game-server/app/services/activity/yuanbaoService.ts index 79f08258a..729e45292 100644 --- a/game-server/app/services/activity/yuanbaoService.ts +++ b/game-server/app/services/activity/yuanbaoService.ts @@ -1,7 +1,5 @@ import { ACTIVITY_TYPE, ITEM_CHANGE_REASON, STATUS } from '../../consts'; -import { ActivityModel, ActivityModelType } from '../../db/Activity'; -import { RoleModel } from '../../db/Role'; -import { ServerlistModel } from '../../db/Serverlist'; +import { ActivityModelType } from '../../db/Activity'; import { UserOrderModel, UserOrderModelType } from '../../db/UserOrder'; import { RewardParam } from '../../domain/activityField/rewardField'; import { YuanBaoShopData } from '../../domain/activityField/yuanBaoShopField'; diff --git a/game-server/app/services/chatChannelService.ts b/game-server/app/services/chatChannelService.ts index c82a82b4d..21812d7e1 100644 --- a/game-server/app/services/chatChannelService.ts +++ b/game-server/app/services/chatChannelService.ts @@ -4,7 +4,6 @@ import { groupRoomId } from './chatService'; import { pinus } from 'pinus'; import { crc32 } from 'crc'; import { CHANNEL_PREFIX } from '../consts'; -import { RoleModel } from './../db/Role'; export async function channelServer(roomId: string) { const existSid = await redisChannelServer(roomId); diff --git a/game-server/app/services/role/createHero.ts b/game-server/app/services/role/createHero.ts index ac0d4c0a4..267620da3 100644 --- a/game-server/app/services/role/createHero.ts +++ b/game-server/app/services/role/createHero.ts @@ -3,15 +3,13 @@ import { SkinModel } from "../../db/Skin"; import { HeroModel, HeroSkin, HeroType, HeroUpdate } from "../../db/Hero"; import { SkinUpdate } from "../../db/Skin"; import { nowSeconds } from "../../pubUtils/timeUtil"; -import { resResult } from "../../pubUtils/util"; import { CreateHeroParam, HeroParam, HeroShowParam } from "../../domain/roleField/hero"; -import { pinus } from "pinus"; import { ItemInter, RewardInter } from "../../pubUtils/interface"; import { transPiece } from "./util"; import { addItems, unlockFigure, } from "./rewardService"; import { CounterModel } from "../../db/Counter"; import { calculateCes } from "../playerCeService"; -import { RoleModel, RoleType, RoleUpdate } from "../../db/Role"; +import { RoleUpdate } from "../../db/Role"; import { sendMessageToUserWithSuc } from "../pushService"; import { checkTaskInCreateHero } from "../task/taskService"; import { filterHeroes } from "../dataService"; diff --git a/game-server/app/services/warRewardService.ts b/game-server/app/services/warRewardService.ts index 764ca757d..f0c7e1de4 100644 --- a/game-server/app/services/warRewardService.ts +++ b/game-server/app/services/warRewardService.ts @@ -7,11 +7,9 @@ import { BattleDropModel } from '../db/BattleDrop'; import { getRandEelmWithWeight, getRandSingleEelm, getReasonByWarType } from '../pubUtils/util'; import { BATTLE_REWARD_TYPE, BLUEPRT_CONST } from '../consts'; import { addItems } from './role/rewardService'; -import { RoleModel } from '../db/Role'; import { gameData } from '../pubUtils/data'; import { DicWar } from '../pubUtils/dictionary/DicWar'; import { RewardInter } from '../pubUtils/interface'; -import { getZeroPointD } from '../pubUtils/timeUtil'; import { combineItems } from './role/util'; export class WarReward {