活动：调整活动代码路径

game-server/app/servers/activity/handler/activityHandler.ts

@@ -1,35 +1,11 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
-import { ACTIVITY_TYPE, ACTIVITY_GROUP_TYPE, SERVER_OPEN_TIME, STATUS, TASK_TYPE } from '../../../consts';
+import { STATUS, TASK_TYPE } from '../../../consts';
-import { firstGiftActivity, getPlayerFirstGiftData } from '../../../services/firstGiftService';
-import { newPlayerSignInActivity, signInActivity, signInVIPActivity } from '../../../services/signInService';
-import { growthFundActivity } from '../../../services/growthFundService';
-import { limitPackageActivity, newPlayerLimitPackageActivity } from '../../../services/limitPackageService';
-import { growthActivity } from '../../../services/growthService';
-import { dailyChallengesActivity } from '../../../services/dailyChallengesService';
-import { dailyGiftsActivity } from '../../../services/dailyGiftsService';
-import { yuanbaoActivity } from '../../../services/yuanbaoService';
-import { monthlyTicketActivity } from '../../../services/monthlyTicketService';
-import { rechargeMoneyActivity } from '../../../services/rechargeMoneyService';
-import moment = require('moment');
-import { RoleModel } from '../../../db/Role';
-import { playerThirtyDaysActivityDays, thirtyDaysActivity } from '../../../services/thirtyDaysService';
-import { dailyRMBGiftsActivity } from '../../../services/dailyRMBGiftsService';
-import { popUpShopActivity } from '../../../services/popUpShopService';
-import { vipRechargeMoneyActivity } from '../../../services/vipRechargeMoneyService';
-import { sevenDaysActivity } from '../../../services/sevenDaysService';
 import { checkActivityTask } from '../../../services/taskService';
-import { treasureHuntActivity } from '../../../services/treasureHuntService';
-import { getSelfServiceShopActivityData } from '../../../services/selfServiceShopActivityService';
-import { ActivitySelfServiceGoodsModel } from '../../../db/ActivitySelfServiceGoods';
-import { dailyMealActivity } from '../../../services/dailyMealService';
-import { dailyCoinActivity } from '../../../services/dailyCoinService';
 import { ActivityGroupModel } from '../../../db/ActivityGroup';
 import { ServerlistModel } from '../../../db/Serverlist';
-import { getActivity } from '../../../services/activityService';
+import { getActivity } from '../../../services/activity/activityService';
 import { ActivityModel } from '../../../db/Activity';
-// import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
-// import { isComplete } from '../../../pubUtils/taskUtil';
 
 export default function (app: Application) {
     return new ActivityHandler(app);

game-server/app/servers/activity/handler/activityMonopolyHandler.ts

@@ -4,11 +4,11 @@ import { ACTIVITY_TYPE, LAND_TYPE, SERVER_OPEN_TIME, STATUS, TASK_TYPE, CURRENCY
 import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../../../db/ActivityMonopoly';
 import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../../../db/ActivityMonopolyLand';
 import { ActivityModel } from '../../../db/Activity';
-import { getPlayerMonopolyData, nextPosition } from '../../../services/monopolyService';
+import { getPlayerMonopolyData, nextPosition } from '../../../services/activity/monopolyService';
 import { random } from 'underscore';
 import { handleCost } from '../../../services/rewardService';
-import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { getPlayerRefreshShopData, getPlayerRefreshShopDataByRoundIndex } from '../../../services/refreshShopService';
+import { getPlayerRefreshShopData, getPlayerRefreshShopDataByRoundIndex } from '../../../services/activity/refreshShopService';
 import { ActivityRefreshShopModel } from '../../../db/ActivityRefreshShop';
 
 export default function (app: Application) {

game-server/app/servers/activity/handler/dailyChallengesHandler.ts

@@ -1,9 +1,9 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS } from '../../../consts';
-import { getPlayerDailyChallengesData } from '../../../services/dailyChallengesService';
+import { getPlayerDailyChallengesData } from '../../../services/activity/dailyChallengesService';
 import { DailyItem } from '../../../domain/activityField/dailyChallengesField';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
 

game-server/app/servers/activity/handler/dailyCoinHandler.ts

@@ -2,10 +2,10 @@ import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, STATUS } from '../../../consts';
 import { handleCost } from '../../../services/rewardService';
-import { getPlayerDailyCoinData, mergeData } from '../../../services/dailyCoinService';
+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/giftPackageService';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import { ItemInter } from '../../../pubUtils/interface';
 import { getGoldObject } from '../../../pubUtils/itemUtils';

game-server/app/servers/activity/handler/dailyGKHandler.ts

@@ -1,11 +1,8 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS } from '../../../consts';
-import { getPlayerDailyGKData } from '../../../services/dailyGKService';
+import { getPlayerDailyGKData } from '../../../services/activity/dailyGKService';
 import { DailyGKItem } from '../../../domain/activityField/dailyGKField';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
-import { ActivityDailyGKModel } from '../../../db/ActivityDailyGK';
 
 
 export default function (app: Application) {

game-server/app/servers/activity/handler/dailyGiftsHandler.ts

@@ -2,10 +2,10 @@ import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, ACTIVITY_RESOURCES_TYPE } from '../../../consts';
 import { handleCost } from '../../../services/rewardService';
-import { getPlayerDailyGiftsData } from '../../../services/dailyGiftsService';
+import { getPlayerDailyGiftsData } from '../../../services/activity/dailyGiftsService';
 import { DailyGiftItem } from '../../../domain/activityField/dailyGiftsField';
 import { ActivityDailyGiftsModel } from '../../../db/ActivityDailyGifts';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 
 

game-server/app/servers/activity/handler/dailyMealHandler.ts

@@ -2,10 +2,10 @@ import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS } from '../../../consts';
 import { handleCost } from '../../../services/rewardService';
-import { getPlayerDailyMealData } from '../../../services/dailyMealService';
+import { getPlayerDailyMealData } from '../../../services/activity/dailyMealService';
 import { DailyMealItem } from '../../../domain/activityField/dailyMealField';
 import { ActivityDailyMealModel } from '../../../db/ActivityDailyMeal';
-import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import moment = require('moment');
 

game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts

@@ -1,9 +1,9 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, } from '../../../consts';
-import { getPlayerDailyRMBGiftsData, makeDailyRMBGiftsReward } from '../../../services/dailyRMBGiftsService';
+import { getPlayerDailyRMBGiftsData, makeDailyRMBGiftsReward } from '../../../services/activity/dailyRMBGiftsService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { ActivityDailyRMBGiftsModel } from '../../../db/ActivityDailyRMBGifts';
 import moment = require('moment');
 

game-server/app/servers/activity/handler/firstGiftHandler.ts

