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

Revert "✨ feat(db): 修改role表数据库操作方式"

Browse Source 
This reverts commit e39af3649288cc5802739cfe862c818fe56e194e.
This commit is contained in:
luying
2023-05-22 19:43:21 +08:00
parent 2d45b2c66c
commit 7bc9e1fe49
79 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/activity/firstGiftService.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../../db/ActivityFirstGift';
import Role, { RoleType } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { FirstGiftData } from '../../domain/activityField/firstGiftField';
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
@@ -29,7 +29,7 @@ import { getActivitiesByType, getActivityById } from './activityService';
// return null;
// }
// let { createTime } = await Role.findByRoleId(roleId);
// let { createTime } = await RoleModel.findByRoleId(roleId);
// let playerData = new FirstGiftData(activityData, createTime);
// playerData.setPlayerRecords(playerRecord);
// return playerData;
game-server/app/services/activity/growthFundService.ts
+4 -4
View File
@@ -2,7 +2,7 @@ import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityGrowthFundModel, ActivityGrowthFundModelType } from '../../db/ActivityGrowthFund';
import { ActivityBuyRecordsModel } from '../../db/ActivityBuyRecords';
import Role from '../../db/Role';
import { RoleModel } from '../../db/Role';
import { GrowthFundData } from '../../domain/activityField/growthFundField';
import { ServerlistModel } from '../../db/Serverlist';
import { getActivitiesByType, getActivityById } from './activityService';
@@ -63,7 +63,7 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
case ACTIVITY_TYPE.GROWTH_FUND_MAIN://主线
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP://主线vip
{
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let { warStar = new Array<{ id: number, warType: number, star: number }>() } = role;
let warIDs = warStar.map(cur => cur.id);
for (let page of playerData.list) {
@@ -81,7 +81,7 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
case ACTIVITY_TYPE.GROWTH_FUND_TOWER://镇念塔
case ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP:////镇念塔vip
{
let { towerLv } = await Role.findByRoleId(roleId);
let { towerLv } = await RoleModel.findByRoleId(roleId);
for (let page of playerData.list) {
for (let item of page.items) {
if (item.taskType == TASK_TYPE.BATTLE_TOWER_LV) {
@@ -96,7 +96,7 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE: //精英
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP: //精英VIP
{
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let { warStar = new Array<{ id: number, warType: number, star: number }>() } = role;
let warIDs = warStar.map(cur => cur.id);
for (let page of playerData.list) {
game-server/app/services/activity/limitPackageService.ts
+2 -2
View File
@@ -2,7 +2,7 @@ import moment = require('moment');
import { ACTIVITY_TYPE, ITEM_CHANGE_REASON, STATUS } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityShopModel, ActivityShopModelType } from '../../db/ActivityShop';
import Role from '../../db/Role';
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { LimitShopData } from '../../domain/activityField/limitShopField';
import { deltaDays } from '../../pubUtils/util';
@@ -85,7 +85,7 @@ export async function limitPackageActivity(serverId: number, roleId: string, typ
*
*/
export async function newPlayerActivityDays(roleId: string) {
let { createTime } = await Role.findByRoleId(roleId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let createDate = moment(createTime * 1000).toDate();
let todayIndex = deltaDays(createDate, new Date, true) + 1;
return todayIndex;
game-server/app/services/activity/monthlyTicketService.ts
+3 -3
View File
@@ -7,7 +7,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
import moment = require('moment');
import { ServerlistModel } from '../../db/Serverlist';
import { sendMailByContent } from './../mailService';
import Role, { RoleType } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { getActivitiesByType, getActivityById } from './activityService';
import { RewardInter } from '../../pubUtils/interface';
import { DUNGEON_CONST, PVP, VIP } from '../../pubUtils/dicParam';
@@ -132,7 +132,7 @@ export async function makeMonthlyTicketReward(roleId: string, roleName: string,
await ActivityMonthlyTicketModel.buyMonthlyTicket(serverId, roleId, activityId, activityData.type, endTime, playerData.isForever)
if(activityData.type == ACTIVITY_TYPE.MONTHLY_TICKET_2) {
let role = await Role.buyForeverTicket(roleId);
let role = await RoleModel.buyForeverTicket(roleId);
if(sid) await pinus.app.rpc.connector.connectorRemote.setOtherUserSession.toServer(sid,[{ roleId, vipStartTime: role.vipStartTime }]);
}
let firstReward = playerData.firstReward;
@@ -196,7 +196,7 @@ export function getVipHungupReward(startTime: number, endTime: number, baseRewar
export async function getVipPvpChallengeMaxCnt(roleId: string, vipStartTime?: number) {
if(vipStartTime == undefined) {
let role = await Role.findByRoleId(roleId, 'vipStartTime');
let role = await RoleModel.findByRoleId(roleId, 'vipStartTime');
vipStartTime = role.vipStartTime;
}
let count = PVP.PVP_CHALLENGE_COUNTS;
game-server/app/services/activity/popUpShopService.ts
+2 -2
View File
@@ -7,7 +7,7 @@ import { ActivityPopUpShopModel, ActivityPopUpShopModelType, PopUpShopItem } fro
import { ServerlistModel } from '../../db/Serverlist';
import moment = require('moment');
import { getActivitiesByType, getActivityById, pushActivities, pushActivityInter, pushSingleActivity } from './activityService';
import Role, { RoleType } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { HeroType } from '../../db/Hero';
import { pinus } from 'pinus';
import { getRandEelm, getRandSingleEelm } from '../../pubUtils/util';
@@ -25,7 +25,7 @@ import { ActivityPopUpShopRecModel } from '../../db/ActivityPopUpShopRec';
*
*/
export async function getPopUpShopData(activityId: number, serverId: number, roleId: string, role?: RoleType) {
if(!role) role = await Role.findByRoleId(roleId, 'roleId totalPay lv');
if(!role) role = await RoleModel.findByRoleId(roleId, 'roleId totalPay lv');
let activityData = await getActivityById(activityId);
let playerRecords = await ActivityPopUpShopModel.findAllEffectData(serverId, activityId, roleId);
game-server/app/services/activity/refreshShopService.ts
+5 -5
View File
@@ -2,7 +2,7 @@ import moment = require('moment');
import { ACTIVITY_TYPE, ITEM_CHANGE_REASON, STATUS } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityRefreshShopModel, ActivityRefreshShopModelType } from '../../db/ActivityRefreshShop';
import Role from '../../db/Role';
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { RefreshShopData } from '../../domain/activityField/refreshShopField';
import { deltaDays } from '../../pubUtils/util';
@@ -31,7 +31,7 @@ export async function getRefreshShopActivity(serverId: number, roleId: string) {
let playerRecord: ActivityRefreshShopModelType = await ActivityRefreshShopModel.findData(activityData.activityId, roleId, playerData.roundIndex);
if (!playerRecord) {//生成商店可购买商品的数据
let { lv } = await Role.findByRoleId(roleId);
let { lv } = await RoleModel.findByRoleId(roleId);
let randomGoods = playerData.randomGoodsItems(lv);
playerRecord = await ActivityRefreshShopModel.createShop(activityData.activityId, roleId, playerData.roundIndex, randomGoods);
}
@@ -49,7 +49,7 @@ export async function getRefreshShopActivity(serverId: number, roleId: string) {
*/
export async function getPlayerRefreshShopData(activityId: number, serverId: number, roleId: string) {
let activityData = await getActivityById(activityId);
let role = await Role.findByRoleId(roleId, 'lv createTime');
let role = await RoleModel.findByRoleId(roleId, 'lv createTime');
let createTime = await getRoleCreateTime(roleId, role);
let serverTime = await getServerCreateTime(serverId);
let playerData = new RefreshShopData(activityData, createTime, serverTime);
@@ -73,7 +73,7 @@ export async function getPlayerRefreshShopData(activityId: number, serverId: num
*/
export async function getPlayerRefreshShopDataByRoundIndex(activityId: number, serverId: number, roleId: string, roundIndex: number) {
let activityData: ActivityModelType = await getActivityById(activityId);
let role = await Role.findByRoleId(roleId, 'lv createTime');
let role = await RoleModel.findByRoleId(roleId, 'lv createTime');
let createTime = await getRoleCreateTime(roleId, role);
let serverTime = await getServerCreateTime(serverId);
let playerData = new RefreshShopData(activityData, createTime, serverTime);
@@ -96,7 +96,7 @@ export async function getPlayerRefreshShopDataByRoundIndex(activityId: number, s
*
*/
export async function newPlayerActivityDays(roleId: string) {
let { createTime } = await Role.findByRoleId(roleId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let createDate = moment(createTime * 1000).toDate();
let todayIndex = deltaDays(createDate, new Date, true) + 1;
return todayIndex;
game-server/app/services/activity/timeLimitRankService.ts
+2 -2
View File
@@ -2,7 +2,7 @@ import { ACTIVITY_TYPE, getRedisKeyByRankType, MAIL_TYPE, RANK_TYPE, REDIS_KEY }
import { ActivityGroupModel } from "../../db/ActivityGroup";
import { ActivityTimeLimitRankModel, ActivityTimeLimitRankModelTypeParam } from "../../db/ActivityTimeLimitRank";
import { GuildModel, GuildType } from "../../db/Guild";
import Role from "../../db/Role";
import { RoleModel } from "../../db/Role";
import { TimeLimitRankData } from "../../domain/activityField/timeLimitRankField";
import { GuildRankInfo, RoleRankInfo } from "../../domain/rank";
import { stringWithTypeToRewardInter } from "../../pubUtils/roleUtil";
@@ -116,7 +116,7 @@ export async function takeSnapshot(data: TimeLimitRankData, serverId: number) {
serverId, activityId: data.activityId, rankType: data.rankType, score: rank.scores[0]||0, time: rank.scores[1]||0
}
if(rank.myId.roleId) {
let role = await Role.findByRoleId(rank.myId.roleId, '_id roleId');
let role = await RoleModel.findByRoleId(rank.myId.roleId, '_id roleId');
if(role) insertInfos.push({ ...insertBaseInfo, roleId: role.roleId, role: role._id });
} else if(rank.myId.guildCode) {
let guild = await GuildModel.findByCode(rank.myId.guildCode, serverId, '_id guildCode');