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');
game-server/app/services/battle/comBattleService.ts
+2 -2
View File
@@ -2,7 +2,7 @@ import { MemComBtlTeam } from '../../domain/battleField/ComBattleTeamField';
import { ItemModel } from '../../db/Item';
import { BATTLE_REWARD_TYPE, ITEM_CHANGE_REASON, IT_TYPE, PUSH_ROUTE } from '../../consts';
import { FriendRelationModel } from '../../db/FriendRelation';
import Role, { RoleType } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { STATUS } from '../../consts/statusCode';
import { COM_TEAM_STATUS, FRIEND_DROP_TYPE, COM_BTL_CONST, FRIEND_DROP_MAX } from '../../consts';
import { RoleStatus, ComBattleTeamModel, ComBattleTeamType, ComBattleReward } from '../../db/ComBattleTeam';
@@ -468,7 +468,7 @@ async function teammateValid(roleInfo: Partial<RoleType>, roleId: string, roleId
* @returns
*/
export async function getValidTeammateRoleSt(roleId: string, roleIds: string[], ceLimit: number, sid: string) {
let roleInfo = await Role.findByRoleId(roleId, null, true);
let roleInfo = await RoleModel.findByRoleId(roleId, null, true);
const valid = await teammateValid(roleInfo, roleId, roleIds, ceLimit);
if (!valid) return null;
game-server/app/services/battleService.ts
+8 -8
View File
@@ -3,7 +3,7 @@ import { HangUpRecordModel } from './../db/HangUpRecord';
import { HANG_UP_CONSTS, REDIS_KEY, TASK_TYPE, TOWER_FORBIDDEN_CHARA_TYPE, TOWER_TASK_STATUS, MAIL_TYPE, MSG_SOURCE, POP_UP_SHOP_CONDITION_TYPE } from './../consts';
import { BattleRecordModel } from './../db/BattleRecord';
import { TowerRecordModel, WarStatus } from './../db/TowerRecord';
import Role, { RoleType } from './../db/Role';
import { RoleModel, RoleType } from './../db/Role';
import { shouldRefresh, resResult, cal, getRandEelmWithWeight, genCode, } from '../pubUtils/util';
import { STATUS } from '../consts/statusCode';
import { HangUpSpdUpRecModel } from '../db/HangUpSpdUpRec';
@@ -28,7 +28,7 @@ import { checkPopUpCondition } from './activity/popUpShopService';
export async function getTowerStatus(role: RoleType) {
let { towerLv, roleId, serverId, towerReceived } = role;
if (!towerLv) {
let role = await Role.towerLvUp(roleId);
let role = await RoleModel.towerLvUp(roleId);
towerLv = role.towerLv;
}
let towerRec = await getTowerRecByLv(roleId, towerLv);
@@ -88,7 +88,7 @@ export function getTowerHeroCe(warId: number, heroes: HeroType[], recHeroes: num
* @param roleId
*/
export async function getHungupRewards(roleId: string, role?: RoleType) {
if(!role) role = await Role.findByRoleId(roleId);
if(!role) role = await RoleModel.findByRoleId(roleId);
const result = await calcuHangUpReward(role);
if(!result) return false;
@@ -108,7 +108,7 @@ export async function getHungupRewards(roleId: string, role?: RoleType) {
* @param role
*/
export async function getTasks(roleId: string) {
let role = await Role.findByRoleId(roleId, 'roleName towerLv towerTaskRefTime towerTaskReCnt');
let role = await RoleModel.findByRoleId(roleId, 'roleName towerLv towerTaskRefTime towerTaskReCnt');
let { roleName, towerLv, towerTaskRefTime, towerTaskReCnt = 0 } = role;
// towerLv：从1开始，下次打得层数，dicParam内的：从0开始，打过的层数
@@ -120,7 +120,7 @@ export async function getTasks(roleId: string) {
const needRefresh = shouldRefresh(towerTaskRefTime, curTime);
let curTasks: TowerTaskRecType[] = []
if(needRefresh) {
role = await Role.resetTowerCnt(roleId, curTime);
role = await RoleModel.resetTowerCnt(roleId, curTime);
const batchCode = genCode(8);
let tasksData = await TowerTaskRecModel.getPreTasks(roleId);
let preTasksMap = treatPreTasks(tasksData);
@@ -183,7 +183,7 @@ export function checkTaskRewards(batchCode: string, tasks: TowerTaskRecType[]) {
}
export async function checkTowerWar(roleId: string, battleId: number, seqIds: number[], heroes: HeroType[]) {
let { towerLv } = await Role.findByRoleId(roleId);
let { towerLv } = await RoleModel.findByRoleId(roleId);
const towerInfo = gameData.tower.get(towerLv);
if (!towerInfo) {
console.error(`天梯层数异常，lv ${towerLv} by ${roleId}`);
@@ -252,7 +252,7 @@ export async function towerBattleEnd(sid: string, roleId: string, serverId: numb
return { status: -1, resResult: resResult(STATUS.BATTLE_ID_NOT_MATCH) };
}
let { towerLv, roleName } = await Role.findByRoleId(roleId);
let { towerLv, roleName } = await RoleModel.findByRoleId(roleId);
let { warStatus, heroes: recHeroes } = await TowerRecordModel.getRecordByLv(roleId, towerLv);
// console.log('*******', towerLv, heroes.join(), recHeroes.join())
for (let hid of heroes) {
@@ -275,7 +275,7 @@ export async function towerBattleEnd(sid: string, roleId: string, serverId: numb
let newRec = await TowerRecordModel.updateRecord(roleId, towerLv, battleCode, battleId, heroes, inc);
let towerReward: RewardInter[] = [];
if (inc === 1) {
let role = await Role.towerLvUp(roleId);
let role = await RoleModel.towerLvUp(roleId);
// 更新redis
let r = new Rank(REDIS_KEY.TOWER_RANK, { serverId });
await r.setRankWithRoleInfo(roleId, role.towerLv - 1, role.towerUpTime.getTime(), role);
game-server/app/services/chatService.ts
+3 -3
View File
@@ -1,6 +1,6 @@
import { CHAT_SYSTEM } from './../pubUtils/dicParam';
import { PrivateChatRec } from './../db/ChatInfo';
import Role from './../db/Role';
import { RoleModel } from './../db/Role';
import { GroupMessageModel } from './../db/GroupMessage';
import { CounterModel } from './../db/Counter';
import { PrivateMessageModel, PrivateMessageParam, PrivateMessageType } from './../db/PrivateMessage';
@@ -346,7 +346,7 @@ async function updateRecentChats(sender: boolean, roleId: string, targetRoleId:
*/
export async function roleChatInfos(roleId: string, roleName?: string) {
if(!roleName) {
let role = await Role.findByRoleId(roleId, 'roleName');
let role = await RoleModel.findByRoleId(roleId, 'roleName');
roleName = role.roleName;
}
let result = await ChatInfoModel.findInfo(roleId);
@@ -376,7 +376,7 @@ export async function recentPrivateChatInfos(roleId: string, roleName: string) {
.splice(CHAT_SYSTEM.RECENT_PRIVATE_CHATS_CNT);
if (!recentPrivateChats || !recentPrivateChats.length) return [];
const roleInfos = await Role.findByRoleIds(recentPrivateChats.map(chat => { return chat.targetRoleId }));
const roleInfos = await RoleModel.findByRoleIds(recentPrivateChats.map(chat => { return chat.targetRoleId }));
const chatInfos = recentPrivateChats.map( chat => {
for (let { roleId: targetRoleId, quitTime, loginTime, roleName: targetRoleName, title, guildName, head, frame, spine, lv } of roleInfos) {
if (targetRoleId === chat.targetRoleId) {
game-server/app/services/connectorService.ts
+1 -1
View File
@@ -5,7 +5,7 @@ import { getMails } from './mailService';
import { recentGuildMsgs, recentLeagueMsgs, recentPrivateChatInfos, recentServerGroupMsgs, recentSysMsgs, recentWorldMsgs } from './chatService';
import { getCurTask, getPvpTask } from './task/taskService';
import { RoleType } from '../db/Role';
import { RoleModel, RoleType } from '../db/Role';
import { Application, FrontendOrBackendSession, pinus, RpcClient } from 'pinus';
import { compareVersion, getRandEelmWithWeight, resResult } from '../pubUtils/util';
import { STATUS, PUSH_BATCH, PUSH_INTERVAL, CONSUME_TYPE, HERO_SELECT, ENTERY_ROLE_PICK, JEWEL_SELECT, ITEM_SELECT, SKIN_SELECT, PUSH_ROUTE, ARTIFACT_SELECT, ACTIVITYITEM_SELECT, SNS_LINK_TYPE } from '../consts';
game-server/app/services/dailyBattleService.ts
+2 -2
View File
@@ -5,7 +5,7 @@
import DailyRecord, { DailyRecordModel } from '../db/DailyRecord';
import { resResult } from '../pubUtils/util';
import { STATUS } from '../consts/statusCode';
import Role, { RoleType } from '../db/Role';
import { RoleModel, RoleType } from '../db/Role';
import { gameData } from '../pubUtils/data';
import { DicWar } from '../pubUtils/dictionary/DicWar';
import { WarStar } from '../domain/dbGeneral';
@@ -118,7 +118,7 @@ export async function getDailyNum(dailyRecord: DailyRecord, role?: RoleType) {
let {timesPerDay, timesCanBuy} = curDaily;
if(!role) {
role = await Role.findByRoleId(roleId, 'vipStartTime');
role = await RoleModel.findByRoleId(roleId, 'vipStartTime');
}
timesPerDay = getVipDailyCnt(timesPerDay, role);
// console.log('###### getDailyNum', timesPerDay, count, buyCount, timesCanBuy)
game-server/app/services/dungeonService.ts
+5 -5
View File
@@ -4,7 +4,7 @@
import { resResult, shouldRefresh, } from '../pubUtils/util';
import { STATUS } from '../consts/statusCode';
import Role, { RoleType, WarStar } from '../db/Role';
import { RoleModel, RoleType, WarStar } from '../db/Role';
import * as dicParam from '../pubUtils/dicParam';
import { RankParam } from '../domain/rank';
import { BattleRecordType } from '../db/BattleRecord';
@@ -41,7 +41,7 @@ function isFirstPass(warStar: WarStar[], warId: number) {
// 检查秘境本次数checkBattle使用
export async function checkDungeonNum(roleId: string, inc: number, warId: number) {
let { dungeonCnt = 0, dungeonBuyCnt = 0, dungeonRefTime, vipStartTime, warStar } = await Role.findByRoleId(roleId);
let { dungeonCnt = 0, dungeonBuyCnt = 0, dungeonRefTime, vipStartTime, warStar } = await RoleModel.findByRoleId(roleId);
if(isFirstPass(warStar, warId)) inc = 0;
let curTime = new Date();
@@ -53,7 +53,7 @@ export async function checkDungeonNum(roleId: string, inc: number, warId: number
if(dungeonCnt + inc > freeCount + dungeonBuyCnt) {
return {status: -1, resResult: resResult(STATUS.DUNGEON_TIMES_LACK)}
}
await Role.increaseDungeonCnt(roleId, needRefresh, 0, curTime);
await RoleModel.increaseDungeonCnt(roleId, needRefresh, 0, curTime);
return { status: 0, data: {
battleCount: freeCount + dungeonBuyCnt - dungeonCnt,
@@ -70,7 +70,7 @@ export async function checkDungeonNum(roleId: string, inc: number, warId: number
export async function checkDungeonAndIncrease(roleId: string, inc: number, isRef: boolean, warId: number) {
let { dungeonCnt = 0, dungeonBuyCnt = 0, dungeonRefTime, vipStartTime, warStar } = await Role.findByRoleId(roleId);
let { dungeonCnt = 0, dungeonBuyCnt = 0, dungeonRefTime, vipStartTime, warStar } = await RoleModel.findByRoleId(roleId);
if(isFirstPass(warStar, warId)) inc = 0;
let curTime = new Date();
@@ -84,7 +84,7 @@ export async function checkDungeonAndIncrease(roleId: string, inc: number, isRef
return { status: -1, resResult: resResult(STATUS.DUNGEON_TIMES_LACK) }
}
// console.log('needRefresh', needRefresh);
await Role.increaseDungeonCnt(roleId, needRefresh, inc, curTime);
await RoleModel.increaseDungeonCnt(roleId, needRefresh, inc, curTime);
return {status: 1, data: {
battleCount: freeCount + dungeonBuyCnt - dungeonCnt - inc,
buyCount: dicParam.DUNGEON_CONST.DUNGEON_CONST_BUY - dungeonBuyCnt
game-server/app/services/eventSercive.ts
+3 -3
View File
@@ -1,6 +1,6 @@
import { FrontendOrBackendSession, pinus } from 'pinus';
import EventRecord, { EventRecordModel } from '../db/EventRecord';
import Role from '../db/Role';
import { RoleModel } from '../db/Role';
import { genCode, getRandEelmWithWeight, resResult, getRandSingleEelm } from '../pubUtils/util';
import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_TYPE, EVENT_RANDOM_TYPE_ONE_OPEN, EVENT_QUIZ_NUM, EVENT_ANSWER_STATUS, FUNCS_ID, PUSH_ROUTE } from '../consts';
import { EVENT_REFRESH_NUM } from '../consts';
@@ -93,7 +93,7 @@ export async function startEvent(session: FrontendOrBackendSession) {
let sid = session.get('sid');
let event = await refreshEvent(1, roleId, roleName, 0, []); // 刷新初始的一件
if(event.length > 0) {
await Role.setEventStatus(roleId, EVENT_STATUS.STARTING);
await RoleModel.setEventStatus(roleId, EVENT_STATUS.STARTING);
session.set('eventStatus', EVENT_STATUS.STARTING);
session.push('eventStatus', () => {});
pushEventMsg(sid, roleId, { event }); // 推送
@@ -167,7 +167,7 @@ export async function refreshEvent(num: number, roleId: string, roleName: string
let event = new Array();
let dicEvent = gameData.eventList.filter(cur => cur.movePointArray && cur.movePointArray.length > 0);
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
dicEvent = dicEvent.filter(cur => { // 筛选适合等级
let { suitLevel, previousGk } = cur;
return suitLevel.min <= role.lv && suitLevel.max >= role.lv && checkPreviousGk(previousGk, role.warStar)
game-server/app/services/expeditionService.ts
+6 -6
View File
@@ -1,6 +1,6 @@
import { ExpeditionPointModel } from '../db/ExpeditionPoint';
import Role from '../db/Role';
import Role, { RoleModel } from '../db/Role';
import { shouldRefresh, getRandSingleEelm } from '../pubUtils/util';
import { EXPEDITION_WAR_RECORD_STATUS, SYSTEM_OPEN_ID } from '../consts';
import { ExpeditionWarRecordModel } from '../db/ExpeditionWarRecord';
@@ -19,7 +19,7 @@ import { checkSystemIsOpen } from './roleService';
*/
export async function getExpeditionStatus(roleId: string, roleName: string, isEntry = false) {
// 重置次数
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if(!role.hasInit) return false;
if(isEntry && !checkSystemIsOpen(role, SYSTEM_OPEN_ID.EXPEDITION)) return false
// 获取远征关卡状态
@@ -132,7 +132,7 @@ export async function matchPlayers(roleId: string, scale: number, range: number,
let min = myCe * scale * (1 - range/100);
let max = myCe * scale * (1 + range/100);
let resultRange = await Role.findByCeScale(min, max);
let resultRange = await RoleModel.findByCeScale(min, max);
resultRange = resultRange.filter(cur => cur.roleId != roleId);
if(resultRange.length > 0) {
let role = resultRange[0];
@@ -217,7 +217,7 @@ export async function matchRobots(scale: number, myCe: number, robotCe: number,
// 远征匹配系数表
export async function getCEScaleAndRange(roleId: string, curDicExpedition: any) {
// 匹配，判断是不是新手期
const role = await Role.findByRoleId(roleId);
const role = await RoleModel.findByRoleId(roleId);
let isNew = (role.expeditionHistoryResetCnt||0) <= 3;
let scale = isNew?curDicExpedition.CEScaleNew:curDicExpedition.CEScale;
@@ -228,7 +228,7 @@ export async function getCEScaleAndRange(roleId: string, curDicExpedition: any)
// 远征累计点数获取
export async function getPointRewardStatus(roleId: string, role?: Role) {
if(!role) {
role = await Role.findByRoleId(roleId);
role = await RoleModel.findByRoleId(roleId);
}
let {expeditionPoint = 0} = role;
let dicExpeditionPoint = gameData.expeditionPoint;
@@ -252,7 +252,7 @@ export async function getPointRewardStatus(roleId: string, role?: Role) {
export async function getResetRemainCnt(curTime: Date, roleId: string, role?: Role, ) {
if(!role) {
role = await Role.findByRoleId(roleId);
role = await RoleModel.findByRoleId(roleId);
}
let { expeditionResetCnt, expeditionResetRefTime } = role;
game-server/app/services/friendService.ts
+5 -5
View File
@@ -1,5 +1,5 @@
import { gameData, getDicFriendByLv } from "../pubUtils/data";
import Role, { RoleType } from "../db/Role";
import { RoleType, RoleModel } from "../db/Role";
import { FriendRelationType, Relation, FriendRelationModel } from "../db/FriendRelation";
import { getResStr, shouldRefresh } from "../pubUtils/util";
import { STATUS, FRIEND_RELATION_TYPE, POPULATE_TYPE, FRIEND_DROP_TYPE } from "../consts";
@@ -91,7 +91,7 @@ export async function getApplyList(roleId: string) {
result.push(param);
}
let deleteCount = await FriendApplyModel.deleteApply(delApplyCodeList);
await Role.increaseFriendApplyCnt(roleId, -1 * deleteCount, FRIEND.FRIEND_MANAGE_APPLICATION);
await RoleModel.increaseFriendApplyCnt(roleId, -1 * deleteCount, FRIEND.FRIEND_MANAGE_APPLICATION);
return result;
}
@@ -135,11 +135,11 @@ export async function increaseFrdCnt(role1: RoleType, role2: RoleType, originalF
let _dicFriend = getDicFriendByLv(_lv);
if(_friendCnt >= _dicFriend.frdCnt) return getResStr(STATUS.FRIEND_THEY_CNT_MAX);
let incMyFrdCnt = await Role.increaseFriendCnt(roleId, 1, dicFriend.frdCnt);
let incMyFrdCnt = await RoleModel.increaseFriendCnt(roleId, 1, dicFriend.frdCnt);
if(!incMyFrdCnt) return getResStr(STATUS.FRIEND_MY_CNT_MAX);
let incHisFrdCnt = await Role.increaseFriendCnt(_roleId, 1, _dicFriend.frdCnt);
let incHisFrdCnt = await RoleModel.increaseFriendCnt(_roleId, 1, _dicFriend.frdCnt);
if(!incHisFrdCnt) { // 回滚
await Role.increaseFriendCnt(roleId, -1, dicFriend.frdCnt);
await RoleModel.increaseFriendCnt(roleId, -1, dicFriend.frdCnt);
return getResStr(STATUS.FRIEND_THEY_CNT_MAX);
}
originalFriendCnt = incMyFrdCnt.friendCnt;
game-server/app/services/guildActivity/guildActivityService.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { ServerlistModel, ServerlistType } from "../../db/Serverlist";
import Role from "../../db/Role";
import { RoleModel } from "../../db/Role";
import { GUILDACTIVITY } from "../../pubUtils/dicParam";
import { gameData, getCityActivityRewards } from "../../pubUtils/data";
import { getCurDay, nowSeconds, getTimeFun, getZeroPoint } from "../../pubUtils/timeUtil";
@@ -38,7 +38,7 @@ import { getCityActivityObj, getGateActivityObj, getRaceActivityObj } from "../m
export async function setPreDayActiveData(servers: ServerlistType[]) {
for (let server of servers) {
let roles = await Role.getActivePlayers(server.id);
let roles = await RoleModel.getActivePlayers(server.id);
let activePlayerCnt = roles.length;
let activePlayerCe = 0, activePlayers: ActivePlayer[] = [];
let activeGuilds: GuildRecord[] = [];
game-server/app/services/guildService.ts
+4 -4
View File
@@ -2,7 +2,7 @@ import { gameData, getGuildActiveWeekReward, getGuildActiveByIdAndType, getGoodB
import { GuildModel, GuildType, GuildUpdateParam } from "../db/Guild";
import { deltaDays, resResult, shouldRefresh } from "../pubUtils/util";
import { STATUS, MAIL_TYPE, GUILD_AUTH, GUILD_JOB, REDIS_KEY, CHAT_SERVER, TASK_TYPE, COUNTER, GUILD_REC_TYPE, PUSH_ROUTE, WAR_TYPE, USER_GUILD_STATUS } from "../consts";
import Role, { RoleType } from "../db/Role";
import { RoleModel, RoleType } from "../db/Role";
import { UserGuildModel, UserGuildType, WishGood } from "../db/UserGuild";
import { UserGuildApplyModel } from "../db/UserGuildApply";
import { getZeroPointD, getZeroPointOfTime, getZeroPointOfTimeD, nowSeconds } from "../pubUtils/timeUtil";
@@ -94,7 +94,7 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol
let res: any = await lockData(serverId, DATA_NAME.JOIN_GUILD, code);// 加锁
if (!!res.err) return { status: -1, resResult: resResult(STATUS.REDLOCK_ERR) };
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if (role.hasGuild) {
res.releaseCallback();//解锁
return { status: -1, resResult: resResult(STATUS.GUILD_HAS_JOIN) };
@@ -113,7 +113,7 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol
await updateUserInfo(REDIS_KEY.GUILD_INFO, guild.code, [{ field: 'guildCe', value: guild.guildCe }])
}
role = await Role.joinGuild(roleId, code, guildName, false);
role = await RoleModel.joinGuild(roleId, code, guildName, false);
if (!role) {
await GuildModel.notAddMember(code, roleId, role.ce);
res.releaseCallback();//解锁
@@ -265,7 +265,7 @@ async function isIWishedInMyTodayQuitGuilds(roleId: string): Promise<Boolean> {
* @param {string} roleId
*/
export async function canWishToday(roleId: string): Promise<Boolean> {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if (!role) {
return false;
}
game-server/app/services/gvg/gvgBattleService.ts
+2 -2
View File
@@ -22,7 +22,7 @@ import { sendMailByContent, sendMailToLeagueByContent } from "../mailService";
import { GVGCityAreaPointModel } from "../../db/GVGCityAreaPoint";
import { addCityGuardMessage } from "./gvgRecService";
import { GVGUserDataModel } from "../../db/GVGUserData";
import Role from "../../db/Role";
import { RoleModel } from "../../db/Role";
import { getFightTimeByPeriod } from "./gvgFightService";
import { getRandSingleEelm } from "../../pubUtils/util";
import { HeroModel, HeroType } from "../../db/Hero";
@@ -186,7 +186,7 @@ export async function refreshTeams(configId: number, groupKey: string, roleId: s
for(let team of oldTeams) {
if(team.configId != configId || (hasConfirm && team.confirmConfigId != configId)) {
let { teamCode, maxDurability, lineup } = team;
let { lv, title, roleName, guildCode } = await Role.findByRoleId(roleId, 'lv title roleName guildCode');
let { lv, title, roleName, guildCode } = await RoleModel.findByRoleId(roleId, 'lv title roleName guildCode');
let heroes = await HeroModel.findByHidRange(lineup.map(hero => hero.actorId), roleId);
let { newLineup, newLineupCe } = await generNewLineup(roleId, heroes, lineup.map(({ actorId, dataId, outIndex }) => ({ actorId, dataId, order: outIndex })));
let addUpdate = hasConfirm? { confirmConfigId: configId }: {};
game-server/app/services/gvg/gvgFightService.ts
+5 -5
View File
@@ -13,7 +13,7 @@ import { GVGVestigeRankModel, GVGVestigeRankType, GVGVestigeRankUpdate } from ".
import { GVGVestigeRecType } from "../../db/GVGVestigeRec";
import { GVGVestigeSumRankModel, GVGVestigeSumRankType } from "../../db/GVGVestigeSumRank";
import { HeroModel, HeroType } from "../../db/Hero";
import Role from "../../db/Role";
import { RoleModel } from "../../db/Role";
import { OppDetailData, OppPlayerHeroInfo, OppPlayerInfo } from "../../domain/gvgField/gvgDb";
import { GVGVestigeOppPlayer } from "../../domain/gvgField/returnData";
import { KeyNameParam, LeagueRankInfo, myIdInter, RoleRankInfo } from "../../domain/rank";
@@ -121,7 +121,7 @@ export async function getOppPlayerByRanks(serverId: number, groupKey: string, ve
let serverNames = await getAllServerName();
let opps = await GVGVestigeRankModel.findByRanks(groupKey, vestigeId, ranks);
let roleIds = opps.map(cur => cur.roleId);
let roles = await Role.findByRoleIds(roleIds, 'roleId roleName head frame spine heads frames spines title lv guildName serverId updatedAt')
let roles = await RoleModel.findByRoleIds(roleIds, 'roleId roleName head frame spine heads frames spines title lv guildName serverId updatedAt')
let dicRankMap = gameData.gvgVestige.get(vestigeId);
if(!dicRankMap) return [];
let result: GVGVestigeOppPlayer[] = [];
@@ -233,7 +233,7 @@ export async function generateDefenseInfo(roleId: string, vestigeId: number, ran
if(!playerVestigeData) return null;
let lineup = playerVestigeData.lineup||[];
let hids = lineup.map(cur => cur.actorId);
let role = await Role.findByRoleId(playerVestigeData.roleId, 'roleId roleName heads head frames frame spines spine title lv');
let role = await RoleModel.findByRoleId(playerVestigeData.roleId, 'roleId roleName heads head frames frame spines spine title lv');
let heroes = await HeroModel.findByHidRange(hids, playerVestigeData.roleId, 'hid skinId lv star colorStar quality ce');
let league = await GVGLeagueModel.findByCode(playerVestigeData.leagueCode);
@@ -245,7 +245,7 @@ export async function generateDefenseInfo(roleId: string, vestigeId: number, ran
}
export async function generateAttackInfo(roleId: string, league: GVGLeagueType, rank: number) {
let role = await Role.findByRoleId(roleId, 'roleId roleName heads head frames frame spines spine title lv');
let role = await RoleModel.findByRoleId(roleId, 'roleId roleName heads head frames frame spines spine title lv');
let info = new OppPlayerInfo();
info.initByPlayer(rank, role, league, false);
return info;
@@ -342,7 +342,7 @@ export async function getMyVestigeRank(configId: number, groupKey: string, vesti
let myVestigeRank = await GVGVestigeRankModel.findByRole(vestigeId, roleId); // 我在这个遗迹的排名
if(!myVestigeRank) {
let role = await Role.findByRoleId(roleId, 'roleId guildCode');
let role = await RoleModel.findByRoleId(roleId, 'roleId guildCode');
let oppRanks = refreshVestigeOppRanks(-1);
if(!myLeague) {
myLeague = await GVGLeagueModel.findLeagueByGuild(role.guildCode);
game-server/app/services/ladderService.ts
+2 -2
View File
@@ -3,7 +3,7 @@ import { ArtifactModel } from "../db/Artifact";
import { HeroType } from "../db/Hero";
import { LadderMatchModel, LadderMatchType, LadderUpdateInter } from "../db/LadderMatch";
import { LadderMatchRecModel, LadderMatchRecType } from "../db/LadderMatchRec";
import Role, { RoleType } from "../db/Role";
import { RoleModel, RoleType } from "../db/Role";
import { LadderDataReturn, LadderDefense, LadderOppDetailReturn, LadderOppPlayerHeroInfo, LadderOppPlayerInDB, LadderOppPlayerInfo, LadderOppPlayerReturn } from "../domain/battleField/ladder";
import { RoleAndGuildRankInfo, RoleRankInfo } from "../domain/rank";
import { gameData, getDicLadderMatchByMyRank, getLadderRankReward } from "../pubUtils/data";
@@ -56,7 +56,7 @@ function getSingleBuyCost(buyCnt: number) {
export async function getLadderData(roleId: string, needOppPlayer: boolean) {
let ladderData = await LadderMatchModel.findByRoleId(roleId);
if(!ladderData) {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
ladderData = await LadderMatchModel.createLadder({ serverId: role.serverId, roleId: role.roleId, role: role._id });
}
game-server/app/services/normalBattleService.ts
+5 -5
View File
@@ -1,6 +1,6 @@
import { HeroModel, HeroType } from '../db/Hero';
import Role, { RoleType, WarCount } from '../db/Role'
import Role, { RoleModel, RoleType, WarCount } from '../db/Role'
import { getLvByExp, getExpByLv, gameData, getDicApByLv } from '../pubUtils/data';
import { updateRoleOnlineInfo, updateUserInfo } from './redisService';
// import { switchOnFunc } from './funcSwitchService';
@@ -27,14 +27,14 @@ export async function roleLevelup(type: KING_EXP_RATIO_TYPE, roleId: string, kin
const sid = session.get('sid');
const ip = session.get('ip');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let { lv = 1, exp = 0 } = role;
let canGetExp = lv < gameData.maxPlayerLv.max; // 当主公超过最大级后，挑战结算不再获得经验值
let ratio = gameData.kingExpRaio.get(lv)?.get(type)||0;
let newExp = canGetExp ? exp + Math.floor(kingExp * ratio) : exp;
let newLv = getLvByExp(newExp);
role = await Role.levelup(roleId, newLv, newExp);
role = await RoleModel.levelup(roleId, newLv, newExp);
if (newLv > lv) { // 升级
// await switchOnFunc(roleId, FUNC_OPT_TYPE.LEVEL_UP, newLv, session);
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'lv', value: newLv }]);
@@ -211,7 +211,7 @@ export async function checkWarCountAndInc(warId: number, inc: number, role: Role
let dicWar = gameData.war.get(warId);
let max = dicWar.warType == WAR_TYPE.NORMAL? GK_MAIN.GK_MAIN_SWEEP_TIMES: GK_MAINELITE.GK_MAINELITE_SWEEP_TIMES;
if(needRefresh && shouldRefresh(refWarCount, new Date())) {
let role = await Role.updateRoleInfo(roleId, { refWarCount: new Date(), warCount: [] });
let role = await RoleModel.updateRoleInfo(roleId, { refWarCount: new Date(), warCount: [] });
warCount = role.warCount;
}
let curWarCount = warCount.find(cur => cur.warId == warId);
@@ -227,7 +227,7 @@ export async function checkWarCountAndInc(warId: number, inc: number, role: Role
} else {
warCount.push({ warId, count: inc });
}
await Role.updateRoleInfo(roleId, { warCount });
await RoleModel.updateRoleInfo(roleId, { warCount });
}
return resResult(STATUS.SUCCESS);
}
game-server/app/services/orderService.ts
+3 -3
View File
@@ -2,7 +2,7 @@ import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
import { ACTIVITY_TYPE, DEBUG_PRICE, MAIL_TYPE, ORDER_STATE, PAY_TYPE, PUSH_ROUTE, REFUND_PRICE_TO_GOLD, STATUS, TASK_TYPE, TA_EVENT, TA_USERSET_TYPE } from '../consts';
import { dicRMB } from '../pubUtils/dictionary/DicRMB';
import { makeYuanbaoShopReward } from './activity/yuanbaoService';
import Role from '../db/Role';
import { RoleModel } from '../db/Role';
import { checkMonthlyTicket, makeMonthlyTicketReward } from './activity/monthlyTicketService';
import { checkSignInCanBuy, makeSignInVIP } from './activity/signInService';
import { checkDailyRMBGifts, makeDailyRMBGiftsReward } from './activity/dailyRMBGiftsService';
@@ -127,7 +127,7 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
let payType = orderInfo.payType;//支付类型
let roleId = orderInfo.roleId;//角色
const roleInfo = await Role.increaseTotalPay(roleId, price);
const roleInfo = await RoleModel.increaseTotalPay(roleId, price);
let rewardResult: any = { code: 0, data: null };
@@ -423,7 +423,7 @@ export async function refundOrderFromRedisPub(message: string) {
let price = order.price;
let refundGold = price * REFUND_PRICE_TO_GOLD;
let role = await Role.incRoleInfo(order.roleId, { gold: -refundGold }, {});
let role = await RoleModel.incRoleInfo(order.roleId, { gold: -refundGold }, {});
let onlineUser = await getRoleOnlineInfo(order.roleId);
let sid = onlineUser.sid;
sendMessageToUserWithSuc(order.roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { gold: role.gold }, sid);
game-server/app/services/pay/37Pay.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { DEBUG_PRICE, SDK_37_CONST, STATUS } from "../../consts";
import Role from "../../db/Role";
import { RoleModel } from "../../db/Role";
import { UserModel } from "../../db/User";
import { LoginValidateData37 } from "../../domain/sdk";
import { DicRMB } from "../../pubUtils/dictionary/DicRMB";
@@ -18,7 +18,7 @@ import { gameData } from "../../pubUtils/data";
*
*/
export async function applyOrder37(localOrderID: string, roleId: string, productInfo: DicRMB) {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let user = await UserModel.findUserByUid(role.userInfo.uid);
if(!user || !user.channelInfo || !(<LoginValidateData37>user.channelInfo).uid)
return {
game-server/app/services/playerCeService.ts
+3 -3
View File
@@ -4,7 +4,7 @@
import { EPlace, HeroModel, HeroType, HeroUpdate } from '../db/Hero';
import Role, { RoleUpdate, RoleType } from '../db/Role';
import { RoleUpdate, RoleType, RoleModel } from '../db/Role';
import { Rank } from './rankService';
import { HERO_SYSTEM_TYPE, PUSH_ROUTE, REDIS_KEY } from '../consts';
import { saveLadderDefCe, saveLadderDefCeByData, updateRoleOnlineInfo, updateUserInfo } from './redisService';
@@ -466,7 +466,7 @@ export async function calculateCes(type: HERO_SYSTEM_TYPE, roleId: string, serve
}
roleCe = await RoleCeModel.updateRoleCe(roleId, roleCeUpdate);
let role = await Role.incRoleInfo(roleId, { ...roleIncUpdate, ce: roleInc }, { ...roleUpdate, topLineup, topLineupCe });
let role = await RoleModel.incRoleInfo(roleId, { ...roleIncUpdate, ce: roleInc }, { ...roleUpdate, topLineup, topLineupCe });
let guild = await GuildModel.updateCe(roleId, roleInc); // 公会更新战力
saveCeChangeLog(role, roleInc, role.ce, type, ceChangeTxt);
@@ -526,7 +526,7 @@ export async function getSumCe(roleId: string) {
let roleCe = await RoleCeModel.findByRoleId(roleId);
if(roleCe && roleCe.historyLineupCe) return roleCe.historyLineupCe;
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
return role.topLineupCe||0;
}
game-server/app/services/pushService.ts
+5 -5
View File
@@ -9,7 +9,7 @@ import { isSkipEncode, needPushMsg } from "../pubUtils/sdkUtil";
import { isDevelopEnv } from "./utilService";
import { gameData } from "../pubUtils/data";
import { pushMsg37 } from "./sdkService";
import Role, { RoleType } from "../db/Role";
import { RoleModel, RoleType } from "../db/Role";
import { nowSeconds } from "../pubUtils/timeUtil";
import { GVGLeagueModel } from "../db/GVGLeague";
import { resolve } from "bluebird";
@@ -333,7 +333,7 @@ async function getHasGuildPlayers() {
let uids: number[] = [], players: RoleType[] = [];
let createdAt: Date;
while(!createdAt || players.length > 0) {
players = await Role.findHasGuildPlayers(createdAt);
players = await RoleModel.findHasGuildPlayers(createdAt);
if(players.length == 0) break;
createdAt = players[players.length -1].createdAt;
players.forEach(player => {
@@ -351,7 +351,7 @@ async function getHasLeaguePlayers() {
let len = roleIds.length;
for(let i = 0; i < Math.ceil(len/1000); i++) {
let curRoleIds = roleIds.slice(i * 1000, i * 1000 + 1000);
let players = await Role.findByRoleIds(curRoleIds, 'userInfo.channelInfo isClosePush');
let players = await RoleModel.findByRoleIds(curRoleIds, 'userInfo.channelInfo isClosePush');
players.forEach(player => {
if(player.userInfo && player.userInfo.channelInfo && player.quitTime != player.loginTime && !player.isClosePush) uids.push(player.userInfo.channelInfo.uid);
});
@@ -364,7 +364,7 @@ async function getAfkPlayers() {
let uids: number[] = [], players: RoleType[] = [];
let createdAt: Date;
while(!createdAt || players.length > 0) {
players = await Role.findAfkPlayers(createdAt);
players = await RoleModel.findAfkPlayers(createdAt);
if(players.length == 0) break;
createdAt = players[players.length -1].createdAt;
players.forEach(player => {
@@ -379,7 +379,7 @@ async function getActivePlayers() {
let uids: number[] = [], players: RoleType[] = [];
let createdAt: Date;
while(!createdAt || players.length > 0) {
players = await Role.findActivePlayers(createdAt);
players = await RoleModel.findActivePlayers(createdAt);
if(players.length == 0) break;
createdAt = players[players.length -1].createdAt;
players.forEach(player => {
game-server/app/services/rankService.ts
+21 -21
View File
@@ -1,7 +1,7 @@
import { KeyName, KeyNameParam, RankParam, GuildRankParam, RoleRankInfo, LineupParam, myIdInter, GeneralRankParam, ValueConfig, GuildRankInfo, RoleAndGuildRankInfo, LeagueRankParam, LeagueRankInfo } from "../domain/rank";
import { getInfoKeyByRedisKey, ROLE_SELECT, GUILD_SELECT, REDIS_KEY, HERO_SELECT, COMPOSE_FIELD_TYPE, KEY_TO_COMPOSE_FIELD, getRedisKeyByRankType, COUNTER, RANK_TYPE, PUSH_ROUTE } from "../consts";
import { redisClient, delKeys, saveLadderDefCeByData } from "./redisService";
import Role, { RoleType } from "../db/Role";
import { RoleType, RoleModel } from "../db/Role";
import { GuildType, GuildModel } from "../db/Guild";
import { HeroModel, HeroType, HeroUpdate } from "../db/Hero";
import { PvpDefenseModel } from "../db/PvpDefense";
@@ -285,7 +285,7 @@ export class Rank {
if (infoKey == REDIS_KEY.USER_INFO) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let param = new RankParam(role);
@@ -306,7 +306,7 @@ export class Rank {
await this.setUserInfo(infoKey, { leagueCode }, param);
} else if (infoKey == REDIS_KEY.TOP_LINEUP_INFO) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let { topLineup = [] } = role;
@@ -333,7 +333,7 @@ export class Rank {
}
} else if (infoKey == REDIS_KEY.DUNGEON_LINEUP) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let { dungeonWarId, dungeonHeroes } = role;
@@ -353,7 +353,7 @@ export class Rank {
}
} else if (infoKey == REDIS_KEY.SHOW_LINEUP) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let { showLineup, topLineup = [] } = role;
@@ -491,7 +491,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(this.infoKey, roleId);
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
}
param = new RoleRankInfo(role);
param.setInfo(0, { roleId }, score, time);
@@ -594,7 +594,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(this.infoKey, roleId);
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
}
param = new RoleRankInfo(role);
param.setInfo(0, { roleId, hid }, score, time);
@@ -622,7 +622,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(extraKey, this.composeFields(extraKey, myId));
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
}
let { topLineup } = role;
@@ -672,7 +672,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(extraKey, this.composeFields(extraKey, myId));
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
}
let { dungeonWarId, dungeonHeroes } = role;
let cur = dungeonHeroes.find(cur => cur.battleId == dungeonWarId);
@@ -698,7 +698,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(extraKey, this.composeFields(extraKey, myId));
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
}
let { showLineup, topLineup = [] } = role;
@@ -1063,7 +1063,7 @@ async function setRankFirst(rankFirstRec: RankFirstType) {
export async function setRankRedisFromDb(type: string, args?: { serverId?: number, groupId?: number }) {
if (type == REDIS_KEY.TOWER_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('tower', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('tower', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1112,7 +1112,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.TOP_LINEUP_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('topLineup', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('topLineup', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1129,7 +1129,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
// }
} else if (type == REDIS_KEY.HERO_NUM_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('heroNum', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('heroNum', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1137,7 +1137,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.USER_LV) {
let serverId = args.serverId;
let ranks = await Role.getRank('lv', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('lv', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1145,7 +1145,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.SUM_CE_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('ce', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('ce', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1153,7 +1153,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.DUNGEON_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('dungeon', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('dungeon', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1161,7 +1161,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.MAIN_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('main', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('main', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1169,7 +1169,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.MAIN_ELITE_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('mainElite', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('mainElite', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1213,7 +1213,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
} else if (type == REDIS_KEY.GVG_VESTIGE_MEMBER_ALL) {
let ranks = await GVGVestigeSumRankModel.findRankByGroupId();
for(let { _id: groupKey, arr, roleIds } of ranks) {
let roles = await Role.findByRoleIds(roleIds, ROLE_SELECT.RANK);
let roles = await RoleModel.findByRoleIds(roleIds, ROLE_SELECT.RANK);
let r = new Rank(type, { groupKey, day: getDayKeyInfo() });
r.setIsInit(true);
for(let { roleId, score, updatedAt } of arr) {
@@ -1240,7 +1240,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
let ranks = await ActivityMiniGameModel.findRank();
for(let { _id: { activityId, roundIndex }, roleIds, arr } of ranks) {
let r = new Rank(type, { activityId, roundIndex });
let roles = await Role.findByRoleIds(roleIds, ROLE_SELECT.RANK);
let roles = await RoleModel.findByRoleIds(roleIds, ROLE_SELECT.RANK);
for(let { roleId, score, updatedAt } of arr) {
let role = roles.find(cur => cur.roleId == roleId);
if(role) await r.setRankWithRoleInfo(roleId, score, updatedAt.getTime(), role, false);
@@ -1322,7 +1322,7 @@ export async function getRankInHandler(redisKey: REDIS_KEY, type: RANK_TYPE, key
let { ranks, myRank } = await r.getRankListWithMyRank({ roleId, guildCode }, type != RANK_TYPE.LADDER);
if (!myRank) {
let role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if (type == RANK_TYPE.TOP_LINTUP) {
myRank = await r.generMyRankWithRole(roleId, role.topLineupCe, 0, role);
} else if (type == RANK_TYPE.TOP_HERO) {
game-server/app/services/redisService.ts
+2 -2
View File
@@ -12,7 +12,7 @@ import { getRandSingleEelm, parseNumberList } from '../pubUtils/util';
import { ActivityModel } from '../db/Activity';
import { TimeLimitRankData } from '../domain/activityField/timeLimitRankField';
import { ActivityTimeLimitRankModel } from '../db/ActivityTimeLimitRank';
import Role, { RoleType } from '../db/Role';
import { RoleModel, RoleType } from '../db/Role';
import { GuildType } from '../db/Guild';
import { ActivityGroupModel } from '../db/ActivityGroup';
import { LadderMatchModel, LadderMatchType } from '../db/LadderMatch';
@@ -433,7 +433,7 @@ export async function getRoleCreateTime(roleId: string, role?: RoleType) {
if(onlineInfo.isOnline) {
return onlineInfo.createtime;
} else {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
return role?.createTime||0;
}
}
game-server/app/services/role/checkMaterial.ts
+3 -3
View File
@@ -1,5 +1,5 @@
import { CURRENCY_TYPE, HANDLE_REWARD_TYPE, CURRENCY_BY_TYPE } from '../../consts';
import Role, { RoleType } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { ItemModel, ItemType } from '../../db/Item';
import { ItemInter, RewardInter, } from '../../pubUtils/interface';
import { gameData } from '../../pubUtils/data';
@@ -120,7 +120,7 @@ export class CheckMeterial {
private async decreaseGold(gold: { count: number }[]) {
if(!this.itemsIndb.has(this.goldId)) {
let role = await Role.findByRoleId(this.roleId, 'gold coin');
let role = await RoleModel.findByRoleId(this.roleId, 'gold coin');
this.itemsIndb.set(this.goldId, role.gold);
this.itemsIndb.set(this.coinId, role.coin);
}
@@ -138,7 +138,7 @@ export class CheckMeterial {
private async decreaseCoin(coin: number[]) {
if(!this.itemsIndb.has(this.coinId)) {
let role = await Role.findByRoleId(this.roleId, 'gold coin');
let role = await RoleModel.findByRoleId(this.roleId, 'gold coin');
this.itemsIndb.set(this.goldId, role.gold);
this.itemsIndb.set(this.coinId, role.coin);
}
game-server/app/services/role/rewardService.ts
+9 -9
View File
@@ -1,6 +1,6 @@
import { ITID, CONSUME_TYPE, ITEM_TABLE, CURRENCY_TYPE, MAIL_TYPE, HANDLE_REWARD_TYPE, HERO_SYSTEM_TYPE, CURRENCY_BY_TYPE, ITEM_CHANGE_REASON, TA_USERSET_TYPE, TA_EVENT, POP_UP_SHOP_CONDITION_TYPE, ROLE_SELECT, FIGURE_UNLOCK_CONDITION, PUSH_ROUTE, ACTIVITY_TYPE } from '../../consts';
import { getDecimalCnt, getRandEelm, getRandEelmWithWeight, getRandValueByMinMax, } from '../../pubUtils/util';
import Role, { RoleType } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { setAp } from '../actionPointService';
import { ItemModel, } from '../../db/Item';
import { ItemInter, } from '../../pubUtils/interface';
@@ -38,7 +38,7 @@ export async function handleCost(roleId: string, sid: string, goods: Array<ItemI
let resArtifacts: ArtifactModelType[] = [];
// 检查货币是否充足
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if (gold.length > 0 || coin.length > 0) {
let { gold: originGold, coin: originCoin } = role;
for(let {count} of gold) { originGold -= count };
@@ -127,7 +127,7 @@ export async function handleCost(roleId: string, sid: string, goods: Array<ItemI
if (gold.length > 0 || coin.length > 0) {
let costGold = gold.reduce((pre, cur) => pre + cur.count, 0);
let costCoin = coin.reduce((pre, cur) => pre + cur, 0);
role = await Role.decreaseGoldAndCoin(roleId, gold, costCoin);
role = await RoleModel.decreaseGoldAndCoin(roleId, gold, costCoin);
sendMessageToUserWithSuc(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { gold: role.gold, coin: role.coin, totalCost: role.totalCost }, sid);
if(costGold > 0) {
@@ -150,7 +150,7 @@ export async function addItems(roleId: string, roleName: string, sid: string, go
goods = filterGoods(goods, obj => obj.id, roleId, reason);
let { items, jewels, gold, coin, ap, skins, figures, artifacts, activityItems } = sortItems(goods, HANDLE_REWARD_TYPE.RECEIVE);
let showItems: { id: number, seqId?: number|string, count: number, isBag?: boolean, expireTime?: number }[] = [];
let role = await Role.findByRoleId(roleId, '-warCount -topLineup');
let role = await RoleModel.findByRoleId(roleId, '-warCount -topLineup');
// 1. 装备处理
if(jewels.length > 0) {
let { jewelCount = 0 } = role;
@@ -202,7 +202,7 @@ export async function addItems(roleId: string, roleName: string, sid: string, go
await setAp(role.serverId, roleId, null, role.lv, ap, sid, reason);
let incCoin = coin.reduce((pre, cur) => pre + cur, 0);
let incGold = gold.reduce((pre, cur) => pre + cur.count, 0);
role = await Role.increaseGoldAndCoin(roleId, gold, incCoin);
role = await RoleModel.increaseGoldAndCoin(roleId, gold, incCoin);
sendMessageToUserWithSuc(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { gold: role.gold, coin: role.coin }, sid);
if(gold.length > 0) {
@@ -368,10 +368,10 @@ export async function checkHeroEquips(roleId: string, quality: number) {
*/
export async function unlockFigure(sid: string, roleId: string, conditions: { type: number, paramHid?: number, paramFavourLv?: number, paramSkinId?: number, paramWinStreakNum?: number }[], role?: RoleType) {
if (!role || !role.heads || !role.frames) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
}
let { figureInfo, heads, frames, spines } = unlockFigureWithoutSave(conditions, role);
role = await Role.updateRoleInfo(roleId, { heads, frames, spines });
role = await RoleModel.updateRoleInfo(roleId, { heads, frames, spines });
if (!!figureInfo && (figureInfo.heads.length > 0 || figureInfo.frames.length > 0 || figureInfo.spines.length > 0)) {
sendMessageToUserWithSuc(roleId, PUSH_ROUTE.HEAD_CHANGE, { ...figureInfo }, sid);
}
@@ -686,7 +686,7 @@ export function checkVoucherId(id: number) {
// 直接获得形象/相框
export async function addFigure(roleId: string, ids: number[], reason: number) {
let role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
if (!role) return false;
let { heads, frames, spines } = role;
@@ -712,7 +712,7 @@ export async function addFigure(roleId: string, ids: number[], reason: number) {
}
}
role = await Role.updateRoleInfo(roleId, { heads, frames, spines });
role = await RoleModel.updateRoleInfo(roleId, { heads, frames, spines });
return figureInfo;
}
game-server/app/services/roleService.ts
+4 -4
View File
@@ -2,7 +2,7 @@ import { Channel, pinus } from 'pinus';
import { getRandValueByMinMax, getRandEelm, decodeIdCntArrayStr, compareVersion } from '../pubUtils/util';
import { DEFAULT_HEROES, LINEUP_NUM, ROLE_SELECT, TALENT_RELATION_TYPE, TERAPH_RANDOM, SYSTEM_OPEN_ID, GuideUnloadNum, CHECK_HERO_CONSUME, ABI_STAGE } from "../consts";
import { DicTeraph } from '../pubUtils/dictionary/DicTeraph';
import Role, { Teraph, RoleType, RoleUpdate } from '../db/Role';
import { Teraph, RoleModel, RoleType, RoleUpdate } from '../db/Role';
import { SCHOOL } from '../pubUtils/dicParam';
import { gameData, getHeroInitTalent, getHeroStarByQuality } from '../pubUtils/data';
import { SchoolModel } from '../db/School';
@@ -73,13 +73,13 @@ export async function getTeraphStrengthenResult(role: RoleType, count: number, d
export async function getSimpleRoleInfo(roleId: string) {
if (!roleId) return null;
let role = await Role.findByRoleId(roleId, ROLE_SELECT.SHOW_SIMPLE, true);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.SHOW_SIMPLE, true);
return pick(role, ['roleId', 'roleName', 'head', 'frame', 'spine', 'lv', 'title', 'job', 'quitTime', 'loginTime', 'vLv', 'guildName', 'serverId', 'userInfo']);
}
export async function getSimpleRoleInfos(roleIds: string[]) {
if (!roleIds || !roleIds.length) return null;
let roles = await Role.findByRoleIds(roleIds, ROLE_SELECT.SHOW_SIMPLE, true);
let roles = await RoleModel.findByRoleIds(roleIds, ROLE_SELECT.SHOW_SIMPLE, true);
return roles.map(role => pick(role, ['roleId', 'roleName', 'head', 'frame', 'spine', 'lv', 'title', 'job', 'quitTime', 'loginTime', 'vLv', 'guildName', 'serverId', 'userInfo']));
}
@@ -310,7 +310,7 @@ export async function getIpLocation(ip: string) {
export async function checkIsNewUser(version: string, minVersion: string, uid: number, latestServerUniqId: number) {
let versionFlag = compareVersion(version||'0.0.0.0', minVersion||'0.0.0.1');
if(versionFlag >= 0) {
let hasRole = await Role.checkHasRole(uid, latestServerUniqId);
let hasRole = await RoleModel.checkHasRole(uid, latestServerUniqId);
return !hasRole
} else {
return true;
game-server/app/services/sdkService.ts
+10 -10
View File
@@ -1,6 +1,6 @@
/********** 37sdk **********/
import Role, { RoleType } from "../db/Role";
import { RoleModel, RoleType } from "../db/Role";
import { Chat37Params, CheckGuild37Params, CheckName37Params, GetWordParam, PostGuild37Params, PostName37Params, PushMsg37Param } from "../domain/sdk";
import { sendMailByContent, sendMailToGuildByContent } from './mailService';
import { NAMEPLATE } from '../pubUtils/dicParam';
@@ -29,11 +29,11 @@ import { GiftCodeDetailModel } from "../db/GiftCodeDetail";
export async function checkPrivateChat(roleId: string, targetRoleId: string, message: string) {
let body = new Chat37Params(message, getSdkChannelId('private'));
let myRole = await Role.findByRoleId(roleId);
let myRole = await RoleModel.findByRoleId(roleId);
let myUser = await UserModel.findUserByUid(myRole.userInfo.uid);
if(myUser.channelInfo) {
body.setByMyRole(myRole, myUser);
let targetRole = await Role.findByRoleId(targetRoleId);
let targetRole = await RoleModel.findByRoleId(targetRoleId);
let targetUser = await UserModel.findUserByUid(targetRole.userInfo.uid);
body.setByTargetRole(targetRole, targetUser);
return await request37CheckChat(SDK_37_ADDR.CHECK_CHAT, body, SDK_37_CONST.CHAT_KEY);
@@ -43,7 +43,7 @@ export async function checkPrivateChat(roleId: string, targetRoleId: string, mes
export async function checkGuildChat(roleId: string, guildCode: string, message: string) {
let body = new Chat37Params(message, getSdkChannelId(CHANNEL_PREFIX.GUILD));
let myRole = await Role.findByRoleId(roleId);
let myRole = await RoleModel.findByRoleId(roleId);
let myUser = await UserModel.findUserByUid(myRole.userInfo.uid);
if(myUser.channelInfo) {
body.setByMyRole(myRole, myUser);
@@ -55,7 +55,7 @@ export async function checkGuildChat(roleId: string, guildCode: string, message:
export async function checkOtherChat(roleId: string, channelPrefix: string, message: string) {
let body = new Chat37Params(message, getSdkChannelId(channelPrefix));
let myRole = await Role.findByRoleId(roleId);
let myRole = await RoleModel.findByRoleId(roleId);
let myUser = await UserModel.findUserByUid(myRole.userInfo.uid);
if(!!myUser.channelInfo) {
body.setByMyRole(myRole, myUser);
@@ -66,7 +66,7 @@ export async function checkOtherChat(roleId: string, channelPrefix: string, mess
export async function checkRoleName(roleId: string, roleName: string, myRole?: RoleType) {
if(!myRole) {
myRole = await Role.findByRoleId(roleId);
myRole = await RoleModel.findByRoleId(roleId);
}
let myUser = await UserModel.findUserByUid(myRole.userInfo.uid);
if(!!myUser.channelInfo) {
@@ -111,13 +111,13 @@ export async function checkGuildName(guildCode: string, serverId: number, name:
// 根据37sdk处理违规玩家名
export async function treatRoleName(roleId: string, isDebug?: boolean) {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if((role && role.sdkMark) || isDebug) { // 有设置标记的情况下
let newName = "默认玩家名";
// 新名字上传
await checkRoleName(roleId, newName, role);
// 改名字
await Role.updateRoleInfo(roleId, { roleName: newName, sdkMark: false });
await RoleModel.updateRoleInfo(roleId, { roleName: newName, sdkMark: false });
// 通知处理
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'roleName', value: newName }]); // redis缓存
if(role.isGuildLeader) {
@@ -157,7 +157,7 @@ export async function treatGuildName(content: string) {
for(let roleId of guild.members) {
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'guildName', value: newName }]);
}
await Role.updateGuildName(params.code, newName);
await RoleModel.updateGuildName(params.code, newName);
} else if (params.type == 2) { // 公会公告
await checkGuildName(params.code, params.serverId, undefined, ' ');
@@ -249,7 +249,7 @@ export function reportTAUserSet(type: TA_USERSET_TYPE, roleId: string, propertie
export async function reportCreateRoleEventToTa(role: RoleType, ip: string) {
if(role.shushuMark) {
reportTAEvent(role.roleId, TA_EVENT.CREATE_ROLE, null, ip, role.shushuMark);
await Role.updateRoleInfo(role.roleId, { shushuMark: '' });
await RoleModel.updateRoleInfo(role.roleId, { shushuMark: '' });
}
}
game-server/app/services/shopService.ts
+4 -4
View File
@@ -7,7 +7,7 @@ import { getRoleCreateTime, getServerCreateTime } from "./redisService";
import { decodeArrayListStr } from "../pubUtils/util";
import { UserShopTypeModel, UserShopTypeType } from "../db/UserShopType";
import { GuildModel } from "../db/Guild";
import Role from "../db/Role";
import { RoleModel } from "../db/Role";
import { DicShop } from "../pubUtils/dictionary/DicShop";
import { BackendSession, pinus } from "pinus";
import { ActivityModelType } from "../db/Activity";
@@ -132,7 +132,7 @@ export async function checkShopInPurchase(session: BackendSession, activityId: n
export async function checkShopCanBuyInOrder(roleId: string, serverId: number, activity: ActivityModelType, productID: string) {
let seasonNum = pinus.app.get('pvpSeasonNum');
let role = await Role.findByRoleId(roleId, 'guildCode createTime vipStartTime');
let role = await RoleModel.findByRoleId(roleId, 'guildCode createTime vipStartTime');
let { createTime, guildCode, vipStartTime } = role;
let serverTime = await getServerCreateTime(serverId);
let shopData = new ShopData(activity, createTime, serverTime);
@@ -157,7 +157,7 @@ export async function checkShopItemCanBuy(activityId: number, shopItemId: number
if(!myGuild || myGuild.lv < dicShopItem.guildLvLimit) return STATUS.GUILD_LV_LIMIT;
}
if(dicShopItem.lvLimit) {
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
if(role.lv < dicShopItem.lvLimit) {
return STATUS.LV_LIMIT;
}
@@ -203,7 +203,7 @@ export async function checkShopItemCanBuy(activityId: number, shopItemId: number
if (activityData.type !== ACTIVITY_TYPE.SHOP) {
return STATUS.ACTIVITY_TYPE_ERROR;
}
let role = await Role.findByRoleId(roleId, 'guildCode createTime vipStartTime');
let role = await RoleModel.findByRoleId(roleId, 'guildCode createTime vipStartTime');
let { createTime, guildCode, vipStartTime } = role;
let serverTime = await getServerCreateTime(serverId);
let shopData = new ShopData(activityData, createTime, serverTime);
game-server/app/services/task/taskObj.ts
+2 -2
View File
@@ -7,7 +7,7 @@ import { ActivityGrowthFundModel } from "../../db/ActivityGrowthFund";
import { ActivityRefreshTaskModel } from "../../db/ActivityRefreshTask";
import { ActivityThirtyDaysModel } from "../../db/ActivityThirtyDays";
import { ActivityTreasureHuntTaskModel } from "../../db/ActivityTreasureHuntTask";
import Role, { RoleType } from "../../db/Role";
import { RoleModel, RoleType } from "../../db/Role";
import { UserTaskRecModel } from "../../db/UserTaskRec";
import { GrowthFundData } from "../../domain/activityField/growthFundField";
import { RefreshTaskData } from "../../domain/activityField/refreshTaskField";
@@ -84,7 +84,7 @@ export class CheckTask {
}
}
if(!this.roleCreateTime) {
let role = await Role.findByRoleId(this.roleId);
let role = await RoleModel.findByRoleId(this.roleId);
this.role = role;
this.roleCreateTime = role.createTime;
}
game-server/app/services/task/taskService.ts
+3 -3
View File
@@ -1,4 +1,4 @@
import Role, { RoleType } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { pinus, FrontendOrBackendSession } from 'pinus';
import { resResult, shouldRefresh } from '../../pubUtils/util';
import { STATUS, TASK_TYPE, TASK_FUN_TYPE, SHOP_REFRESH_TYPE, WAR_TYPE, PUSH_ROUTE, POP_UP_SHOP_CONDITION_TYPE } from '../../consts';
@@ -195,7 +195,7 @@ export async function checkTaskInComBattleStart(roleStatus: RoleStatus[], capId:
console.log('********', JSON.stringify(roleStatus), capId, blueprtId)
for (let { roleId, isRobot } of roleStatus) {
if (!isRobot) {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let task = new CheckTask(role.serverId, roleId);
task.setRole(role);
if (roleId == capId && roleStatus.length > 1) { // 招募队友
@@ -213,7 +213,7 @@ export async function checkTaskInComBattleStart(roleStatus: RoleStatus[], capId:
export async function checkTaskInComBattleEnd(roleStatus: RoleStatus[], capId: string) {
for (let { roleId, isRobot } of roleStatus) {
if (!isRobot) {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let task = new CheckTask(role.serverId, roleId);
task.setRole(role);
if (roleId == capId && roleStatus.length > 1) { // 招募队友