@@ -1,9 +1,9 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { FIRST_GIFT_STATE, STATUS } from '../../../consts';
-import { getPlayerFirstGiftData } from '../../../services/firstGiftService';
+import { getPlayerFirstGiftData } from '../../../services/activity/firstGiftService';
 import { RoleModel } from '../../../db/Role';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { ActivityFirstGiftModel } from '../../../db/ActivityFirstGift';
 
 export default function (app: Application) {

game-server/app/servers/activity/handler/gachaHandler.ts

@@ -4,7 +4,7 @@ import { STATUS, GACHA_ID, HERO_QUALITY_TYPE, TASK_TYPE, REFRESH_TIME, TIME_OUTP
 import { gameData } from "../../../pubUtils/data";
 import { GachaListReturn, GachaResult, GachaData } from "../../../domain/activityField/gachaField";
 import { UserGachaModel } from "../../../db/UserGacha";
-import { refreshGacha, getFloorResult, getResultFromContentId, getGachaList, getVisitedHeroList, getAllHeroByQuality } from "../../../services/gachaService";
+import { refreshGacha, getFloorResult, getResultFromContentId, getGachaList, getVisitedHeroList, getAllHeroByQuality } from "../../../services/activity/gachaService";
 import { RoleModel } from "../../../db/Role";
 import { HeroModel } from "../../../db/Hero";
 import { RewardInter } from "../../../pubUtils/interface";

game-server/app/servers/activity/handler/growthFundHandler.ts

@@ -1,10 +1,10 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS } from '../../../consts';
-import { getPlayerGrowthFundData } from '../../../services/growthFundService';
+import { getPlayerGrowthFundData } from '../../../services/activity/growthFundService';
 import { GrowthFundItem } from '../../../domain/activityField/growthFundField';
 import { ActivityGrowthFundModel } from '../../../db/ActivityGrowthFund';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 
 

game-server/app/servers/activity/handler/growthHandler.ts

@@ -1,10 +1,10 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS } from '../../../consts';
-import { getPlayerGrowthData } from '../../../services/growthService';
+import { getPlayerGrowthData } from '../../../services/activity/growthService';
 import { GrowthItem, PointRewardItem } from '../../../domain/activityField/growthField';
 import { ActivityGrowthModel } from '../../../db/ActivityGrowth';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import { ActivityGrowthPointModel } from '../../../db/ActivityGrowthPoint';
 

game-server/app/servers/activity/handler/limitPackageHandler.ts

@@ -1,8 +1,8 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { ACTIVITY_TYPE, STATUS } from '../../../consts';
-import { newPlayerLimitPackageActivity, getPlayerLimitPackageData } from '../../../services/limitPackageService';
+import { newPlayerLimitPackageActivity, getPlayerLimitPackageData } from '../../../services/activity/limitPackageService';
-import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { ActivityShopModel } from '../../../db/ActivityShop';
 import moment = require('moment');
 import { RoleModel } from '../../../db/Role';

game-server/app/servers/activity/handler/monthlyTicketHandler.ts

@@ -1,7 +1,7 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../../consts';
-import { getPlayerMonthlyTicketData, makeMonthlyTicketReward, getPlayerMonthlyTicketDayReward } from '../../../services/monthlyTicketService';
+import { getPlayerMonthlyTicketData, makeMonthlyTicketReward, getPlayerMonthlyTicketDayReward } from '../../../services/activity/monthlyTicketService';
 import moment = require('moment');
 
 

game-server/app/servers/activity/handler/newHeroGiftsHandler.ts

@@ -1,9 +1,9 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, } from '../../../consts';
-import { getPlayerNewHeroGiftsData } from '../../../services/newHeroGiftsService';
+import { getPlayerNewHeroGiftsData } from '../../../services/activity/newHeroGiftsService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { ActivityNewHeroGiftModel } from '../../../db/ActivityNewHeroGift';
 import moment = require('moment');
 

game-server/app/servers/activity/handler/popUpShopHandler.ts

@@ -1,11 +1,11 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult, splitString } from '../../../pubUtils/util';
 import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, CURRENCY, STATUS, CURRENCY_TYPE, } from '../../../consts';
-import { getPlayerPopUpShopData } from '../../../services/popUpShopService';
+import { getPlayerPopUpShopData } from '../../../services/activity/popUpShopService';
 import { ActivityModel, ActivityModelType } from '../../../db/Activity';
 import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../../../db/ActivityPopUpShop';
 import { PopUpShopData } from '../../../domain/activityField/popUpShopField';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import { handleCost } from '../../../services/rewardService';
 import moment = require('moment');

game-server/app/servers/activity/handler/rechargeMoneyHandler.ts

@@ -1,9 +1,9 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../../consts';
-import { addRechargeMoney, getPlayerRechargeMoneyData } from '../../../services/rechargeMoneyService';
+import { addRechargeMoney, getPlayerRechargeMoneyData } from '../../../services/activity/rechargeMoneyService';
 import { RechargeMoneyItem } from '../../../domain/activityField/rechargeMoneyField';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import { ActivityRechargeMoneyModel } from '../../../db/ActivityRechargeMoney';
 

game-server/app/servers/activity/handler/refreshShopHandler.ts

@@ -1,8 +1,8 @@
 import { Application, BackendSession } from 'pinus';
 import { deltaDays, resResult } from '../../../pubUtils/util';
 import { ACTIVITY_TYPE, STATUS } from '../../../consts';
-import { getRefreshShopActivity, getPlayerRefreshShopData } from '../../../services/refreshShopService';
+import { getRefreshShopActivity, getPlayerRefreshShopData } from '../../../services/activity/refreshShopService';
-import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { ActivityRefreshShopModel } from '../../../db/ActivityRefreshShop';
 import { RoleModel } from '../../../db/Role';
 import { handleCost } from '../../../services/rewardService';

game-server/app/servers/activity/handler/refreshTaskHandler.ts

@@ -1,13 +1,13 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { ACTIVITY_TYPE, STATUS } from '../../../consts';
-import { getPlayerRefreshTaskData } from '../../../services/refreshTaskService';
+import { getPlayerRefreshTaskData } from '../../../services/activity/refreshTaskService';
 import { RefreshTaskItem } from '../../../domain/activityField/refreshTaskField';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+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/newHeroGiftsService';
+import { newHeroGiftPoint } from '../../../services/activity/newHeroGiftsService';
 import { ActivityModel } from '../../../db/Activity';
 
 

game-server/app/servers/activity/handler/selfServiceShopHandler.ts

@@ -7,8 +7,8 @@ import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '
 import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService';
 import { ActivitySelfServiceGoodsModel } from '../../../db/ActivitySelfServiceGoods';
 import { ActivityModel, ActivityModelType } from '../../../db/Activity';
