From 03e8d88dd1e5aa3960209080e2785455396d5845 Mon Sep 17 00:00:00 2001 From: qiaoxin Date: Sat, 17 Jul 2021 14:48:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E6=95=B4=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/activity/handler/dailyCoinHandler.ts | 2 +- .../servers/activity/handler/dailyRMBGiftsHandler.ts | 2 +- .../app/servers/activity/handler/gachaHandler.ts | 8 ++++---- .../servers/activity/handler/monthlyTicketHandler.ts | 5 ++--- .../app/servers/activity/handler/newHeroGKHandler.ts | 2 +- .../servers/activity/handler/newHeroGachaHandler.ts | 10 ++-------- .../app/servers/activity/handler/popUpShopHandler.ts | 2 +- .../servers/activity/handler/rechargeMoneyHandler.ts | 4 ++-- .../app/servers/activity/handler/refreshShopHandler.ts | 8 +++----- .../app/servers/activity/handler/refreshTaskHandler.ts | 4 +--- .../app/servers/activity/handler/yuanbaoShopHandler.ts | 4 ++-- game-server/app/services/activity/activityService.ts | 3 +-- .../app/services/activity/dailyChallengesService.ts | 2 +- game-server/app/services/activity/dailyCoinService.ts | 3 +-- game-server/app/services/activity/dailyGKService.ts | 2 +- game-server/app/services/activity/firstGiftService.ts | 2 +- game-server/app/services/activity/gachaService.ts | 3 +-- game-server/app/services/activity/growthFundService.ts | 4 ++-- game-server/app/services/activity/growthService.ts | 2 +- .../app/services/activity/limitPackageService.ts | 4 ++-- game-server/app/services/activity/monopolyService.ts | 2 +- .../app/services/activity/monthlyTicketService.ts | 2 +- game-server/app/services/activity/newHeroGKService.ts | 2 +- game-server/app/services/activity/popUpShopService.ts | 2 +- .../app/services/activity/rechargeMoneyService.ts | 4 ++-- .../app/services/activity/refreshShopService.ts | 4 ++-- .../app/services/activity/refreshTaskService.ts | 2 +- .../activity/selfServiceShopActivityService.ts | 2 +- .../app/services/activity/treasureHuntService.ts | 2 +- .../app/services/activity/vipRechargeMoneyService.ts | 4 ++-- game-server/app/services/activity/yuanbaoService.ts | 4 ++-- game-server/test/CheckPatten.ts | 3 +++ game-server/test/chat.test.ts | 1 + shared/db/ActivityPopUpShop.ts | 1 - 34 files changed, 50 insertions(+), 61 deletions(-) diff --git a/game-server/app/servers/activity/handler/dailyCoinHandler.ts b/game-server/app/servers/activity/handler/dailyCoinHandler.ts index 55b83d250..ed2895628 100644 --- a/game-server/app/servers/activity/handler/dailyCoinHandler.ts +++ b/game-server/app/servers/activity/handler/dailyCoinHandler.ts @@ -5,7 +5,7 @@ import { handleCost } from '../../../services/rewardService'; import { getPlayerDailyCoinData, mergeData } from '../../../services/activity/dailyCoinService'; import { ConsumeExchangeFormulaItem, CoinRewardFormulaItem } from '../../../domain/activityField/dailyCoinField'; import { ActivityDailyCoinModel } from '../../../db/ActivityDailyCoin'; -import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService'; +import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { RewardParam } from '../../../domain/activityField/rewardField'; import { ItemInter } from '../../../pubUtils/interface'; import { getGoldObject } from '../../../pubUtils/itemUtils'; diff --git a/game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts b/game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts index ca25317ab..987685436 100644 --- a/game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts +++ b/game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { STATUS, } from '../../../consts'; -import { getPlayerDailyRMBGiftsData, makeDailyRMBGiftsReward } from '../../../services/activity/dailyRMBGiftsService'; +import { getPlayerDailyRMBGiftsData } from '../../../services/activity/dailyRMBGiftsService'; import { RewardParam } from '../../../domain/activityField/rewardField'; import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { ActivityDailyRMBGiftsModel } from '../../../db/ActivityDailyRMBGifts'; diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index ad6c6079f..1f4cd48da 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -1,10 +1,10 @@ import { Application, BackendSession, HandlerService, } from "pinus"; -import { resResult, getRandEelmWithWeight, shouldRefresh, getRandSingleEelm } from "../../../pubUtils/util"; -import { STATUS, GACHA_ID, HERO_QUALITY_TYPE, TASK_TYPE, REFRESH_TIME, TIME_OUTPUT_TYPE } from "../../../consts"; +import { resResult, shouldRefresh, getRandSingleEelm } from "../../../pubUtils/util"; +import { STATUS, GACHA_ID, HERO_QUALITY_TYPE, TASK_TYPE, } from "../../../consts"; import { gameData } from "../../../pubUtils/data"; -import { GachaListReturn, GachaResult, GachaData } from "../../../domain/activityField/gachaField"; +import { GachaResult, GachaData } from "../../../domain/activityField/gachaField"; import { UserGachaModel } from "../../../db/UserGacha"; -import { refreshGacha, getFloorResult, getGachaList, getVisitedHeroList, getAllHeroByQuality, GachaPull } from "../../../services/activity/gachaService"; +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"; diff --git a/game-server/app/servers/activity/handler/monthlyTicketHandler.ts b/game-server/app/servers/activity/handler/monthlyTicketHandler.ts index c30597e84..bb486c8d8 100644 --- a/game-server/app/servers/activity/handler/monthlyTicketHandler.ts +++ b/game-server/app/servers/activity/handler/monthlyTicketHandler.ts @@ -1,8 +1,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; -import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../../consts'; -import { getPlayerMonthlyTicketData, makeMonthlyTicketReward, getPlayerMonthlyTicketDayReward } from '../../../services/activity/monthlyTicketService'; -import moment = require('moment'); +import { STATUS, } from '../../../consts'; +import { getPlayerMonthlyTicketData, getPlayerMonthlyTicketDayReward } from '../../../services/activity/monthlyTicketService'; export default function (app: Application) { diff --git a/game-server/app/servers/activity/handler/newHeroGKHandler.ts b/game-server/app/servers/activity/handler/newHeroGKHandler.ts index 25e7f1e10..84992b1fd 100644 --- a/game-server/app/servers/activity/handler/newHeroGKHandler.ts +++ b/game-server/app/servers/activity/handler/newHeroGKHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { STATUS } from '../../../consts'; -import { challengeNewHeroGK, getPlayerNewHeroGKData } from '../../../services/activity/newHeroGKService'; +import { getPlayerNewHeroGKData } from '../../../services/activity/newHeroGKService'; import { NewHeroGKItem } from '../../../domain/activityField/newHeroGKField'; diff --git a/game-server/app/servers/activity/handler/newHeroGachaHandler.ts b/game-server/app/servers/activity/handler/newHeroGachaHandler.ts index 9b63edd8b..6b8d1ffd9 100644 --- a/game-server/app/servers/activity/handler/newHeroGachaHandler.ts +++ b/game-server/app/servers/activity/handler/newHeroGachaHandler.ts @@ -1,20 +1,14 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; -import { getRandEelmWithWeight, resResult } from '../../../pubUtils/util'; +import { resResult } from '../../../pubUtils/util'; import { STATUS, GACHA_ID } from '../../../consts'; import { getPlayerNewHeroGachaData } from '../../../services/activity/newHeroGachaService'; import { RoleModel } from '../../../db/Role'; import { HeroModel } from '../../../db/Hero'; -import { RewardInter } from '../../../pubUtils/interface'; -import { CreateHeroParam } from '../../../domain/roleField/hero'; -import { GachaResult } from '../../../domain/activityField/gachaField'; -import { getResultFromContentIdNewHeroActivity, GachaPull } from '../../../services/activity/gachaService'; -import { transPiece } from '../../../pubUtils/itemUtils'; +import { GachaPull } from '../../../services/activity/gachaService'; import { addItems, createHeroes, handleCost } from '../../../services/rewardService'; import { ActivityNewHeroGachaModel } from '../../../db/ActivityNewHeroGacha'; import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { RewardParam } from '../../../domain/activityField/rewardField'; -import { ActivityModel, ActivityModelType } from '../../../db/Activity'; -import { NewHeroGachaData } from '../../../domain/activityField/newHeroGachaField'; export default function (app: Application) { diff --git a/game-server/app/servers/activity/handler/popUpShopHandler.ts b/game-server/app/servers/activity/handler/popUpShopHandler.ts index 76e77282c..66d09afa1 100644 --- a/game-server/app/servers/activity/handler/popUpShopHandler.ts +++ b/game-server/app/servers/activity/handler/popUpShopHandler.ts @@ -1,6 +1,6 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult, splitString } from '../../../pubUtils/util'; -import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, CURRENCY, STATUS, CURRENCY_TYPE, } from '../../../consts'; +import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, STATUS, CURRENCY_TYPE, } from '../../../consts'; import { getPlayerPopUpShopData } from '../../../services/activity/popUpShopService'; import { ActivityModel, ActivityModelType } from '../../../db/Activity'; import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../../../db/ActivityPopUpShop'; diff --git a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts index 524598809..5f9fd46d8 100644 --- a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts +++ b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; -import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../../consts'; -import { addRechargeMoney, getPlayerRechargeMoneyData } from '../../../services/activity/rechargeMoneyService'; +import { STATUS } from '../../../consts'; +import { getPlayerRechargeMoneyData } from '../../../services/activity/rechargeMoneyService'; import { RechargeMoneyItem } from '../../../domain/activityField/rechargeMoneyField'; import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { RewardParam } from '../../../domain/activityField/rewardField'; diff --git a/game-server/app/servers/activity/handler/refreshShopHandler.ts b/game-server/app/servers/activity/handler/refreshShopHandler.ts index 734d67581..34a8830ff 100644 --- a/game-server/app/servers/activity/handler/refreshShopHandler.ts +++ b/game-server/app/servers/activity/handler/refreshShopHandler.ts @@ -1,12 +1,10 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; -import { deltaDays, resResult } from '../../../pubUtils/util'; -import { ACTIVITY_TYPE, STATUS } from '../../../consts'; -import { getRefreshShopActivity, getPlayerRefreshShopData } from '../../../services/activity/refreshShopService'; +import { resResult } from '../../../pubUtils/util'; +import { STATUS } from '../../../consts'; +import { getPlayerRefreshShopData } from '../../../services/activity/refreshShopService'; import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { ActivityRefreshShopModel } from '../../../db/ActivityRefreshShop'; -import { RoleModel } from '../../../db/Role'; import { handleCost } from '../../../services/rewardService'; -import moment = require('moment'); export default function (app: Application) { new HandlerService(app, {}); diff --git a/game-server/app/servers/activity/handler/refreshTaskHandler.ts b/game-server/app/servers/activity/handler/refreshTaskHandler.ts index e25503fc6..69b988483 100644 --- a/game-server/app/servers/activity/handler/refreshTaskHandler.ts +++ b/game-server/app/servers/activity/handler/refreshTaskHandler.ts @@ -1,14 +1,12 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; -import { ACTIVITY_TYPE, STATUS } from '../../../consts'; +import { STATUS } from '../../../consts'; import { getPlayerRefreshTaskData } from '../../../services/activity/refreshTaskService'; import { RefreshTaskItem } from '../../../domain/activityField/refreshTaskField'; import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService'; import { RewardParam } from '../../../domain/activityField/rewardField'; import { ActivityRefreshTaskModel } from '../../../db/ActivityRefreshTask'; import { ActivityRefreshTaskPointModel } from '../../../db/ActivityRefreshTaskPoint'; -import { newHeroGiftPoint } from '../../../services/activity/newHeroGiftsService'; -import { ActivityModel } from '../../../db/Activity'; export default function (app: Application) { diff --git a/game-server/app/servers/activity/handler/yuanbaoShopHandler.ts b/game-server/app/servers/activity/handler/yuanbaoShopHandler.ts index 6f98dbe9e..688a0d574 100644 --- a/game-server/app/servers/activity/handler/yuanbaoShopHandler.ts +++ b/game-server/app/servers/activity/handler/yuanbaoShopHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; import { resResult } from '../../../pubUtils/util'; -import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../../consts'; -import { yuanbaoActivity, getPlayerYuanbaoShopData } from '../../../services/activity/yuanbaoService'; +import { STATUS } from '../../../consts'; +import { getPlayerYuanbaoShopData } from '../../../services/activity/yuanbaoService'; export default function (app: Application) { diff --git a/game-server/app/services/activity/activityService.ts b/game-server/app/services/activity/activityService.ts index 0dc660b93..828286c90 100644 --- a/game-server/app/services/activity/activityService.ts +++ b/game-server/app/services/activity/activityService.ts @@ -3,7 +3,6 @@ import { getPlayerFirstGiftData } from './firstGiftService'; import { getPlayerSignInData, } from './signInService'; import { getPlayerGrowthFundData, } from './growthFundService'; import { getPlayerLimitPackageData, } from './limitPackageService'; -import { getPlayerDailyGiftsData } from './dailyGiftsService'; import { getPlayerYuanbaoShopData, } from './yuanbaoService'; import { getPlayerMonthlyTicketData, } from './monthlyTicketService'; import { getPlayerRechargeMoneyData, } from './rechargeMoneyService'; @@ -22,7 +21,7 @@ import { getPlayerDailyRMBGiftsData } from './dailyRMBGiftsService'; import { getPlayerDailyGKData } from './dailyGKService'; import { getPlayerRefreshShopData } from './refreshShopService'; import { getPlayerRefreshTaskData } from './refreshTaskService'; -import { getMonopolyActivity, getPlayerMonopolyData } from './monopolyService'; +import { getPlayerMonopolyData } from './monopolyService'; import { getPlayerNewHeroGiftsData } from './newHeroGiftsService'; import { getPlayerNewHeroGKData } from './newHeroGKService'; import { getPlayerNewHeroGachaData } from './newHeroGachaService'; diff --git a/game-server/app/services/activity/dailyChallengesService.ts b/game-server/app/services/activity/dailyChallengesService.ts index 3ea98ddcb..2b1d0be5a 100644 --- a/game-server/app/services/activity/dailyChallengesService.ts +++ b/game-server/app/services/activity/dailyChallengesService.ts @@ -3,7 +3,7 @@ import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../../db/ActivityDailyChallenges'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; -import { DailyChallengesData, DailyItem } from '../../domain/activityField/dailyChallengesField'; +import { DailyChallengesData } from '../../domain/activityField/dailyChallengesField'; /** diff --git a/game-server/app/services/activity/dailyCoinService.ts b/game-server/app/services/activity/dailyCoinService.ts index 6964622c5..6593b7275 100644 --- a/game-server/app/services/activity/dailyCoinService.ts +++ b/game-server/app/services/activity/dailyCoinService.ts @@ -1,7 +1,6 @@ -import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../../consts'; +import { ACTIVITY_TYPE } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityDailyCoinModel, ActivityDailyCoinModelType } from '../../db/ActivityDailyCoin'; -import { ActivityGroupModel } from '../../db/ActivityGroup'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; import { DailyCoinData } from '../../domain/activityField/dailyCoinField'; diff --git a/game-server/app/services/activity/dailyGKService.ts b/game-server/app/services/activity/dailyGKService.ts index 040271936..e5e6b812e 100644 --- a/game-server/app/services/activity/dailyGKService.ts +++ b/game-server/app/services/activity/dailyGKService.ts @@ -3,7 +3,7 @@ import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityDailyGKModel, ActivityDailyGKModelType } from '../../db/ActivityDailyGK'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; -import { DailyGKData, DailyGKItem } from '../../domain/activityField/dailyGKField'; +import { DailyGKData } from '../../domain/activityField/dailyGKField'; /** diff --git a/game-server/app/services/activity/firstGiftService.ts b/game-server/app/services/activity/firstGiftService.ts index 70c1116d6..831099062 100644 --- a/game-server/app/services/activity/firstGiftService.ts +++ b/game-server/app/services/activity/firstGiftService.ts @@ -1,4 +1,4 @@ -import { ACTIVITY_TYPE, TASK_TYPE } from '../../consts'; +import { ACTIVITY_TYPE } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../../db/ActivityFirstGift'; import { RoleModel } from '../../db/Role'; diff --git a/game-server/app/services/activity/gachaService.ts b/game-server/app/services/activity/gachaService.ts index 4a14f3c63..2f87f0d19 100644 --- a/game-server/app/services/activity/gachaService.ts +++ b/game-server/app/services/activity/gachaService.ts @@ -2,14 +2,13 @@ import { GachaData, Floor, GachaResult, Hope, GachaListReturn } from "../../doma import { ActivityModel } from "../../db/Activity"; import { DicGacha } from "../../pubUtils/dictionary/DicGacha"; import { UserGachaType, UserGachaModel } from "../../db/UserGacha"; -import { shouldRefresh, getRandEelm, getRandEelmWithWeight, getFloorStatus } from "../../pubUtils/util"; +import { shouldRefresh, getRandEelm, getRandEelmWithWeight } from "../../pubUtils/util"; import { REFRESH_TIME, GACHA_TO_FLOOR, GACHA_FLOOR_TYPE, GACHA_CONTENT_TYPE, HERO_QUALITY_TYPE, GACHA_OCCUPY_HID, IT_TYPE, ITID, CONSUME_TYPE, SPECIAL_ATTR, TIME_OUTPUT_TYPE, GACHA_ID } from "../../consts"; import { getTimeFunD, getZeroPointD } from "../../pubUtils/timeUtil"; import { gameData, getDicGachaFloor } from "../../pubUtils/data"; import { RoleModel } from "../../db/Role"; import { RewardInter } from "../../pubUtils/interface"; import { CreateHeroParam } from "../../domain/roleField/hero"; -import { UserGuildType } from "../../db/UserGuild"; import { transPiece } from "../../pubUtils/itemUtils"; import { HeroType } from "../../db/Hero"; import { NewHeroGachaItem } from "../../domain/activityField/newHeroGachaField"; diff --git a/game-server/app/services/activity/growthFundService.ts b/game-server/app/services/activity/growthFundService.ts index 1bf9b8ffd..5383df268 100644 --- a/game-server/app/services/activity/growthFundService.ts +++ b/game-server/app/services/activity/growthFundService.ts @@ -1,9 +1,9 @@ import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityGrowthFundModel, ActivityGrowthFundModelType } from '../../db/ActivityGrowthFund'; -import { ActivityBuyRecordsModel, ActivityBuyRecordsModelType } from '../../db/ActivityBuyRecords'; +import { ActivityBuyRecordsModel } from '../../db/ActivityBuyRecords'; import { RoleModel } from '../../db/Role'; -import { GrowthFundData, GrowthFundItem } from '../../domain/activityField/growthFundField'; +import { GrowthFundData } from '../../domain/activityField/growthFundField'; import { ServerlistModel } from '../../db/Serverlist'; /** diff --git a/game-server/app/services/activity/growthService.ts b/game-server/app/services/activity/growthService.ts index f11411bc4..006bd09ce 100644 --- a/game-server/app/services/activity/growthService.ts +++ b/game-server/app/services/activity/growthService.ts @@ -5,7 +5,7 @@ import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../../db import { HeroModel } from '../../db/Hero'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; -import { GrowthData, GrowthItem } from '../../domain/activityField/growthField'; +import { GrowthData } from '../../domain/activityField/growthField'; /** * 获取活动数据 diff --git a/game-server/app/services/activity/limitPackageService.ts b/game-server/app/services/activity/limitPackageService.ts index 73d203114..6a818950a 100644 --- a/game-server/app/services/activity/limitPackageService.ts +++ b/game-server/app/services/activity/limitPackageService.ts @@ -1,10 +1,10 @@ import moment = require('moment'); -import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts'; +import { ACTIVITY_TYPE, STATUS } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityShopModel, ActivityShopModelType } from '../../db/ActivityShop'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; -import { LimitShopData, ShopItem } from '../../domain/activityField/limitShopField'; +import { LimitShopData } from '../../domain/activityField/limitShopField'; import { deltaDays } from '../../pubUtils/util'; import { addReward, stringToRewardParam } from './giftPackageService'; diff --git a/game-server/app/services/activity/monopolyService.ts b/game-server/app/services/activity/monopolyService.ts index 330d19cc2..244b43515 100644 --- a/game-server/app/services/activity/monopolyService.ts +++ b/game-server/app/services/activity/monopolyService.ts @@ -4,7 +4,7 @@ import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../../db/Activ import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../../db/ActivityMonopolyLand'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; -import { MonopolyData, LandItem } from '../../domain/activityField/monopolyField'; +import { MonopolyData } from '../../domain/activityField/monopolyField'; /** diff --git a/game-server/app/services/activity/monthlyTicketService.ts b/game-server/app/services/activity/monthlyTicketService.ts index 09aa89276..7fbd0155b 100644 --- a/game-server/app/services/activity/monthlyTicketService.ts +++ b/game-server/app/services/activity/monthlyTicketService.ts @@ -1,4 +1,4 @@ -import { ACTIVITY_TYPE, MAIL_TYPE, STATUS, TASK_TYPE } from '../../consts'; +import { ACTIVITY_TYPE, MAIL_TYPE, STATUS } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityMonthlyTicketModel, ActivityMonthlyTicketModelType } from '../../db/ActivityMonthlyTicket'; import { RewardParam } from '../../domain/activityField/rewardField'; diff --git a/game-server/app/services/activity/newHeroGKService.ts b/game-server/app/services/activity/newHeroGKService.ts index c3c5e075e..4136e1409 100644 --- a/game-server/app/services/activity/newHeroGKService.ts +++ b/game-server/app/services/activity/newHeroGKService.ts @@ -3,7 +3,7 @@ import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityNewHeroGKModel, ActivityNewHeroGKModelType } from '../../db/ActivityNewHeroGK'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; -import { NewHeroGKData, NewHeroGKItem } from '../../domain/activityField/newHeroGKField'; +import { NewHeroGKData } from '../../domain/activityField/newHeroGKField'; /** diff --git a/game-server/app/services/activity/popUpShopService.ts b/game-server/app/services/activity/popUpShopService.ts index c740ad794..f526da60d 100644 --- a/game-server/app/services/activity/popUpShopService.ts +++ b/game-server/app/services/activity/popUpShopService.ts @@ -1,4 +1,4 @@ -import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts'; +import { ACTIVITY_TYPE, STATUS } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { PopUpShopData, } from '../../domain/activityField/popUpShopField'; import { RewardParam } from '../../domain/activityField/rewardField'; diff --git a/game-server/app/services/activity/rechargeMoneyService.ts b/game-server/app/services/activity/rechargeMoneyService.ts index 8a4f37e3d..ca71669bf 100644 --- a/game-server/app/services/activity/rechargeMoneyService.ts +++ b/game-server/app/services/activity/rechargeMoneyService.ts @@ -1,7 +1,7 @@ -import { ACTIVITY_TYPE, TASK_TYPE } from '../../consts'; +import { ACTIVITY_TYPE } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityRechargeMoneyModel, ActivityRechargeMoneyModelType } from '../../db/ActivityRechargeMoney'; -import { RechargeMoneyData, RechargeMoneyItem } from '../../domain/activityField/rechargeMoneyField'; +import { RechargeMoneyData } from '../../domain/activityField/rechargeMoneyField'; import moment = require('moment'); import { ServerlistModel } from '../../db/Serverlist'; import { RoleModel } from '../../db/Role'; diff --git a/game-server/app/services/activity/refreshShopService.ts b/game-server/app/services/activity/refreshShopService.ts index ff74e3305..612bf3a17 100644 --- a/game-server/app/services/activity/refreshShopService.ts +++ b/game-server/app/services/activity/refreshShopService.ts @@ -1,10 +1,10 @@ import moment = require('moment'); -import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts'; +import { ACTIVITY_TYPE, STATUS } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityRefreshShopModel, ActivityRefreshShopModelType } from '../../db/ActivityRefreshShop'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; -import { RefreshShopData, RefreshShopItem } from '../../domain/activityField/refreshShopField'; +import { RefreshShopData } from '../../domain/activityField/refreshShopField'; import { deltaDays } from '../../pubUtils/util'; import { addReward, stringToRewardParam } from './giftPackageService'; diff --git a/game-server/app/services/activity/refreshTaskService.ts b/game-server/app/services/activity/refreshTaskService.ts index 73a624ff9..e49458b0b 100644 --- a/game-server/app/services/activity/refreshTaskService.ts +++ b/game-server/app/services/activity/refreshTaskService.ts @@ -4,7 +4,7 @@ import { ActivityRefreshTaskModel, ActivityRefreshTaskModelType } from '../../db import { ActivityRefreshTaskPointModel, ActivityRefreshTaskPointModelType } from '../../db/ActivityRefreshTaskPoint'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; -import { RefreshTaskData, RefreshTaskItem } from '../../domain/activityField/refreshTaskField'; +import { RefreshTaskData } from '../../domain/activityField/refreshTaskField'; /** diff --git a/game-server/app/services/activity/selfServiceShopActivityService.ts b/game-server/app/services/activity/selfServiceShopActivityService.ts index 4aa589e5f..902d5276c 100644 --- a/game-server/app/services/activity/selfServiceShopActivityService.ts +++ b/game-server/app/services/activity/selfServiceShopActivityService.ts @@ -6,7 +6,7 @@ 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, getSelectedReward, stringToRewardParam } from './giftPackageService'; +import { addReward, stringToRewardParam } from './giftPackageService'; import moment = require('moment'); import { RoleModel } from '../../db/Role'; diff --git a/game-server/app/services/activity/treasureHuntService.ts b/game-server/app/services/activity/treasureHuntService.ts index 483a82f92..7914f9548 100644 --- a/game-server/app/services/activity/treasureHuntService.ts +++ b/game-server/app/services/activity/treasureHuntService.ts @@ -9,7 +9,7 @@ import { ServerlistModel } from '../../db/Serverlist'; import { ServerTempModel, ServerTempModelType } from '../../db/ServerTemp'; import { TreasureHuntData } from '../../domain/activityField/treasureHuntField'; import { deltaDays } from '../../pubUtils/util'; -import { addReward, stringToConsumeParam, stringToRewardParam } from './giftPackageService'; +import { addReward, stringToRewardParam } from './giftPackageService'; import { RewardParam } from '../../domain/activityField/rewardField'; import { RoleModel } from '../../db/Role'; diff --git a/game-server/app/services/activity/vipRechargeMoneyService.ts b/game-server/app/services/activity/vipRechargeMoneyService.ts index 0d0c4d413..1b2deb44a 100644 --- a/game-server/app/services/activity/vipRechargeMoneyService.ts +++ b/game-server/app/services/activity/vipRechargeMoneyService.ts @@ -1,7 +1,7 @@ -import { ACTIVITY_TYPE, TASK_TYPE } from '../../consts'; +import { ACTIVITY_TYPE } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityVipRechargeMoneyModel, ActivityVipRechargeMoneyModelType } from '../../db/ActivityVipRechargeMoney'; -import { VipRechargeMoneyData, VipRechargeMoneyItem } from '../../domain/activityField/vipRechargeMoneyField'; +import { VipRechargeMoneyData } from '../../domain/activityField/vipRechargeMoneyField'; import { ServerlistModel } from '../../db/Serverlist'; import { RoleModel } from '../../db/Role'; diff --git a/game-server/app/services/activity/yuanbaoService.ts b/game-server/app/services/activity/yuanbaoService.ts index a1cb0e670..cdbb3b814 100644 --- a/game-server/app/services/activity/yuanbaoService.ts +++ b/game-server/app/services/activity/yuanbaoService.ts @@ -1,10 +1,10 @@ -import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts'; +import { ACTIVITY_TYPE, STATUS } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { RoleModel } from '../../db/Role'; import { ServerlistModel } from '../../db/Serverlist'; import { UserOrderModel, UserOrderModelType } from '../../db/UserOrder'; import { RewardParam } from '../../domain/activityField/rewardField'; -import { YuanBaoShopData, YuanBaoShopItem } from '../../domain/activityField/yuanBaoShopField'; +import { YuanBaoShopData } from '../../domain/activityField/yuanBaoShopField'; import { addReward, stringToRewardParam } from './giftPackageService'; /** diff --git a/game-server/test/CheckPatten.ts b/game-server/test/CheckPatten.ts index 6f293b1e8..72fbfcf08 100644 --- a/game-server/test/CheckPatten.ts +++ b/game-server/test/CheckPatten.ts @@ -1,6 +1,9 @@ import { expect } from 'chai'; export function checkSuccessResponse(response, withData = true) { + if (response.code != 0) { + console.log('checkSuccessResponse info:', JSON.stringify(response)) + } expect(response).to.be.an('object'); expect(response.code).equal(0); if (withData) { diff --git a/game-server/test/chat.test.ts b/game-server/test/chat.test.ts index 394b3e4a1..fc74c7e8f 100644 --- a/game-server/test/chat.test.ts +++ b/game-server/test/chat.test.ts @@ -291,6 +291,7 @@ describe('聊天测试', function () { setTimeout(() => { if (i === HERO_GROW_MAX.STAR && j > 0) { } else { + console.log('dddddddddddd', i, j); pinusClient.request('role.heroHandler.starUp', { hid: XIAHOUQINGYI_HID, star: i, starStage: j }, (starUpRes) => { if (starUpRes.code === STATUS.ROLE_STAR_REACH_MAX.code) { pinusClient.request('role.heroHandler.qualityUp', { hid: XIAHOUQINGYI_HID, quality: 2 }, (qualityUpRes) => { diff --git a/shared/db/ActivityPopUpShop.ts b/shared/db/ActivityPopUpShop.ts index 61e1b49a1..b3c8ecf3b 100644 --- a/shared/db/ActivityPopUpShop.ts +++ b/shared/db/ActivityPopUpShop.ts @@ -1,6 +1,5 @@ import BaseModel from './BaseModel'; import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; -// import moment = require('moment'); /**