xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：调整活动代码路径

Browse Source
This commit is contained in:
qiaoxin
2021-06-22 17:16:33 +08:00
parent 8fae4a22ab
commit 42748f4a62
58 changed files with 274 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/activityService.ts → game-server/app/services/activity/activityService.ts
+3 -3
View File
@@ -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 { RoleModel } from '../db/Role';
import { ActivitySelfServiceGoodsModel } from '../../db/ActivitySelfServiceGoods';
import { RoleModel } from '../../db/Role';
import moment = require('moment');
import { getPlayerTreasureHuntData, getTreasureHuntData } from './treasureHuntService';
import { getPlayerPopUpShopData } from './popUpShopService';
game-server/app/services/dailyChallengesService.ts → game-server/app/services/activity/dailyChallengesService.ts
+5 -5
View File
@@ -1,8 +1,8 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../db/ActivityDailyChallenges';
import { ServerlistModel } from '../db/Serverlist';
import { DailyChallengesData, DailyItem } from '../domain/activityField/dailyChallengesField';
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../../db/ActivityDailyChallenges';
import { ServerlistModel } from '../../db/Serverlist';
import { DailyChallengesData, DailyItem } from '../../domain/activityField/dailyChallengesField';
/**
game-server/app/services/dailyCoinService.ts → game-server/app/services/activity/dailyCoinService.ts
+6 -6
View File
@@ -1,9 +1,9 @@
import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyCoinModel, ActivityDailyCoinModelType } from '../db/ActivityDailyCoin';
import { ActivityGroupModel } from '../db/ActivityGroup';
import { ServerlistModel } from '../db/Serverlist';
import { DailyCoinData } from '../domain/activityField/dailyCoinField';
import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityDailyCoinModel, ActivityDailyCoinModelType } from '../../db/ActivityDailyCoin';
import { ActivityGroupModel } from '../../db/ActivityGroup';
import { ServerlistModel } from '../../db/Serverlist';
import { DailyCoinData } from '../../domain/activityField/dailyCoinField';
/**
game-server/app/services/dailyGKService.ts → game-server/app/services/activity/dailyGKService.ts
+5 -5
View File
@@ -1,8 +1,8 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyGKModel, ActivityDailyGKModelType } from '../db/ActivityDailyGK';
import { ServerlistModel } from '../db/Serverlist';
import { DailyGKData, DailyGKItem } from '../domain/activityField/dailyGKField';
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityDailyGKModel, ActivityDailyGKModelType } from '../../db/ActivityDailyGK';
import { ServerlistModel } from '../../db/Serverlist';
import { DailyGKData, DailyGKItem } from '../../domain/activityField/dailyGKField';
/**
game-server/app/services/dailyGiftsService.ts → game-server/app/services/activity/dailyGiftsService.ts
+5 -5
View File
@@ -1,8 +1,8 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../db/ActivityDailyGifts';
import { ServerlistModel } from '../db/Serverlist';
import { DailyGiftsData } from '../domain/activityField/dailyGiftsField';
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../../db/ActivityDailyGifts';
import { ServerlistModel } from '../../db/Serverlist';
import { DailyGiftsData } from '../../domain/activityField/dailyGiftsField';
game-server/app/services/dailyMealService.ts → game-server/app/services/activity/dailyMealService.ts
+5 -5
View File
@@ -1,8 +1,8 @@
import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyMealModel, ActivityDailyMealModelType } from '../db/ActivityDailyMeal';
import { ServerlistModel } from '../db/Serverlist';
import { DailyMealData } from '../domain/activityField/dailyMealField';
import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityDailyMealModel, ActivityDailyMealModelType } from '../../db/ActivityDailyMeal';
import { ServerlistModel } from '../../db/Serverlist';
import { DailyMealData } from '../../domain/activityField/dailyMealField';
/**
game-server/app/services/dailyRMBGiftsService.ts → game-server/app/services/activity/dailyRMBGiftsService.ts
+6 -6
View File
@@ -1,11 +1,11 @@
import { ACTIVITY_TYPE, STATUS } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyRMBGiftsModel, ActivityDailyRMBGiftsModelType } from '../db/ActivityDailyRMBGifts';
import { DailyRMBGiftsData } from '../domain/activityField/dailyRMBGiftsField';
import { ACTIVITY_TYPE, STATUS } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityDailyRMBGiftsModel, ActivityDailyRMBGiftsModelType } from '../../db/ActivityDailyRMBGifts';
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/firstGiftService.ts → game-server/app/services/activity/firstGiftService.ts
+5 -5
View File
@@ -1,8 +1,8 @@
import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../db/ActivityFirstGift';
import { ServerlistModel } from '../db/Serverlist';
import { FirstGiftData } from '../domain/activityField/firstGiftField';
import { ACTIVITY_TYPE, TASK_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../../db/ActivityFirstGift';
import { ServerlistModel } from '../../db/Serverlist';
import { FirstGiftData } from '../../domain/activityField/firstGiftField';
/**
* 获取活动数据
game-server/app/services/gachaService.ts → game-server/app/services/activity/gachaService.ts
+8 -8
View File
@@ -1,11 +1,11 @@
import { GachaData, Floor, GachaResult, Hope, GachaListReturn } from "../domain/activityField/gachaField";;
import { ActivityModel } from "../db/Activity";
import { DicGacha } from "../pubUtils/dictionary/DicGacha";
import { UserGachaType, UserGachaModel } from "../db/UserGacha";
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 { GachaData, Floor, GachaResult, Hope, GachaListReturn } from "../../domain/activityField/gachaField";;
import { ActivityModel } from "../../db/Activity";
import { DicGacha } from "../../pubUtils/dictionary/DicGacha";
import { UserGachaType, UserGachaModel } from "../../db/UserGacha";
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";
/**
* 获取招募列表
game-server/app/services/giftPackageService.ts → game-server/app/services/activity/giftPackageService.ts
+8 -8
View File
@@ -1,11 +1,11 @@
import { GIFT_PACKAGE_TYPE, ACTIVITY_RESOURCES_TYPE } from '../consts';
import { gameData } from '../pubUtils/data';
import { addItems, createHeroes } from './rewardService';
import { RewardParam } from '../domain/activityField/rewardField';
import { CreateHeroParam } from '../domain/roleField/hero';
import { DicGiftPackage } from '../pubUtils/dictionary/DicGiftPackage';
import { ItemInter, RewardInter } from '../pubUtils/interface';
import { decodeArrayListStr } from '../pubUtils/util';
import { GIFT_PACKAGE_TYPE, ACTIVITY_RESOURCES_TYPE } from '../../consts';
import { gameData } from '../../pubUtils/data';
import { addItems, createHeroes } from './../rewardService';
import { RewardParam } from '../../domain/activityField/rewardField';
import { CreateHeroParam } from '../../domain/roleField/hero';
import { DicGiftPackage } from '../../pubUtils/dictionary/DicGiftPackage';
import { ItemInter, RewardInter } from '../../pubUtils/interface';
import { decodeArrayListStr } from '../../pubUtils/util';
game-server/app/services/growthFundService.ts → game-server/app/services/activity/growthFundService.ts
+7 -7
View File
@@ -1,10 +1,10 @@
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 { RoleModel } from '../db/Role';
import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFundField';
import { ServerlistModel } from '../db/Serverlist';
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 { RoleModel } from '../../db/Role';
import { GrowthFundData, GrowthFundItem } from '../../domain/activityField/growthFundField';
import { ServerlistModel } from '../../db/Serverlist';
/**
* 获取活动数据
game-server/app/services/growthService.ts → game-server/app/services/activity/growthService.ts
+7 -7
View File
@@ -1,10 +1,10 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityGrowthModel, ActivityGrowthModelType } from '../db/ActivityGrowth';
import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../db/ActivityGrowthPoint';
import { HeroModel } from '../db/Hero';
import { ServerlistModel } from '../db/Serverlist';
import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityGrowthModel, ActivityGrowthModelType } from '../../db/ActivityGrowth';
import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../../db/ActivityGrowthPoint';
import { HeroModel } from '../../db/Hero';
import { ServerlistModel } from '../../db/Serverlist';
import { GrowthData, GrowthItem } from '../../domain/activityField/growthField';
/**
* 获取活动数据
game-server/app/services/limitPackageService.ts → game-server/app/services/activity/limitPackageService.ts
+7 -7
View File
@@ -1,11 +1,11 @@
import moment = require('moment');
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } 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 { deltaDays } from '../pubUtils/util';
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } 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 { deltaDays } from '../../pubUtils/util';
import { addReward, stringToRewardParam } from './giftPackageService';
/**
game-server/app/services/monopolyService.ts → game-server/app/services/activity/monopolyService.ts
+6 -7
View File
@@ -1,10 +1,9 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../db/ActivityDailyChallenges';
import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../db/ActivityMonopoly';
import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../db/ActivityMonopolyLand';
import { ServerlistModel } from '../db/Serverlist';
import { MonopolyData, LandItem } from '../domain/activityField/monopolyField';
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../../db/ActivityMonopoly';
import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../../db/ActivityMonopolyLand';
import { ServerlistModel } from '../../db/Serverlist';
import { MonopolyData, LandItem } from '../../domain/activityField/monopolyField';
/**
game-server/app/services/monthlyTicketService.ts → game-server/app/services/activity/monthlyTicketService.ts
+10 -10
View File
@@ -1,16 +1,16 @@
import { ACTIVITY_TYPE, MAIL_TYPE, STATUS, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityMonthlyTicketModel, ActivityMonthlyTicketModelType } from '../db/ActivityMonthlyTicket';
import { RewardParam } from '../domain/activityField/rewardField';
import { MonthlyTicketData } from '../domain/activityField/monthlyTicketField';
import { ACTIVITY_TYPE, MAIL_TYPE, STATUS, TASK_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityMonthlyTicketModel, ActivityMonthlyTicketModelType } from '../../db/ActivityMonthlyTicket';
import { RewardParam } from '../../domain/activityField/rewardField';
import { MonthlyTicketData } from '../../domain/activityField/monthlyTicketField';
import { addReward, stringToRewardInter, stringToRewardParam } from './giftPackageService';
import moment = require('moment');
import { ServerlistModel } from '../db/Serverlist';
import { getMailContent } from './mailService';
import { MailModel, MailType } from '../db/Mail';
import { pushMail } from '../pubUtils/interface';
import { ServerlistModel } from '../../db/Serverlist';
import { getMailContent } from './../mailService';
import { MailModel, MailType } from '../../db/Mail';
import { pushMail } from '../../pubUtils/interface';
import { pinus } from 'pinus';
import { resResult } from '../pubUtils/util';
import { resResult } from '../../pubUtils/util';
/**
* 获取活动数据
game-server/app/services/newHeroGiftsService.ts → game-server/app/services/activity/newHeroGiftsService.ts
+5 -5
View File
@@ -1,8 +1,8 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityNewHeroGiftModel, ActivityNewHeroGiftModelType } from '../db/ActivityNewHeroGift';
import { NewHeroGiftData } from '../domain/activityField/newHeroGiftField';
import { ServerlistModel } from '../db/Serverlist';
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityNewHeroGiftModel, ActivityNewHeroGiftModelType } from '../../db/ActivityNewHeroGift';
import { NewHeroGiftData } from '../../domain/activityField/newHeroGiftField';
import { ServerlistModel } from '../../db/Serverlist';
/**
* 获取活动数据
game-server/app/services/popUpShopService.ts → game-server/app/services/activity/popUpShopService.ts
+6 -6
View File
@@ -1,10 +1,10 @@
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { PopUpShopData, } from '../domain/activityField/popUpShopField';
import { RewardParam } from '../domain/activityField/rewardField';
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { PopUpShopData, } from '../../domain/activityField/popUpShopField';
import { RewardParam } from '../../domain/activityField/rewardField';
import { addReward, stringToRewardParam } from './giftPackageService';
import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../db/ActivityPopUpShop';
import { ServerlistModel } from '../db/Serverlist';
import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../../db/ActivityPopUpShop';
import { ServerlistModel } from '../../db/Serverlist';
import moment = require('moment');
/**
game-server/app/services/rechargeMoneyService.ts → game-server/app/services/activity/rechargeMoneyService.ts
+5 -8
View File
@@ -1,12 +1,9 @@
import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityRechargeMoneyModel, ActivityRechargeMoneyModelType } from '../db/ActivityRechargeMoney';
import { RewardParam } from '../domain/activityField/rewardField';
import { RechargeMoneyData, RechargeMoneyItem } from '../domain/activityField/rechargeMoneyField';
import { addReward, stringToRewardParam } from './giftPackageService';
import { ACTIVITY_TYPE, TASK_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityRechargeMoneyModel, ActivityRechargeMoneyModelType } from '../../db/ActivityRechargeMoney';
import { RechargeMoneyData, RechargeMoneyItem } from '../../domain/activityField/rechargeMoneyField';
import moment = require('moment');
import { ServerlistModel } from '../db/Serverlist';
import { ServerlistModel } from '../../db/Serverlist';
/**
* 获取活动数据
game-server/app/services/refreshShopService.ts → game-server/app/services/activity/refreshShopService.ts
+7 -7
View File
@@ -1,11 +1,11 @@
import moment = require('moment');
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } 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 { deltaDays } from '../pubUtils/util';
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } 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 { deltaDays } from '../../pubUtils/util';
import { addReward, stringToRewardParam } from './giftPackageService';
/**
game-server/app/services/refreshTaskService.ts → game-server/app/services/activity/refreshTaskService.ts
+6 -6
View File
@@ -1,9 +1,9 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityRefreshTaskModel, ActivityRefreshTaskModelType } from '../db/ActivityRefreshTask';
import { ActivityRefreshTaskPointModel, ActivityRefreshTaskPointModelType } from '../db/ActivityRefreshTaskPoint';
import { ServerlistModel } from '../db/Serverlist';
import { RefreshTaskData, RefreshTaskItem } from '../domain/activityField/refreshTaskField';
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityRefreshTaskModel, ActivityRefreshTaskModelType } from '../../db/ActivityRefreshTask';
import { ActivityRefreshTaskPointModel, ActivityRefreshTaskPointModelType } from '../../db/ActivityRefreshTaskPoint';
import { ServerlistModel } from '../../db/Serverlist';
import { RefreshTaskData, RefreshTaskItem } from '../../domain/activityField/refreshTaskField';
/**
game-server/app/services/selfServiceShopActivityService.ts → game-server/app/services/activity/selfServiceShopActivityService.ts
+8 -9
View File
@@ -1,12 +1,11 @@
import { ACTIVITY_TYPE, REFRESH_TIME, STATUS } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivitySelfServiceGoodsModel, ActivitySelfServiceGoodsModelType } from '../db/ActivitySelfServiceGoods';
import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../db/ActivitySelfServiceShop';
import { ActivitySelfServiceModel } from '../db/ActivitySelfService';
import { ServerlistModel } from '../db/Serverlist';
import { RewardParam } from '../domain/activityField/rewardField';
import { SelfServiceShopData, SelfServiceShopItem } from '../domain/activityField/selfServiceShopField';
import { gameData } from '../pubUtils/data';
import { ACTIVITY_TYPE, REFRESH_TIME, STATUS } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivitySelfServiceGoodsModel, ActivitySelfServiceGoodsModelType } from '../../db/ActivitySelfServiceGoods';
import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../../db/ActivitySelfServiceShop';
import { ActivitySelfServiceModel } from '../../db/ActivitySelfService';
import { ServerlistModel } from '../../db/Serverlist';
import { RewardParam } from '../../domain/activityField/rewardField';
import { SelfServiceShopData, SelfServiceShopItem } from '../../domain/activityField/selfServiceShopField';
import { addReward, getSelectedReward, stringToRewardParam } from './giftPackageService';
import moment = require('moment');
game-server/app/services/sevenDaysService.ts → game-server/app/services/activity/sevenDaysService.ts
+8 -9
View File
@@ -1,12 +1,11 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityGrowthModel, ActivityGrowthModelType } from '../db/ActivityGrowth';
import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../db/ActivityGrowthPoint';
import { HeroModel } from '../db/Hero';
import { ServerlistModel } from '../db/Serverlist';
import { SevenDaysData } from '../domain/activityField/sevenDaysField';
import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../db/ActivityDailyChallenges';
import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../db/ActivityDailyGifts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityGrowthModel, ActivityGrowthModelType } from '../../db/ActivityGrowth';
import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../../db/ActivityGrowthPoint';
import { HeroModel } from '../../db/Hero';
import { ServerlistModel } from '../../db/Serverlist';
import { SevenDaysData } from '../../domain/activityField/sevenDaysField';
import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../../db/ActivityDailyChallenges';
import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../../db/ActivityDailyGifts';
/**
* 获取活动数据
game-server/app/services/signInService.ts → game-server/app/services/activity/signInService.ts
+6 -6
View File
@@ -1,10 +1,10 @@
import moment = require('moment');
import { ACTIVITY_TYPE, REFRESH_TIME, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
import { RoleModel } from '../db/Role';
import { ServerlistModel } from '../db/Serverlist';
import { SignInData } from '../domain/activityField/signInField';
import { ACTIVITY_TYPE, REFRESH_TIME, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivitySignInModel, ActivitySignInModelType } from '../../db/ActivitySignIn';
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { SignInData } from '../../domain/activityField/signInField';
/**
* 获取活动数据
game-server/app/services/thirtyDaysService.ts → game-server/app/services/activity/thirtyDaysService.ts
+7 -8
View File
@@ -1,12 +1,11 @@
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityThirtyDaysModel, ActivityThirtyDaysModelType } from '../db/ActivityThirtyDays';
import { ThirtyDaysData } from '../domain/activityField/thirtyDaysField';
import { ActivityThirtyDaysPointRewardModel, ActivityThirtyDaysPointRewardModelType } from '../db/ActivityThirtyDaysPointReward';
import { RoleModel } from '../db/Role';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityThirtyDaysModel, ActivityThirtyDaysModelType } from '../../db/ActivityThirtyDays';
import { ThirtyDaysData } from '../../domain/activityField/thirtyDaysField';
import { ActivityThirtyDaysPointRewardModel, ActivityThirtyDaysPointRewardModelType } from '../../db/ActivityThirtyDaysPointReward';
import { RoleModel } from '../../db/Role';
import moment = require('moment');
import { deltaDays } from '../pubUtils/util';
import { ServerlistModel } from '../db/Serverlist';
import { HeroModel } from '../db/Hero';
import { deltaDays } from '../../pubUtils/util';
import { ServerlistModel } from '../../db/Serverlist';
/**
* 获取活动数据
game-server/app/services/treasureHuntService.ts → game-server/app/services/activity/treasureHuntService.ts
+11 -11
View File
@@ -1,16 +1,16 @@
import moment = require('moment');
import { ACTIVITY_TYPE, SERVER_OPEN_TIME, STATUS } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityTreasureHuntShopModel, ActivityTreasureHuntShopModelType } from '../db/ActivityTreasureHuntShop';
import { ActivityTreasureHuntTaskModel, ActivityTreasureHuntTaskModelType } from '../db/ActivityTreasureHuntTask';
import { ActivityTreasureHuntTreasureShopModel, ActivityTreasureHuntTreasureShopModelType } from '../db/ActivityTreasureHuntTreasureShop';
import { ActivityTreasureHuntFirstPageModel, ActivityTreasureHuntFirstPageModelType } from '../db/ActivityTreasureHuntFirstPage';
import { ServerlistModel } from '../db/Serverlist';
import { ServerTempModel, ServerTempModelType } from '../db/ServerTemp';
import { TreasureHuntData } from '../domain/activityField/treasureHuntField';
import { deltaDays } from '../pubUtils/util';
import { ACTIVITY_TYPE, SERVER_OPEN_TIME, STATUS } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityTreasureHuntShopModel, ActivityTreasureHuntShopModelType } from '../../db/ActivityTreasureHuntShop';
import { ActivityTreasureHuntTaskModel, ActivityTreasureHuntTaskModelType } from '../../db/ActivityTreasureHuntTask';
import { ActivityTreasureHuntTreasureShopModel, ActivityTreasureHuntTreasureShopModelType } from '../../db/ActivityTreasureHuntTreasureShop';
import { ActivityTreasureHuntFirstPageModel, ActivityTreasureHuntFirstPageModelType } from '../../db/ActivityTreasureHuntFirstPage';
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 { RewardParam } from '../domain/activityField/rewardField';
import { RewardParam } from '../../domain/activityField/rewardField';
/**
* 获取活动数据
game-server/app/services/vipRechargeMoneyService.ts → game-server/app/services/activity/vipRechargeMoneyService.ts
+5 -7
View File
@@ -1,10 +1,8 @@
import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityVipRechargeMoneyModel, ActivityVipRechargeMoneyModelType } from '../db/ActivityVipRechargeMoney';
import { VipRechargeMoneyData, VipRechargeMoneyItem } from '../domain/activityField/vipRechargeMoneyField';
import moment = require('moment');
import { ServerlistModel } from '../db/Serverlist';
import { ACTIVITY_TYPE, TASK_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityVipRechargeMoneyModel, ActivityVipRechargeMoneyModelType } from '../../db/ActivityVipRechargeMoney';
import { VipRechargeMoneyData, VipRechargeMoneyItem } from '../../domain/activityField/vipRechargeMoneyField';
import { ServerlistModel } from '../../db/Serverlist';
/**
* 获取活动数据
game-server/app/services/yuanbaoService.ts → game-server/app/services/activity/yuanbaoService.ts
+6 -6
View File
@@ -1,9 +1,9 @@
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
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 { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
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 { addReward, stringToRewardParam } from './giftPackageService';
/**
game-server/app/services/connectorService.ts
+34 -34
View File
@@ -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,42 +38,42 @@ 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') {
try{
export async function pushData(role: RoleType, session: FrontendOrBackendSession, pushType: 'entry' | 'refresh' = 'entry') {
try {
const { roleId } = role;
const sid = session.get('sid');
pushEntryStart(roleId, sid);
// 军团
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) {
if(notIncludeModule.indexOf(type) == -1) {
for (let type of modules) {
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': // 远征
@@ -102,33 +102,33 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
const gachalist = await getGachaList(roleId);
const visitList = await getVisitedHeroList(roleId);
return { gachalist, visitList }
case 'school':
case 'school':
return await getSchoolList(roleId);
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) {
case 'boss':
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);
@@ -142,15 +142,15 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
return await getEvent(role.eventStatus, roleId, roleName);
case 'battle':
return await getBattleListOfMain(role);
case 'guildActivity':
case 'guildActivity':
return getAllGuildActivityStatus();
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;
@@ -214,9 +214,9 @@ async function getGuildEntryData(role: RoleType, sid: string, session: FrontendO
let guild = await getGuildWithRefActive(userGuild.guildCode, role.serverId);
if (guild) {
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}]);
todayZeroPoint
}), [{ uid: roleId, sid: sid }]);
}
} else {
clearInterval(interval);
game-server/app/services/orderService.ts
+12 -14
View File
@@ -1,22 +1,20 @@
import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
import { SignInData, SignInItem } from '../domain/activityField/signInField';
import { ACTIVITY_TYPE, ORDER_STATE, STATUS } from '../consts';
import { UserOrderModelType } from '../db/UserOrder';
import { ACTIVITY_TYPE, 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 { makeSignInVIP } from './signInService';
import { makeDailyRMBGiftsReward } from './dailyRMBGiftsService';
import { makePopUpShopReward } from './popUpShopService';
import { makeMonthlyTicketReward } from './activity/monthlyTicketService';
import { makeSignInVIP } from './activity/signInService';
import { makeDailyRMBGiftsReward } from './activity/dailyRMBGiftsService';
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 { makeLimitPackageReward } from './limitPackageService';
import { makeShop } from './treasureHuntService';
import { makeSelfServerShop } from './selfServiceShopActivityService';
import { makeRefreshShopReward } from './refreshShopService';
import { makeGrowthFund } from './activity/growthFundService';
import { makeLimitPackageReward } from './activity/limitPackageService';
import { makeShop } from './activity/treasureHuntService';
import { makeSelfServerShop } from './activity/selfServiceShopActivityService';
import { makeRefreshShopReward } from './activity/refreshShopService';
import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../db/ActivityMonopoly';
import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../db/ActivityMonopolyLand';