-import { addSelfServiceShopGiftReward, getSelfServiceShopActivityData, getPlayerActivityData } from '../../../services/selfServiceShopActivityService';
+import { addSelfServiceShopGiftReward, getSelfServiceShopActivityData, getPlayerActivityData } from '../../../services/activity/selfServiceShopActivityService';
-import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { random } from 'underscore';
 
 export default function (app: Application) {

game-server/app/servers/activity/handler/sevenDaysHandler.ts

@@ -4,11 +4,11 @@ import { STATUS, ACTIVITY_RESOURCES_TYPE } from '../../../consts';
 import { handleCost } from '../../../services/rewardService';
 import { ActivityGrowthModel } from '../../../db/ActivityGrowth';
 import { ActivityDailyGiftsModel } from '../../../db/ActivityDailyGifts';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
 import { ActivityGrowthPointModel } from '../../../db/ActivityGrowthPoint';
-import { getPlayerSevenDaysData, getPlayerSevenDaysGrowthData, getPlayerSevenDaysDailyChallengesData, getPlayerSevenDaysDailyGiftsData } from '../../../services/sevenDaysService';
+import { getPlayerSevenDaysData, getPlayerSevenDaysGrowthData, getPlayerSevenDaysDailyChallengesData, getPlayerSevenDaysDailyGiftsData } from '../../../services/activity/sevenDaysService';
 import { SevenDaysGrowthItem, SevenDaysPointRewardItem, SevenDaysDailyItem, SevenDaysDailyGiftItem } from '../../../domain/activityField/sevenDaysField';
 
 

game-server/app/servers/activity/handler/signInHandler.ts

@@ -1,13 +1,13 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, ACTIVITY_TYPE, SERVER_OPEN_TIME, } from '../../../consts';
-import { canBuyVip, getPlayerSignInData } from '../../../services/signInService';
+import { canBuyVip, getPlayerSignInData } from '../../../services/activity/signInService';
 import { handleCost } from '../../../services/rewardService';
 import { SignInItem } from '../../../domain/activityField/signInField';
 import { ActivitySignInModel } from '../../../db/ActivitySignIn';
 import moment = require('moment');
 import { RoleModel } from '../../../db/Role';
-import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 
 

game-server/app/servers/activity/handler/thirtyDaysHandler.ts

@@ -1,13 +1,13 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, ACTIVITY_TYPE } from '../../../consts';
-import { getPlayerThirtyDaysData, playerThirtyDaysActivityDays } from '../../../services/thirtyDaysService';
+import { getPlayerThirtyDaysData, playerThirtyDaysActivityDays } from '../../../services/activity/thirtyDaysService';
 import { ThirtyDaysData, ThirtyDaysItem, ThirtyDaysPointItem } from '../../../domain/activityField/thirtyDaysField';
 import { ActivityThirtyDaysModel } from '../../../db/ActivityThirtyDays';
 import { ActivityThirtyDaysPointRewardModel } from '../../../db/ActivityThirtyDaysPointReward';
 import { ActivityModel, ActivityModelType } from '../../../db/Activity';
 import { ServerlistModel } from '../../../db/Serverlist';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 
 export default function (app: Application) {

game-server/app/servers/activity/handler/treasureHuntHandler.ts

@@ -1,11 +1,11 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, } from '../../../consts';
-import { getPlayerTreasureHuntData, getTreasureHuntData, getPlayerTreasureHuntShopData, getPlayerTreasureHuntTaskData, getPlayerTreasureHuntTreasureShopData, getPlayerTreasureHuntChallengeData, getPlayerTreasureHuntFirstPageData } from '../../../services/treasureHuntService';
+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 { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import { ActivityTreasureHuntTreasureShopModel } from '../../../db/ActivityTreasureHuntTreasureShop';
 import { ActivityTreasureHuntFirstPageModel } from '../../../db/ActivityTreasureHuntFirstPage';

game-server/app/servers/activity/handler/vipRechargeMoneyHandler.ts

@@ -1,9 +1,9 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, } from '../../../consts';
-import { getPlayerVipRechargeMoneyData, } from '../../../services/vipRechargeMoneyService';
+import { getPlayerVipRechargeMoneyData, } from '../../../services/activity/vipRechargeMoneyService';
 import { VipRechargeMoneyItem } from '../../../domain/activityField/vipRechargeMoneyField';
-import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import { ActivityVipRechargeMoneyModel } from '../../../db/ActivityVipRechargeMoney';
 import { UserOrderModel } from '../../../db/UserOrder';

game-server/app/servers/activity/handler/yuanbaoShopHandler.ts

@@ -1,7 +1,7 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../../consts';
-import { yuanbaoActivity, getPlayerYuanbaoShopData } from '../../../services/yuanbaoService';
+import { yuanbaoActivity, getPlayerYuanbaoShopData } from '../../../services/activity/yuanbaoService';
 
 
 export default function (app: Application) {

game-server/app/servers/battle/handler/normalBattleHandler.ts

@@ -21,8 +21,8 @@ import { nowSeconds } from '../../../pubUtils/timeUtil';
 import { Rank } from '../../../services/rankService';
 import { checkTaskWithWar, checkTaskInBattleEnd, checkActivityTask } from '../../../services/taskService';
 import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService';
-import { getSelfServiceShopActivityData } from '../../../services/selfServiceShopActivityService';
+import { getSelfServiceShopActivityData } from '../../../services/activity/selfServiceShopActivityService';
-import { challengeDailyGK } from '../../../services/dailyGKService';
+import { challengeDailyGK } from '../../../services/activity/dailyGKService';
 
 export default function (app: Application) {
     return new NormalBattleHandler(app);

game-server/app/servers/order/handler/orderHandler.ts

@@ -7,10 +7,10 @@ import _ = require('underscore');
 import { applyOrderWX, checkOrderWX } from '../../../services/pay/weixinPay';
 import { applyOrderALI, checkOrderALI } from '../../../services/pay/aliPay';
 import { makeOrder } from '../../../services/orderService';
-import { addRechargeMoney } from '../../../services/rechargeMoneyService';
+import { addRechargeMoney } from '../../../services/activity/rechargeMoneyService';
 import { ActivityModel, ActivityModelType } from '../../../db/Activity';
 import { ServerlistModel } from '../../../db/Serverlist';
-import { addVipRechargeMoney } from '../../../services/vipRechargeMoneyService';
+import { addVipRechargeMoney } from '../../../services/activity/vipRechargeMoneyService';
 import { checkActivityTask } from '../../../services/taskService';
 
 export default function (app: Application) {

game-server/app/servers/role/handler/itemHandler.ts

@@ -16,7 +16,7 @@ import { changeEquip, dressEquip, checkMaterialEnough, takeOffEquipAndCalPlayerC
 import { indexOf, findIndex } from 'underscore';
 import { pushEquipRefineSucMsg, pushNormalEquipMsg, pushNormalItemMsg } from "../../../services/chatService";
 import { checkTaskWithHero, checkTaskWithEquip, checkTask, checkTaskWithArgs, checkTaskConditionEquipSuitJewelStage, checkActivityTask } from "../../../services/taskService";
-import { useGiftPackage } from "../../../services/giftPackageService";
+import { useGiftPackage } from "../../../services/activity/giftPackageService";
 
 export default function (app: Application) {
     return new ItemHandler(app);

game-server/app/services/activity/activityService.ts

@@ -1,4 +1,4 @@
-import { ACTIVITY_TYPE } from '../consts';
+import { ACTIVITY_TYPE } from '../../consts';
 import { getPlayerFirstGiftData } from './firstGiftService';
 import { getPlayerSignInData, } from './signInService';
 import { getPlayerGrowthFundData, } from './growthFundService';
@@ -10,8 +10,8 @@ import { getPlayerRechargeMoneyData, } from './rechargeMoneyService';
 import { getPlayerThirtyDaysData, playerThirtyDaysActivityDays, } from './thirtyDaysService';
 import { getPlayerVipRechargeMoneyData, } from './vipRechargeMoneyService';
 import { getPlayerActivityData, } from './selfServiceShopActivityService';
-import { ActivitySelfServiceGoodsModel } from '../db/ActivitySelfServiceGoods';
+import { ActivitySelfServiceGoodsModel } from '../../db/ActivitySelfServiceGoods';
-import { RoleModel } from '../db/Role';
+import { RoleModel } from '../../db/Role';
 import moment = require('moment');
 import { getPlayerTreasureHuntData, getTreasureHuntData } from './treasureHuntService';
 import { getPlayerPopUpShopData } from './popUpShopService';

game-server/app/services/activity/dailyChallengesService.ts

@@ -1,8 +1,8 @@
-import { ACTIVITY_TYPE } from '../consts';
+import { ACTIVITY_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../db/ActivityDailyChallenges';
+import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../../db/ActivityDailyChallenges';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { DailyChallengesData, DailyItem } from '../domain/activityField/dailyChallengesField';
+import { DailyChallengesData, DailyItem } from '../../domain/activityField/dailyChallengesField';
 
 
 /**

game-server/app/services/activity/dailyCoinService.ts

@@ -1,9 +1,9 @@
-import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../consts';
+import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityDailyCoinModel, ActivityDailyCoinModelType } from '../db/ActivityDailyCoin';
+import { ActivityDailyCoinModel, ActivityDailyCoinModelType } from '../../db/ActivityDailyCoin';
-import { ActivityGroupModel } from '../db/ActivityGroup';
+import { ActivityGroupModel } from '../../db/ActivityGroup';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { DailyCoinData } from '../domain/activityField/dailyCoinField';
+import { DailyCoinData } from '../../domain/activityField/dailyCoinField';
 
 
 /**

game-server/app/services/activity/dailyGKService.ts

@@ -1,8 +1,8 @@
-import { ACTIVITY_TYPE } from '../consts';
+import { ACTIVITY_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityDailyGKModel, ActivityDailyGKModelType } from '../db/ActivityDailyGK';
+import { ActivityDailyGKModel, ActivityDailyGKModelType } from '../../db/ActivityDailyGK';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { DailyGKData, DailyGKItem } from '../domain/activityField/dailyGKField';
+import { DailyGKData, DailyGKItem } from '../../domain/activityField/dailyGKField';
 
 
 /**

game-server/app/services/activity/dailyGiftsService.ts

@@ -1,8 +1,8 @@
-import { ACTIVITY_TYPE } from '../consts';
+import { ACTIVITY_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../db/ActivityDailyGifts';
+import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../../db/ActivityDailyGifts';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { DailyGiftsData } from '../domain/activityField/dailyGiftsField';
+import { DailyGiftsData } from '../../domain/activityField/dailyGiftsField';
 
 
 

game-server/app/services/activity/dailyMealService.ts

@@ -1,8 +1,8 @@
-import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../consts';
+import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityDailyMealModel, ActivityDailyMealModelType } from '../db/ActivityDailyMeal';
+import { ActivityDailyMealModel, ActivityDailyMealModelType } from '../../db/ActivityDailyMeal';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { DailyMealData } from '../domain/activityField/dailyMealField';
+import { DailyMealData } from '../../domain/activityField/dailyMealField';
 
 
 /**

game-server/app/services/activity/dailyRMBGiftsService.ts

@@ -1,11 +1,11 @@
-import { ACTIVITY_TYPE, STATUS } from '../consts';
+import { ACTIVITY_TYPE, STATUS } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityDailyRMBGiftsModel, ActivityDailyRMBGiftsModelType } from '../db/ActivityDailyRMBGifts';
+import { ActivityDailyRMBGiftsModel, ActivityDailyRMBGiftsModelType } from '../../db/ActivityDailyRMBGifts';
-import { DailyRMBGiftsData } from '../domain/activityField/dailyRMBGiftsField';
+import { DailyRMBGiftsData } from '../../domain/activityField/dailyRMBGiftsField';
 import moment = require('moment');
-import { RewardParam } from '../domain/activityField/rewardField';
+import { RewardParam } from '../../domain/activityField/rewardField';
 import { addReward, stringToRewardParam } from './giftPackageService';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
 
 /**
    * 获取活动数据

game-server/app/services/activity/firstGiftService.ts

@@ -1,8 +1,8 @@
-import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, TASK_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../db/ActivityFirstGift';
+import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../../db/ActivityFirstGift';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { FirstGiftData } from '../domain/activityField/firstGiftField';
+import { FirstGiftData } from '../../domain/activityField/firstGiftField';
 
 /**
    * 获取活动数据

game-server/app/services/activity/gachaService.ts

@@ -1,11 +1,11 @@
-import { GachaData, Floor, GachaResult, Hope, GachaListReturn } from "../domain/activityField/gachaField";;
+import { GachaData, Floor, GachaResult, Hope, GachaListReturn } from "../../domain/activityField/gachaField";;
-import { ActivityModel } from "../db/Activity";
+import { ActivityModel } from "../../db/Activity";
-import { DicGacha } from "../pubUtils/dictionary/DicGacha";
+import { DicGacha } from "../../pubUtils/dictionary/DicGacha";
-import { UserGachaType, UserGachaModel } from "../db/UserGacha";
+import { UserGachaType, UserGachaModel } from "../../db/UserGacha";
-import { shouldRefresh, getRandEelm, getRandEelmWithWeight } 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 { 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 { getTimeFunD, getZeroPointD } from "../../pubUtils/timeUtil";
-import { gameData, getDicGachaFloor } from "../pubUtils/data";
+import { gameData, getDicGachaFloor } from "../../pubUtils/data";
 
 /**
  * 获取招募列表

game-server/app/services/activity/giftPackageService.ts

@@ -1,11 +1,11 @@
-import { GIFT_PACKAGE_TYPE, ACTIVITY_RESOURCES_TYPE } from '../consts';
+import { GIFT_PACKAGE_TYPE, ACTIVITY_RESOURCES_TYPE } from '../../consts';
-import { gameData } from '../pubUtils/data';
+import { gameData } from '../../pubUtils/data';
-import { addItems, createHeroes } from './rewardService';
+import { addItems, createHeroes } from './../rewardService';
-import { RewardParam } from '../domain/activityField/rewardField';
+import { RewardParam } from '../../domain/activityField/rewardField';
-import { CreateHeroParam } from '../domain/roleField/hero';
+import { CreateHeroParam } from '../../domain/roleField/hero';
-import { DicGiftPackage } from '../pubUtils/dictionary/DicGiftPackage';
+import { DicGiftPackage } from '../../pubUtils/dictionary/DicGiftPackage';
-import { ItemInter, RewardInter } from '../pubUtils/interface';
+import { ItemInter, RewardInter } from '../../pubUtils/interface';
-import { decodeArrayListStr } from '../pubUtils/util';
+import { decodeArrayListStr } from '../../pubUtils/util';
 
 
 

game-server/app/services/activity/growthFundService.ts

@@ -1,10 +1,10 @@
-import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityGrowthFundModel, ActivityGrowthFundModelType } from '../db/ActivityGrowthFund';
+import { ActivityGrowthFundModel, ActivityGrowthFundModelType } from '../../db/ActivityGrowthFund';
-import { ActivityBuyRecordsModel, ActivityBuyRecordsModelType } from '../db/ActivityBuyRecords';
+import { ActivityBuyRecordsModel, ActivityBuyRecordsModelType } from '../../db/ActivityBuyRecords';
-import { RoleModel } from '../db/Role';
+import { RoleModel } from '../../db/Role';
-import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFundField';
+import { GrowthFundData, GrowthFundItem } from '../../domain/activityField/growthFundField';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
 
 /**
    * 获取活动数据

game-server/app/services/activity/growthService.ts

@@ -1,10 +1,10 @@
-import { ACTIVITY_TYPE } from '../consts';
+import { ACTIVITY_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityGrowthModel, ActivityGrowthModelType } from '../db/ActivityGrowth';
+import { ActivityGrowthModel, ActivityGrowthModelType } from '../../db/ActivityGrowth';
-import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../db/ActivityGrowthPoint';
+import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../../db/ActivityGrowthPoint';
-import { HeroModel } from '../db/Hero';
+import { HeroModel } from '../../db/Hero';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
+import { GrowthData, GrowthItem } from '../../domain/activityField/growthField';
 
 /**
    * 获取活动数据

game-server/app/services/activity/limitPackageService.ts

@@ -1,11 +1,11 @@
 import moment = require('moment');
-import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityShopModel, ActivityShopModelType } from '../db/ActivityShop';
+import { ActivityShopModel, ActivityShopModelType } from '../../db/ActivityShop';
-import { RoleModel } from '../db/Role';
+import { RoleModel } from '../../db/Role';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { LimitShopData, ShopItem } from '../domain/activityField/limitShopField';
+import { LimitShopData, ShopItem } from '../../domain/activityField/limitShopField';
-import { deltaDays } from '../pubUtils/util';
+import { deltaDays } from '../../pubUtils/util';
 import { addReward, stringToRewardParam } from './giftPackageService';
 
 /**

game-server/app/services/activity/monopolyService.ts

@@ -1,10 +1,9 @@
-import { ACTIVITY_TYPE } from '../consts';
+import { ACTIVITY_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../db/ActivityDailyChallenges';
+import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../../db/ActivityMonopoly';
-import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../db/ActivityMonopoly';
+import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../../db/ActivityMonopolyLand';
-import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../db/ActivityMonopolyLand';
+import { ServerlistModel } from '../../db/Serverlist';
-import { ServerlistModel } from '../db/Serverlist';
+import { MonopolyData, LandItem } from '../../domain/activityField/monopolyField';
-import { MonopolyData, LandItem } from '../domain/activityField/monopolyField';
 
 
 /**

game-server/app/services/activity/monthlyTicketService.ts

@@ -1,16 +1,16 @@
-import { ACTIVITY_TYPE, MAIL_TYPE, STATUS, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, MAIL_TYPE, STATUS, TASK_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityMonthlyTicketModel, ActivityMonthlyTicketModelType } from '../db/ActivityMonthlyTicket';
+import { ActivityMonthlyTicketModel, ActivityMonthlyTicketModelType } from '../../db/ActivityMonthlyTicket';
-import { RewardParam } from '../domain/activityField/rewardField';
+import { RewardParam } from '../../domain/activityField/rewardField';
-import { MonthlyTicketData } from '../domain/activityField/monthlyTicketField';
+import { MonthlyTicketData } from '../../domain/activityField/monthlyTicketField';
 import { addReward, stringToRewardInter, stringToRewardParam } from './giftPackageService';
 import moment = require('moment');
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { getMailContent } from './mailService';
+import { getMailContent } from './../mailService';
-import { MailModel, MailType } from '../db/Mail';
+import { MailModel, MailType } from '../../db/Mail';
-import { pushMail } from '../pubUtils/interface';
+import { pushMail } from '../../pubUtils/interface';
 import { pinus } from 'pinus';
-import { resResult } from '../pubUtils/util';
+import { resResult } from '../../pubUtils/util';
 
 /**
    * 获取活动数据

game-server/app/services/activity/newHeroGiftsService.ts

@@ -1,8 +1,8 @@
-import { ACTIVITY_TYPE } from '../consts';
+import { ACTIVITY_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityNewHeroGiftModel, ActivityNewHeroGiftModelType } from '../db/ActivityNewHeroGift';
+import { ActivityNewHeroGiftModel, ActivityNewHeroGiftModelType } from '../../db/ActivityNewHeroGift';
-import { NewHeroGiftData } from '../domain/activityField/newHeroGiftField';
+import { NewHeroGiftData } from '../../domain/activityField/newHeroGiftField';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
 
 /**
    * 获取活动数据

game-server/app/services/activity/popUpShopService.ts

@@ -1,10 +1,10 @@
-import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { PopUpShopData, } from '../domain/activityField/popUpShopField';
+import { PopUpShopData, } from '../../domain/activityField/popUpShopField';
-import { RewardParam } from '../domain/activityField/rewardField';
+import { RewardParam } from '../../domain/activityField/rewardField';
 import { addReward, stringToRewardParam } from './giftPackageService';
-import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../db/ActivityPopUpShop';
+import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../../db/ActivityPopUpShop';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
 import moment = require('moment');
 
 /**

game-server/app/services/activity/rechargeMoneyService.ts

@@ -1,12 +1,9 @@
-import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, TASK_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityRechargeMoneyModel, ActivityRechargeMoneyModelType } from '../db/ActivityRechargeMoney';
+import { ActivityRechargeMoneyModel, ActivityRechargeMoneyModelType } from '../../db/ActivityRechargeMoney';
-import { RewardParam } from '../domain/activityField/rewardField';
+import { RechargeMoneyData, RechargeMoneyItem } from '../../domain/activityField/rechargeMoneyField';
-import { RechargeMoneyData, RechargeMoneyItem } from '../domain/activityField/rechargeMoneyField';
-import { addReward, stringToRewardParam } from './giftPackageService';
-
 import moment = require('moment');
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
 
 /**
    * 获取活动数据

game-server/app/services/activity/refreshShopService.ts

@@ -1,11 +1,11 @@
 import moment = require('moment');
-import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityRefreshShopModel, ActivityRefreshShopModelType } from '../db/ActivityRefreshShop';
+import { ActivityRefreshShopModel, ActivityRefreshShopModelType } from '../../db/ActivityRefreshShop';
-import { RoleModel } from '../db/Role';
+import { RoleModel } from '../../db/Role';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { RefreshShopData, RefreshShopItem } from '../domain/activityField/refreshShopField';
+import { RefreshShopData, RefreshShopItem } from '../../domain/activityField/refreshShopField';
-import { deltaDays } from '../pubUtils/util';
+import { deltaDays } from '../../pubUtils/util';
 import { addReward, stringToRewardParam } from './giftPackageService';
 
 /**

game-server/app/services/activity/refreshTaskService.ts

@@ -1,9 +1,9 @@
-import { ACTIVITY_TYPE } from '../consts';
+import { ACTIVITY_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityRefreshTaskModel, ActivityRefreshTaskModelType } from '../db/ActivityRefreshTask';
+import { ActivityRefreshTaskModel, ActivityRefreshTaskModelType } from '../../db/ActivityRefreshTask';
-import { ActivityRefreshTaskPointModel, ActivityRefreshTaskPointModelType } from '../db/ActivityRefreshTaskPoint';
+import { ActivityRefreshTaskPointModel, ActivityRefreshTaskPointModelType } from '../../db/ActivityRefreshTaskPoint';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { RefreshTaskData, RefreshTaskItem } from '../domain/activityField/refreshTaskField';
+import { RefreshTaskData, RefreshTaskItem } from '../../domain/activityField/refreshTaskField';
 
 
 /**

game-server/app/services/activity/selfServiceShopActivityService.ts

@@ -1,12 +1,11 @@
-import { ACTIVITY_TYPE, REFRESH_TIME, STATUS } from '../consts';
+import { ACTIVITY_TYPE, REFRESH_TIME, STATUS } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivitySelfServiceGoodsModel, ActivitySelfServiceGoodsModelType } from '../db/ActivitySelfServiceGoods';
+import { ActivitySelfServiceGoodsModel, ActivitySelfServiceGoodsModelType } from '../../db/ActivitySelfServiceGoods';
-import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../db/ActivitySelfServiceShop';
+import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../../db/ActivitySelfServiceShop';
-import { ActivitySelfServiceModel } from '../db/ActivitySelfService';
+import { ActivitySelfServiceModel } from '../../db/ActivitySelfService';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { RewardParam } from '../domain/activityField/rewardField';
+import { RewardParam } from '../../domain/activityField/rewardField';
-import { SelfServiceShopData, SelfServiceShopItem } from '../domain/activityField/selfServiceShopField';
+import { SelfServiceShopData, SelfServiceShopItem } from '../../domain/activityField/selfServiceShopField';
-import { gameData } from '../pubUtils/data';
 import { addReward, getSelectedReward, stringToRewardParam } from './giftPackageService';
 import moment = require('moment');
 

game-server/app/services/activity/sevenDaysService.ts

@@ -1,12 +1,11 @@
-import { ACTIVITY_TYPE } from '../consts';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityGrowthModel, ActivityGrowthModelType } from '../../db/ActivityGrowth';
-import { ActivityGrowthModel, ActivityGrowthModelType } from '../db/ActivityGrowth';
+import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../../db/ActivityGrowthPoint';
-import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../db/ActivityGrowthPoint';
+import { HeroModel } from '../../db/Hero';
-import { HeroModel } from '../db/Hero';
+import { ServerlistModel } from '../../db/Serverlist';
-import { ServerlistModel } from '../db/Serverlist';
+import { SevenDaysData } from '../../domain/activityField/sevenDaysField';
-import { SevenDaysData } from '../domain/activityField/sevenDaysField';
+import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../../db/ActivityDailyChallenges';
-import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../db/ActivityDailyChallenges';
+import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../../db/ActivityDailyGifts';
-import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../db/ActivityDailyGifts';
 
 /**
    * 获取活动数据

game-server/app/services/activity/signInService.ts

@@ -1,10 +1,10 @@
 import moment = require('moment');
-import { ACTIVITY_TYPE, REFRESH_TIME, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../consts';
+import { ACTIVITY_TYPE, REFRESH_TIME, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
+import { ActivitySignInModel, ActivitySignInModelType } from '../../db/ActivitySignIn';
-import { RoleModel } from '../db/Role';
+import { RoleModel } from '../../db/Role';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { SignInData } from '../domain/activityField/signInField';
+import { SignInData } from '../../domain/activityField/signInField';
 
 /**
    * 获取活动数据

game-server/app/services/activity/thirtyDaysService.ts

@@ -1,12 +1,11 @@
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityThirtyDaysModel, ActivityThirtyDaysModelType } from '../db/ActivityThirtyDays';
+import { ActivityThirtyDaysModel, ActivityThirtyDaysModelType } from '../../db/ActivityThirtyDays';
-import { ThirtyDaysData } from '../domain/activityField/thirtyDaysField';
+import { ThirtyDaysData } from '../../domain/activityField/thirtyDaysField';
-import { ActivityThirtyDaysPointRewardModel, ActivityThirtyDaysPointRewardModelType } from '../db/ActivityThirtyDaysPointReward';
+import { ActivityThirtyDaysPointRewardModel, ActivityThirtyDaysPointRewardModelType } from '../../db/ActivityThirtyDaysPointReward';
-import { RoleModel } from '../db/Role';
+import { RoleModel } from '../../db/Role';
 import moment = require('moment');
-import { deltaDays } from '../pubUtils/util';
+import { deltaDays } from '../../pubUtils/util';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { HeroModel } from '../db/Hero';
 
 /**
    * 获取活动数据

game-server/app/services/activity/treasureHuntService.ts

@@ -1,16 +1,16 @@
 import moment = require('moment');
-import { ACTIVITY_TYPE, SERVER_OPEN_TIME, STATUS } from '../consts';
+import { ACTIVITY_TYPE, SERVER_OPEN_TIME, STATUS } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityTreasureHuntShopModel, ActivityTreasureHuntShopModelType } from '../db/ActivityTreasureHuntShop';
+import { ActivityTreasureHuntShopModel, ActivityTreasureHuntShopModelType } from '../../db/ActivityTreasureHuntShop';
-import { ActivityTreasureHuntTaskModel, ActivityTreasureHuntTaskModelType } from '../db/ActivityTreasureHuntTask';
+import { ActivityTreasureHuntTaskModel, ActivityTreasureHuntTaskModelType } from '../../db/ActivityTreasureHuntTask';
-import { ActivityTreasureHuntTreasureShopModel, ActivityTreasureHuntTreasureShopModelType } from '../db/ActivityTreasureHuntTreasureShop';
+import { ActivityTreasureHuntTreasureShopModel, ActivityTreasureHuntTreasureShopModelType } from '../../db/ActivityTreasureHuntTreasureShop';
-import { ActivityTreasureHuntFirstPageModel, ActivityTreasureHuntFirstPageModelType } from '../db/ActivityTreasureHuntFirstPage';
+import { ActivityTreasureHuntFirstPageModel, ActivityTreasureHuntFirstPageModelType } from '../../db/ActivityTreasureHuntFirstPage';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { ServerTempModel, ServerTempModelType } from '../db/ServerTemp';
+import { ServerTempModel, ServerTempModelType } from '../../db/ServerTemp';
-import { TreasureHuntData } from '../domain/activityField/treasureHuntField';
+import { TreasureHuntData } from '../../domain/activityField/treasureHuntField';
-import { deltaDays } from '../pubUtils/util';
+import { deltaDays } from '../../pubUtils/util';
 import { addReward, stringToConsumeParam, stringToRewardParam } from './giftPackageService';
-import { RewardParam } from '../domain/activityField/rewardField';
+import { RewardParam } from '../../domain/activityField/rewardField';
 
 /**
    * 获取活动数据

game-server/app/services/activity/vipRechargeMoneyService.ts

@@ -1,10 +1,8 @@
-import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, TASK_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ActivityVipRechargeMoneyModel, ActivityVipRechargeMoneyModelType } from '../db/ActivityVipRechargeMoney';
+import { ActivityVipRechargeMoneyModel, ActivityVipRechargeMoneyModelType } from '../../db/ActivityVipRechargeMoney';
-import { VipRechargeMoneyData, VipRechargeMoneyItem } from '../domain/activityField/vipRechargeMoneyField';
+import { VipRechargeMoneyData, VipRechargeMoneyItem } from '../../domain/activityField/vipRechargeMoneyField';
-
+import { ServerlistModel } from '../../db/Serverlist';
-import moment = require('moment');
-import { ServerlistModel } from '../db/Serverlist';
 
 /**
    * 获取活动数据

game-server/app/services/activity/yuanbaoService.ts

@@ -1,9 +1,9 @@
-import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityModel, ActivityModelType } from '../../db/Activity';
-import { ServerlistModel } from '../db/Serverlist';
+import { ServerlistModel } from '../../db/Serverlist';
-import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
+import { UserOrderModel, UserOrderModelType } from '../../db/UserOrder';
-import { RewardParam } from '../domain/activityField/rewardField';
+import { RewardParam } from '../../domain/activityField/rewardField';
-import { YuanBaoShopData, YuanBaoShopItem } from '../domain/activityField/yuanBaoShopField';
+import { YuanBaoShopData, YuanBaoShopItem } from '../../domain/activityField/yuanBaoShopField';
 import { addReward, stringToRewardParam } from './giftPackageService';
 
 /**

game-server/app/services/connectorService.ts

@@ -19,7 +19,7 @@ import { getAllAssistCnt } from './comBattleService';
 import { getDungeonData } from './dungeonService';
 import { PvpSeasonResultModel } from '../db/PvpSeasonResult';
 import { nowSeconds, getZeroPoint } from '../pubUtils/timeUtil';
-import { getGachaList, getVisitedHeroList } from './gachaService';
+import { getGachaList, getVisitedHeroList } from './activity/gachaService';
 import { getSchoolList } from './roleService';
 import { addRoleToGuildChannel } from './chatChannelService';
 import { getMyGuildInfo, getGuildWithRefActive, getUserGuildWithRefActive, getWishPool } from './guildService';
@@ -38,8 +38,8 @@ import { PvpDefenseModel } from '../db/PvpDefense';
 import { findPvpDefAllByRoleId } from './pvpService';
 import { getDonation } from './donateService';
 
-export async function pushData(role: RoleType, session: FrontendOrBackendSession, pushType: 'entry'|'refresh' = 'entry') {
+export async function pushData(role: RoleType, session: FrontendOrBackendSession, pushType: 'entry' | 'refresh' = 'entry') {
-    try{
+    try {
         const { roleId } = role;
         const sid = session.get('sid');
 
@@ -47,33 +47,33 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
         // 军团
         const guildData = await getGuildEntryData(role, sid, session);
         let modules = ['shop', 'rank', 'mail', 'friend', 'daily', 'expedition', 'tower', 'comBattle', 'dungeon', 'pvp', 'gacha', 'school', 'task', 'chat', 'event', 'battle', 'guild'];
-        if(guildData.hasGuild) {
+        if (guildData.hasGuild) {
             modules.push('auction', 'train', 'boss', 'wishPool', 'guildActivity', 'donate');
         }
         let notIncludeModule: string[] = [];
-        if(pushType == 'refresh') {
+        if (pushType == 'refresh') {
             notIncludeModule = ['rank', 'mail', 'school', 'auction', 'train', 'chat', 'battle'];
         }
 
-        for(let type of modules) {
+        for (let type of modules) {
-            if(notIncludeModule.indexOf(type) == -1) {
+            if (notIncludeModule.indexOf(type) == -1) {
                 let data = await getModuleData(type, { role, session }, guildData);
-                if(data) {
+                if (data) {
                     pushEntryData(type, roleId, sid, data);
                 }
             }
         }
         pushEntryEnd(roleId, sid);
-    }catch(e) {
+    } catch (e) {
         console.error(e.stack);
     }
- }
+}
 
- async function getModuleData(type: string, data: {role: RoleType, session: FrontendOrBackendSession}, guildData: { hasGuild: boolean, guild?: GuildType, userGuild?: UserGuildType, guildResult?: any} = { hasGuild: false }) {
+async function getModuleData(type: string, data: { role: RoleType, session: FrontendOrBackendSession }, guildData: { hasGuild: boolean, guild?: GuildType, userGuild?: UserGuildType, guildResult?: any } = { hasGuild: false }) {
     let { role, session } = data;
     const { roleId, serverId, roleName, guildCode } = role;
     let { hasGuild, guild, userGuild, guildResult } = guildData;
-    switch(type) {
+    switch (type) {
         case 'shop': // 商店
             return await getAllShopList(roleId);
         case 'rank': // 排名
@@ -83,7 +83,7 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
         case 'friend': // 好友
             const friendList = await getFriendList(role);
             const applyList = await getApplyList(roleId);
-            return  { friendList, applyList }
+            return { friendList, applyList }
         case 'daily': // 每日
             return await getDailyBattleList(role);
         case 'expedition': // 远征
@@ -107,28 +107,28 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
         case 'guild':
             return await guildResult;
         case 'auction':
-            return hasGuild? await getAuction(guildCode, session): null;
+            return hasGuild ? await getAuction(guildCode, session) : null;
         case 'train':
-            if(hasGuild) {
+            if (hasGuild) {
                 let trainInstance = await getGuildTrainInstance(roleId, guild, userGuild);
                 let trainBoxRewards = await getTrainBoxRewardsResult(guildCode);
                 return { trainInstance, trainBoxRewards }
             }
         case 'boss':
-            if(hasGuild) {
+            if (hasGuild) {
                 const bossInstance = await BossInstanceModel.findBossInstance(guild.code);
-                if(bossInstance) {
+                if (bossInstance) {
                     return await getBossInstanceInfo(bossInstance, roleId);
                 }
             }
             return null;
         case 'wishPool':
-            return hasGuild? await getWishPool(userGuild): null;
+            return hasGuild ? await getWishPool(userGuild) : null;
         case 'donate':
-            if(hasGuild) {
+            if (hasGuild) {
                 const { guildCode: code, donateCnt, receiveBoxs } = userGuild;
                 let { donateFund, reports, donationLv } = await getDonation(code, serverId);
-                return { receiveBoxs, donateFund, reports, donateCnt:donateCnt||0, donationLv};
+                return { receiveBoxs, donateFund, reports, donateCnt: donateCnt || 0, donationLv };
             }
         case 'task':
             return await getCurTask(role.roleId, session);
@@ -148,9 +148,9 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
         default:
             return null;
     }
- }
+}
 
- function pushEntryData<T>(type: string, roleId: string, sid: string, param: T) {
+function pushEntryData<T>(type: string, roleId: string, sid: string, param: T) {
     let uids = [{ uid: roleId, sid }];
     let data = { type };
     data[type] = param;
@@ -177,7 +177,7 @@ async function getTowerEntryData(role: RoleType) {
     const status = await getTowerStatus(role);
     const hungUp = await getHungupRewards(roleId);
     const tasks = await getTasks(role);
-    if(hungUp.status == -1) {
+    if (hungUp.status == -1) {
         return { status, hungUp: {}, tasks }
     } else {
         return { status, hungUp: hungUp.data, tasks }
@@ -190,7 +190,7 @@ async function getTowerEntryData(role: RoleType) {
  */
 async function getPvpEntryData(roleId: string) {
     let pvpDefense = await PvpDefenseModel.findByRoleIdIncludeAll(roleId);
-    if(pvpDefense) {
+    if (pvpDefense) {
         let { pvpDefense, } = await findPvpDefAllByRoleId(roleId);
         let { challengeCnt, receivedBox, score, hisScore } = pvpDefense;
 
@@ -216,7 +216,7 @@ async function getGuildEntryData(role: RoleType, sid: string, session: FrontendO
                 addRoleToGuildChannel(role.roleId, sid, userGuild.guildCode);
 
                 let result = await getMyGuildInfo(role.roleId, sid, userGuild, guild, role.serverId, session);
-                return { hasGuild: true, guild, userGuild, guildResult: result};
+                return { hasGuild: true, guild, userGuild, guildResult: result };
             }
         }
     }
@@ -230,12 +230,12 @@ export async function everydayRefresh() {
     console.log(n)
     let i = -1;
     let interval = setInterval(() => {
-        if(++i < n) {
+        if (++i < n) {
             let users = allOnlineUsers.slice(i * PUSH_BATCH, (i + 1) * PUSH_BATCH - 1);
-            for(let { roleId, sid } of users) {
+            for (let { roleId, sid } of users) {
                 pinus.app.channelService.pushMessageByUids('onRefreshTime', resResult(STATUS.SUCCESS, {
                     todayZeroPoint
-                } ), [{uid: roleId, sid: sid}]);
+                }), [{ uid: roleId, sid: sid }]);
             }
         } else {
             clearInterval(interval);

game-server/app/services/orderService.ts

@@ -1,22 +1,20 @@
-import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
+import { UserOrderModelType } from '../db/UserOrder';
-import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
+import { ACTIVITY_TYPE, STATUS } from '../consts';
-import { SignInData, SignInItem } from '../domain/activityField/signInField';
-import { ACTIVITY_TYPE, ORDER_STATE, STATUS } from '../consts';
 import { dicRMB } from '../pubUtils/dictionary/DicRMB';
-import { makeYuanbaoShopReward } from './yuanbaoService';
+import { makeYuanbaoShopReward } from './activity/yuanbaoService';
 import { RoleModel } from '../db/Role';
-import { makeMonthlyTicketReward } from './monthlyTicketService';
+import { makeMonthlyTicketReward } from './activity/monthlyTicketService';
-import { makeSignInVIP } from './signInService';
+import { makeSignInVIP } from './activity/signInService';
-import { makeDailyRMBGiftsReward } from './dailyRMBGiftsService';
+import { makeDailyRMBGiftsReward } from './activity/dailyRMBGiftsService';
-import { makePopUpShopReward } from './popUpShopService';
+import { makePopUpShopReward } from './activity/popUpShopService';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityFirstGiftModel } from '../db/ActivityFirstGift';
 import { ServerlistModel } from '../db/Serverlist';
-import { makeGrowthFund } from './growthFundService';
+import { makeGrowthFund } from './activity/growthFundService';
-import { makeLimitPackageReward } from './limitPackageService';
+import { makeLimitPackageReward } from './activity/limitPackageService';
-import { makeShop } from './treasureHuntService';
+import { makeShop } from './activity/treasureHuntService';
-import { makeSelfServerShop } from './selfServiceShopActivityService';
+import { makeSelfServerShop } from './activity/selfServiceShopActivityService';
-import { makeRefreshShopReward } from './refreshShopService';
+import { makeRefreshShopReward } from './activity/refreshShopService';
 import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../db/ActivityMonopoly';
 import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../db/ActivityMonopolyLand';