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/servers/activity/handler/dailyCoinHandler.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { ActivityDailyCoinModel } from '../../../db/ActivityDailyCoin';
import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { ItemInter } from '../../../pubUtils/interface';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import moment = require('moment');
@@ -63,7 +63,7 @@ export class DailyCoinHandler {
}
let allConsume: Array<ItemInter> = []
let allReward: Array<RewardParam> = [];
let role = await Role.findByRoleId(roleId)
let role = await RoleModel.findByRoleId(roleId)
let rateArray = [];//暴击记录
for (let i = 1; i <= count; i++) {
let index = curIndex + i;
game-server/app/servers/activity/handler/firstGiftHandler.ts
+2 -2
View File
@@ -2,7 +2,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { FIRST_GIFT_STATE, ITEM_CHANGE_REASON, STATUS } from '../../../consts';
import { getPlayerFirstGiftData, getPlayerFirstGiftDataShow } from '../../../services/activity/firstGiftService';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
import { ActivityFirstGiftModel } from '../../../db/ActivityFirstGift';
import { RewardParam } from '../../../domain/activityField/rewardField';
@@ -35,7 +35,7 @@ export class FirstGiftHandler {
return resResult(STATUS.ACTIVITY_MISSING);
}
let { totalPay } = await Role.findByRoleId(roleId);
let { totalPay } = await RoleModel.findByRoleId(roleId);
if (totalPay > 0) {//奖励开启
}
game-server/app/servers/activity/handler/gachaHandler.ts
+2 -2
View File
@@ -4,7 +4,7 @@ import { STATUS, GACHA_TYPE, HERO_QUALITY_TYPE, TASK_TYPE, ITEM_CHANGE_REASON, }
import { gameData } from "../../../pubUtils/data";
import { UserGachaModel } from "../../../db/UserGacha";
import { refreshGacha, getGachaList, getVisitedHeroList, GachaPull, GachaResults, getDicGachaByGachaCnt, getNormalGachaId, getDicGachas } from "../../../services/activity/gachaService";
import Role from "../../../db/Role";
import { RoleModel } from "../../../db/Role";
import { HeroModel } from "../../../db/Hero";
import { handleCost, addItems } from "../../../services/role/rewardService";
import { getZeroPointD, getTimeFun } from "../../../pubUtils/timeUtil";
@@ -38,7 +38,7 @@ export class GachaHandler {
async getGachaList(msg: {}, session: BackendSession) {
const { } = msg;
const roleId: string = session.get('roleId');
let role = await Role.findByRoleId(roleId, 'gachaHasGuide');
let role = await RoleModel.findByRoleId(roleId, 'gachaHasGuide');
const list = await getGachaList(roleId);
return resResult(STATUS.SUCCESS, { hasInit: !!role.gachaHasGuide, list });
game-server/app/servers/activity/handler/limitPackageHandler.ts
+3 -3
View File
@@ -5,7 +5,7 @@ import { newPlayerLimitPackageActivity, getPlayerLimitPackageData } from '../../
import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
import { ActivityShopModel } from '../../../db/ActivityShop';
import moment = require('moment');
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { handleCost } from '../../../services/role/rewardService';
export default function (app: Application) {
@@ -31,7 +31,7 @@ export class LimitPackageHandler {
const serverId = session.get('serverId');
let { createTime } = await Role.findByRoleId(roleId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let createDate = moment(createTime * 1000).toDate();
let endTime = moment(createDate).startOf('d').add(7, 'd').add(5, 'h').toDate();
if (new Date() > endTime) {
@@ -91,7 +91,7 @@ export class LimitPackageHandler {
switch (playerData.type) {
case ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE:
{
let { createTime } = await Role.findByRoleId(roleId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let createDate = moment(createTime * 1000).toDate();
let endTime = moment(createDate).startOf('d').add(7, 'd').toDate();
if (new Date() > endTime) {
game-server/app/servers/activity/handler/signInHandler.ts
+2 -2
View File
@@ -6,7 +6,7 @@ import { handleCost } from '../../../services/role/rewardService';
import { SignInItem } from '../../../domain/activityField/signInField';
import { ActivitySignInModel } from '../../../db/ActivitySignIn';
import moment = require('moment');
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
@@ -75,7 +75,7 @@ export class SignInHandler {
let roundIndex = playerData.roundIndex;
//高级签到开启条件
let { lv } = await Role.findByRoleId(roleId);
let { lv } = await RoleModel.findByRoleId(roleId);
if (playerData.type == ACTIVITY_TYPE.SIGN_IN_VIP) {
if (!canBuyVip(lv))
return resResult(STATUS.ACTIVITY_SIGNIN_VIP_CONDITION);
game-server/app/servers/battle/handler/dailyBattleHandler.ts
+3 -3
View File
@@ -2,7 +2,7 @@ import { Application, BackendSession } from 'pinus';
import { DailyRecordModel } from '../../../db/DailyRecord';
import { STATUS } from '../../../consts/statusCode';
import { resResult } from '../../../pubUtils/util';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { getDailyNum, getDailyBattleList, getDailyBuyCountCost } from '../../../services/dailyBattleService';
import { getGoldObject, handleCost } from '../../../services/role/rewardService';
import { gameData } from '../../../pubUtils/data';
@@ -20,7 +20,7 @@ export class DailyBattleHandler {
async getData(msg: { }, session: BackendSession) {
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let result = await getDailyBattleList(role);
return resResult(STATUS.SUCCESS, { list: result });
@@ -46,7 +46,7 @@ export class DailyBattleHandler {
let num = buyCount + i;
buyCost += getDailyBuyCountCost(num);
}
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if(buyCost > role.gold) {
return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
}
game-server/app/servers/battle/handler/dungeonBattleHandler.ts
+6 -6
View File
@@ -1,7 +1,7 @@
import { Application, BackendSession } from 'pinus';
import { STATUS } from '../../../consts/statusCode';
import { resResult, shouldRefresh } from '../../../pubUtils/util';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { getGoldObject, handleCost } from '../../../services/role/rewardService';
import { getDungeonData, getDungeonBuyCountCost } from '../../../services/dungeonService';
import * as dicParam from '../../../pubUtils/dicParam';
@@ -21,7 +21,7 @@ export class DungeonBattleHandler {
// 获取关卡列表
async getData(msg: { }, session: BackendSession) {
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let res = await getDungeonData(role);
return resResult(STATUS.SUCCESS, res);
}
@@ -32,7 +32,7 @@ export class DungeonBattleHandler {
const roleId = session.get('roleId');
const sid = session.get('sid');
let { dungeonCnt = 0, dungeonBuyCnt = 0, dungeonRefTime } = await Role.findByRoleId(roleId);
let { dungeonCnt = 0, dungeonBuyCnt = 0, dungeonRefTime } = await RoleModel.findByRoleId(roleId);
let curTime = new Date();
let needRefresh = shouldRefresh(dungeonRefTime, curTime);
if(needRefresh) {
@@ -47,12 +47,12 @@ export class DungeonBattleHandler {
for(let i = 1; i <= count; i++) {
buyCost += getDungeonBuyCountCost(dungeonBuyCnt + i);
}
let {gold} = await Role.findByRoleId(roleId);
let {gold} = await RoleModel.findByRoleId(roleId);
if(buyCost > gold) {
return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
}
await handleCost(roleId, sid, [getGoldObject(buyCost)], ITEM_CHANGE_REASON.DUNGEON_BATTLE_BUY_CNT);
await Role.buyCnt(roleId, needRefresh, count, curTime);
await RoleModel.buyCnt(roleId, needRefresh, count, curTime);
let nextCostGold = getDungeonBuyCountCost(dungeonBuyCnt + count + 1);
let freeCount = getVipDungeonCnt(session.get('vipStartTime'));
@@ -81,7 +81,7 @@ export class DungeonBattleHandler {
return resResult(STATUS.TOKEN_ERR);
}
let roleId = session.get('roleId');
await Role.updateRoleInfo(roleId, { dungeonRefTime: new Date(Date.now() - 86400000) });
await RoleModel.updateRoleInfo(roleId, { dungeonRefTime: new Date(Date.now() - 86400000) });
return resResult(STATUS.SUCCESS);
}
}
game-server/app/servers/battle/handler/eventBattleHandler.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import { Application, BackendSession, HandlerService, } from 'pinus';
import { EventRecordModel } from '../../../db/EventRecord';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_ANSWER_STATUS, TASK_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, EVENT_TYPE, EVENT_QUIZ_NUM } from '../../../consts';
import { checkEventStatus, getEventSuccessStatus, getEvent, checkQuiz, startEvent, refreshEvent, getEventTime, randomPosition, randomQuestion } from '../../../services/eventSercive';
import { addItems } from '../../../services/role/rewardService';
@@ -115,7 +115,7 @@ export class EventBattleHandler {
let reward = isSuccess ? dicEvent.winReward : dicEvent.loseReward;
let goods = await addItems(roleId, roleName, sid, reward, ITEM_CHANGE_REASON.EVENT_REWARD);
if (eventStatus == EVENT_STATUS.STARTING) { // 如果是第一次开启的挑战，保存成开启状态
await Role.setEventStatus(roleId, EVENT_STATUS.OPEN);
await RoleModel.setEventStatus(roleId, EVENT_STATUS.OPEN);
// 第一场时间挑战完，开始正常刷新事件，所以刷新时间也重置起来
session.set('eventStatus', EVENT_STATUS.OPEN);
session.push('eventStatus', () => { });
game-server/app/servers/battle/handler/expeditionBattleHandler.ts
+12 -12
View File
@@ -3,7 +3,7 @@ import { BattleRecordModel } from '../../../db/BattleRecord';
import { ExpeditionRecordModel } from '../../../db/ExpeditionRecord';
import { ExpeditionWarRecordModel } from '../../../db/ExpeditionWarRecord';
import { ExpeditionPointModel } from '../../../db/ExpeditionPoint';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { genCode, getWarTypeName } from '../../../pubUtils/util';
import { getPointRewardStatus, getResetRemainCnt, findOrCreateEnemies, getExpeditionStatus } from '../../../services/expeditionService';
import { DEBUG_MAGIC_WORD, EXPEDITION_WAR_RECORD_STATUS, ITEM_CHANGE_REASON, KING_EXP_RATIO_TYPE, TASK_TYPE, TA_EVENT } from '../../../consts';
@@ -68,7 +68,7 @@ export class ExpeditionBattleHandler {
roleId, roleName, heroes: [], myCe
});
await findOrCreateEnemies(roleId, myCe, expeditionCode, 1, EXPEDITION_WAR_RECORD_STATUS.WAITING);
await Role.increaseExpeditionResetCnt(roleId, needRefresh, curTime);
await RoleModel.increaseExpeditionResetCnt(roleId, needRefresh, curTime);
let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCode(expeditionCode);
let curLv = 0;
if (expeditionWarRecord.length > 0) {
@@ -134,7 +134,7 @@ export class ExpeditionBattleHandler {
return resResult(STATUS.BATTLE_MISS_INFO);
}
let role = await Role.findByRoleId(roleId, 'lv warStar');
let role = await RoleModel.findByRoleId(roleId, 'lv warStar');
let apJson = await getAp(roleId, ip, role.lv);
let { ap } = apJson;
if (ap < warInfo.cost) {
@@ -199,7 +199,7 @@ export class ExpeditionBattleHandler {
let dicWar = gameData.war.get(battleId);
if(!dicWar) return resResult(STATUS.DIC_DATA_NOT_FOUND);
// 前置关卡是否挑战过
let role = await Role.findByRoleId(roleId, 'warStar topLineupCe vipStartTime')
let role = await RoleModel.findByRoleId(roleId, 'warStar topLineupCe vipStartTime')
let { warStar, topLineupCe, vipStartTime } = role;
let previousGk = dicWar.previousGk;
if (previousGk) {
@@ -225,7 +225,7 @@ export class ExpeditionBattleHandler {
// 更新敌人剩余状态及战斗状态
expeditionWarRecord = await ExpeditionWarRecordModel.updateEnemiesStatus(expeditionCode, expeditionId, EXPEDITION_WAR_RECORD_STATUS.SUCCESS, []);
// 更新点数
role = await Role.increaseExpeditionPoint(roleId, dicParam.EXPEDITION_CONST.EXPEDITION_CONST_POINTS);
role = await RoleModel.increaseExpeditionPoint(roleId, dicParam.EXPEDITION_CONST.EXPEDITION_CONST_POINTS);
// 关卡奖励
let warReward = new WarReward(roleId, roleName, sid, battleId, true);
@@ -234,7 +234,7 @@ export class ExpeditionBattleHandler {
let curWarStar = warStar.find(cur => cur.id == battleId);
let { newWarStars, newStar } = calculateWarStar(warStar, battleId, []);
if (!curWarStar || newStar > curWarStar.star) {
role = await Role.updateRoleInfo(roleId, { warStar: newWarStars });
role = await RoleModel.updateRoleInfo(roleId, { warStar: newWarStars });
}
// 更新下一关状态
@@ -284,7 +284,7 @@ export class ExpeditionBattleHandler {
return resResult(STATUS.BATTLE_INFO_VALIDATE_ERR);
}
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let apJson = await setAp(serverId, roleId, ip, role.lv, isSuccess?-1 * warInfo.cost: 0, sid, ITEM_CHANGE_REASON.EXPEDITION_BATTLE_END); // 扣除体力
if (!apJson) {
return resResult(STATUS.BATTLE_ACTION_POINT_LACK);
@@ -306,7 +306,7 @@ export class ExpeditionBattleHandler {
$set: { status: isSuccess ? 1 : 2, star }
}, true);
// 更新点数
role = await Role.increaseExpeditionPoint(roleId, isSuccess ? dicParam.EXPEDITION_CONST.EXPEDITION_CONST_POINTS : 0);
role = await RoleModel.increaseExpeditionPoint(roleId, isSuccess ? dicParam.EXPEDITION_CONST.EXPEDITION_CONST_POINTS : 0);
let { expeditionPoint = 0, warStar = [] } = role;
// 关卡奖励
@@ -325,7 +325,7 @@ export class ExpeditionBattleHandler {
reportTAEvent(roleId, TA_EVENT.GK_FIRST_PASS, { war_id: battleId, war_type: getWarTypeName(warInfo.warType), pass_time: Date.now(), pass_duration: nowSeconds() - getSeconds(createdAt), hero_list: dbHeroes });
}
if (!curWarStar || newStar > curWarStar.star) {
await Role.updateRoleInfo(roleId, { warStar: newWarStars });
await RoleModel.updateRoleInfo(roleId, { warStar: newWarStars });
}
}
await checkTaskInBattleEnd(serverId, roleId, sid, battleId, dbHeroes, star, isSuccess);
@@ -354,7 +354,7 @@ export class ExpeditionBattleHandler {
const serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let { expeditionPoint } = role;
let dicExpeditionPoint = gameData.expeditionPoint;
let curDicExpeditionPoint = dicExpeditionPoint.get(point);
@@ -386,7 +386,7 @@ export class ExpeditionBattleHandler {
}
if (hasReceivedAll) { // 全部领取了，刷新
await ExpeditionPointModel.completeStatus(roleId);
await Role.increaseExpeditionPoint(roleId, maxPoint * -1);
await RoleModel.increaseExpeditionPoint(roleId, maxPoint * -1);
}
let pointRewards = await getPointRewardStatus(roleId);
@@ -408,7 +408,7 @@ export class ExpeditionBattleHandler {
return resResult(STATUS.TOKEN_ERR);
}
let roleId = session.get('roleId');
await Role.updateRoleInfo(roleId, { expeditionResetCnt: 0 });
await RoleModel.updateRoleInfo(roleId, { expeditionResetCnt: 0 });
return resResult(STATUS.SUCCESS);
}
}
game-server/app/servers/battle/handler/normalBattleHandler.ts
+15 -15
View File
@@ -11,7 +11,7 @@ import { getAp, setAp } from '../../../services/actionPointService';
import { setBattleStatus, checkEventBattle } from '../../../services/eventSercive';
import { STATUS } from '../../../consts/statusCode';
import { resResult } from '../../../pubUtils/util';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { RScriptRecordModel } from '../../../db/RScriptRecord';
import { checkBattleHeroes, roleLevelup, calculateWarStar, getBattleListOfTypes, getMainChapter, getStarOfChapter, checkWarCountAndInc } from '../../../services/normalBattleService';
import { checkDungeonNum, checkDungeonAndIncrease, saveDungeonFirst } from '../../../services/dungeonService';
@@ -55,7 +55,7 @@ export class NormalBattleHandler {
if (!warInfo) {
return resResult(STATUS.BATTLE_MISS_INFO);
}
let role = await Role.findByRoleId(roleId, 'lv warStar warCount roleId refWarCount');
let role = await RoleModel.findByRoleId(roleId, 'lv warStar warCount roleId refWarCount');
let apJson = await getAp(roleId, ip, role.lv);
let { ap } = apJson;
if (ap < warInfo.cost) {
@@ -136,7 +136,7 @@ export class NormalBattleHandler {
const { types } = msg;
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let result = await getBattleListOfTypes(role, types);
return resResult(STATUS.SUCCESS, {
result
@@ -176,7 +176,7 @@ export class NormalBattleHandler {
return resResult(STATUS.BATTLE_INFO_VALIDATE_ERR);
}
let role = await Role.findByRoleId(roleId, 'lv vipStartTime warStar warCount refWarCount roleId');
let role = await RoleModel.findByRoleId(roleId, 'lv vipStartTime warStar warCount refWarCount roleId');
let apJson = await setAp(serverId, roleId, ip, role.lv, isSuccess? -1 * warInfo.cost: 0, sid, getReasonByWarType(warInfo.warType)); // 扣除体力
if (!apJson) {
return resResult(STATUS.BATTLE_ACTION_POINT_LACK);
@@ -225,7 +225,7 @@ export class NormalBattleHandler {
}
} else if (warInfo.warType == WAR_TYPE.MYSTERY) {
let checkResult = await checkDungeonAndIncrease(roleId, isSuccess?1:0, false, battleId);
let role = await Role.saveDungeonHero(roleId, battleId, heroes, isSuccess);
let role = await RoleModel.saveDungeonHero(roleId, battleId, heroes, isSuccess);
if (role) {
await saveDungeonFirst(role, battleId, BattleRecord);
}
@@ -236,7 +236,7 @@ export class NormalBattleHandler {
dungeonNum = Object.assign(dungeonNum, checkResult.data)
} else if (warInfo.warType == WAR_TYPE.NORMAL) {
if(isSuccess) {
let role = await Role.updateMainWarId(roleId, battleId, nowSeconds());
let role = await RoleModel.updateMainWarId(roleId, battleId, nowSeconds());
if (role) {
let r = new Rank(REDIS_KEY.MAIN_RANK, { serverId });
await r.setRankWithRoleInfo(roleId, role.mainWarId, role.mainUpdatedAt, role);
@@ -244,7 +244,7 @@ export class NormalBattleHandler {
}
} else if (warInfo.warType == WAR_TYPE.MAIN_ELITE) {
if(isSuccess) {
let role = await Role.updateMainEliteWarId(roleId, battleId, nowSeconds());
let role = await RoleModel.updateMainEliteWarId(roleId, battleId, nowSeconds());
if (role) {
let r = new Rank(REDIS_KEY.MAIN_ELITE_RANK, { serverId });
await r.setRankWithRoleInfo(roleId, role.mainEliteWarId, role.mainEliteUpdatedAt, role);
@@ -286,7 +286,7 @@ export class NormalBattleHandler {
}
if (!curWarStar || newStar > curWarStar.star) {
await Role.updateRoleInfo(roleId, { warStar: newWarStars });
await RoleModel.updateRoleInfo(roleId, { warStar: newWarStars });
}
}
@@ -325,12 +325,12 @@ export class NormalBattleHandler {
return resResult(STATUS.BATTLE_MISS_INFO);
}
// 校验是否三星通关过
let { warStar } = await Role.findByRoleId(roleId);
let { warStar } = await RoleModel.findByRoleId(roleId);
let curWar = warStar.find(cur => cur.id == battleId);
if (!curWar || curWar.star < 3) {
return resResult(STATUS.BATTLE_SWEEP_CONDITION_STAR);
}
let role = await Role.findByRoleId(roleId, 'lv warCount refWarCount roleId');
let role = await RoleModel.findByRoleId(roleId, 'lv warCount refWarCount roleId');
// 扫荡次数
let dailyNum = {};
let dungeonNum = {};
@@ -459,7 +459,7 @@ export class NormalBattleHandler {
async getMainStarBox(msg: {}, session: BackendSession) {
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId, 'warStar receivedBox');
let role = await RoleModel.findByRoleId(roleId, 'warStar receivedBox');
let result = getMainChapter(role);
return resResult(STATUS.SUCCESS, result);
@@ -474,7 +474,7 @@ export class NormalBattleHandler {
let roleName = session.get('roleName');
let sid = session.get('sid');
let role = await Role.findByRoleId(roleId, 'warStar receivedBox');
let role = await RoleModel.findByRoleId(roleId, 'warStar receivedBox');
let ids: number[] = [];
let rewards: RewardInter[] = [];
let star = getStarOfChapter(role.warStar, warType, chapter);
@@ -491,7 +491,7 @@ export class NormalBattleHandler {
}
}
if(ids.length <= 0) return resResult(STATUS.BATTLE_NO_BOX_CAN_RECEIVE);
role = await Role.receivedBox(roleId, ids);
role = await RoleModel.receivedBox(roleId, ids);
let goods = await addItems(roleId, roleName, sid, rewards, ITEM_CHANGE_REASON.RECEIVE_CHAPTER_BOX)
let result = getMainChapter(role);
@@ -508,7 +508,7 @@ export class NormalBattleHandler {
let roleName = session.get('roleName');
let sid = session.get('sid');
let role = await Role.findByRoleId(roleId, 'receivedWarIds warStar');
let role = await RoleModel.findByRoleId(roleId, 'receivedWarIds warStar');
let { warStar, receivedWarIds = [] } = role;
let warIds: number[] = [];
let rewards: RewardInter[] = [];
@@ -522,7 +522,7 @@ export class NormalBattleHandler {
}
}
if(warIds.length <= 0) return resResult(STATUS.BATTLE_NO_WAR_REWARD_CAN_RECEIVE);
role = await Role.receiveWarRewards(roleId, warIds);
role = await RoleModel.receiveWarRewards(roleId, warIds);
let goods = await addItems(roleId, roleName, sid, rewards, ITEM_CHANGE_REASON.RECEIVE_CHAPTER_BOX)
return resResult(STATUS.SUCCESS, {
game-server/app/servers/battle/handler/pvpHandler.ts
+8 -8
View File
@@ -4,7 +4,7 @@ import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
import { findIndex } from 'underscore';
import { gameData, getPvpBoxBySeasonNumAndIndex } from '../../../pubUtils/data';
import { refreshEnemies, getEnemies, refChallengeCnt, generPVPOppRecInfo, generMyRecInfo, sendLastSeasonRewardIfNotSent, refreshRefOppCnt, generPvpLineupCe, calLineupScore, checkPvpSeasonIsStart, checkPvpSeasonIsSummit, getPvpSeasonStatus, checkPvpSeasonIsWaiting } from '../../../services/pvpService';
import Role, { RoleType } from '../../../db/Role';
import { RoleModel, RoleType } from '../../../db/Role';
import { STATUS } from '../../../consts/statusCode';
import { resResult, genCode, checkRoleIsRobot, robotIdComBack } from '../../../pubUtils/util';
import { PvpDefenseModel, pvpUpdateInter } from '../../../db/PvpDefense';
@@ -51,7 +51,7 @@ export class PvpHandler {
let seasonRewardTime: number = this.app.get('pvpSeasonRewardTime');
let pvpDefense = await PvpDefenseModel.findByRoleIdIncludeAll(roleId);
if(!pvpDefense) {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
pvpDefense = await PvpDefenseModel.createPvpDefense(seasonNum, { serverId: role.serverId, roleId: role.roleId, roleName: role.roleName, role: role._id });
} else {
// 如果没有发过，将上赛季的奖励发下
@@ -204,7 +204,7 @@ export class PvpHandler {
oppBeforePlayers: pvpDefense.oppPlayers
};
// 刷新对手
const role = await Role.findByRoleId(roleId, null, true);
const role = await RoleModel.findByRoleId(roleId, null, true);
let oppPlayers = await refreshEnemies(role, seasonNum, pvpDefense.score ,pvpDefense.attack.score, pvpDefense.attack.pLv||1);
update.oppPlayers = oppPlayers;
@@ -257,7 +257,7 @@ export class PvpHandler {
let update: pvpUpdateInter = {};
const role = await Role.findByRoleId(roleId, null, true);
const role = await RoleModel.findByRoleId(roleId, null, true);
const myRecInfo = await generMyRecInfo(pvpDefense, role, isSuccess, pos, myHeroes);
let { attackInfo, showHeroScores, updateParam } = myRecInfo
@@ -332,7 +332,7 @@ export class PvpHandler {
// 更新挑战阵容
if(refOppObj.shouldRefOpp) {
if(pvpDefense.attack) {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let seasonNum: number = this.app.get('pvpSeasonNum');
let oppPlayers = await refreshEnemies(role, seasonNum, pvpDefense.score, pvpDefense.attack.score, pvpDefense.attack.pLv||1);
update.oppPlayers = oppPlayers;
@@ -546,13 +546,13 @@ export class PvpHandler {
if(pvpHistoryOpp.isRobot) {
result.setServerName(await getServerName(serverId));
} else {
let role = await Role.findByRoleId(robotIdComBack(oppoRoleId), 'serverId');
let role = await RoleModel.findByRoleId(robotIdComBack(oppoRoleId), 'serverId');
result.setServerName(await getServerName(role.serverId));
}
} else { // 查询对方pvpDefense
let pvpDefense = await PvpDefenseModel.findByRoleId(oppoRoleId);
let dbHeroes = await HeroModel.findByRole(oppoRoleId);
let role = await Role.findByRoleId(oppoRoleId);
let role = await RoleModel.findByRoleId(oppoRoleId);
let heroes = new Array<PlayerDetailHero>();
for (let dbHero of dbHeroes) {
@@ -660,7 +660,7 @@ export class PvpHandler {
let newDefense = <Defense>calLineupScore(defense, heroScores);
let pvpDefense = await PvpDefenseModel.updateInfoAndInclude(roleId, { score, hisScore, heroScores, attack: newAttack, defense: newDefense });
const role = await Role.findByRoleId(roleId);
const role = await RoleModel.findByRoleId(roleId);
// 加入排行榜
let seasonNum: number = this.app.get('pvpSeasonNum');
game-server/app/servers/battle/handler/towerBattleHandler.ts
+15 -15
View File
@@ -3,7 +3,7 @@ import { HANG_UP_CONSTS, ITEM_CHANGE_REASON, MSG_SOURCE, POP_UP_SHOP_CONDITION_T
import { TaskHero, TowerTaskRecModel, TowerTaskRecType } from './../../../db/TowerTaskRec';
import { HangUpSpdUpRecModel } from './../../../db/HangUpSpdUpRec';
import { HangUpRecordModel } from './../../../db/HangUpRecord';
import Role from './../../../db/Role';
import { RoleModel } from './../../../db/Role';
import { TowerRecordModel, WarStatus } from './../../../db/TowerRecord';
import { Application, BackendSession } from 'pinus';
import { resResult, genCode, shouldRefresh } from '../../../pubUtils/util';
@@ -38,7 +38,7 @@ export class TowerBattleHandler {
async getStatus(msg: {}, session: BackendSession) {
let roleId = session.get('roleId');
let serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId, 'roleId serverId towerLv towerReceived');
let role = await RoleModel.findByRoleId(roleId, 'roleId serverId towerLv towerReceived');
let data = await getTowerStatus(role);
return resResult(STATUS.SUCCESS, data);
@@ -51,7 +51,7 @@ export class TowerBattleHandler {
*/
async resetLv(msg: {towerLv: number}, session: BackendSession) {
let roleId = session.get('roleId');
let { towerLv } = await Role.findByRoleId(roleId);
let { towerLv } = await RoleModel.findByRoleId(roleId);
if (msg.towerLv !== towerLv) {
return resResult(STATUS.TOWER_RESET_ERR);
}
@@ -99,7 +99,7 @@ export class TowerBattleHandler {
let roleName = session.get('roleName');
let sid = session.get('sid');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
const result = await calcuHangUpReward(role);
if(!result) {
return resResult(STATUS.TOWER_HANG_UP_NOT_START);
@@ -126,7 +126,7 @@ export class TowerBattleHandler {
const curTime = new Date();
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let { hangUpSpdUpCnt, gold, lastSpdUpTime } = role;
if (shouldRefresh(lastSpdUpTime, curTime)) {
hangUpSpdUpCnt = 0;
@@ -148,7 +148,7 @@ export class TowerBattleHandler {
await handleCost(roleId, sid, [getGoldObject(costGold)], ITEM_CHANGE_REASON.TOWER_HUNG_UP_SDP_UP)
const spdUpResult = await Role.hangUpSpdUp(roleId, msg.speedUpCnt, curTime);
const spdUpResult = await RoleModel.hangUpSpdUp(roleId, msg.speedUpCnt, curTime);
if (!spdUpResult) {
return resResult(STATUS.TOWER_HANG_UP_FAILED);
}
@@ -172,12 +172,12 @@ export class TowerBattleHandler {
let roleId = session.get('roleId');
let roleName = session.get('roleName');
let curTime = new Date();
let { towerLv, towerTaskRefTime, towerTaskReCnt=0 } = await Role.findByRoleId(roleId);
let { towerLv, towerTaskRefTime, towerTaskReCnt=0 } = await RoleModel.findByRoleId(roleId);
if(towerTaskReCnt >= dicParam.TOWER_SEARCH.TOWER_SEARCH_REFRESHRULE) { // 付费刷新次数
return resResult(STATUS.TOWER_REF_CNT_NOT_ENOUGH);
}
let costGold = getTowerTaskCostGold(towerTaskReCnt, towerTaskRefTime);
let {gold} = await Role.findByRoleId(roleId);
let {gold} = await RoleModel.findByRoleId(roleId);
if(costGold > gold) {
return resResult(STATUS.TOWER_GOLD_NOT_ENOUGH);
}
@@ -189,7 +189,7 @@ export class TowerBattleHandler {
if(task) batchCode = task.batchCode;
}
curTasks = await refreshTasks(towerLv, batchCode, roleId, roleName, curTasks);
let newRole = await Role.increaseTowerRefCnt(roleId, 1);
let newRole = await RoleModel.increaseTowerRefCnt(roleId, 1);
let refRemainTime = getRemainTime(curTime);
let nextCostGold = getTowerTaskCostGold(newRole.towerTaskReCnt, newRole.towerTaskRefTime);
@@ -251,7 +251,7 @@ export class TowerBattleHandler {
if (!recs || recs.length === 0) {
return resResult(STATUS.TOWER_TASK_SEND_ERR);
}
let role = await Role.increaseTowerCnt(roleId, tasks.length)
let role = await RoleModel.increaseTowerCnt(roleId, tasks.length)
let refRemainTime = getRemainTime(curTime);
curTasks = await TowerTaskRecModel.getCurTasks(roleId); // 当前显示中的任务
@@ -289,7 +289,7 @@ export class TowerBattleHandler {
let refRemainTime = getRemainTime(curTime);
let curTasks = await TowerTaskRecModel.getCurTasks(roleId); // 当前显示中的任务
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let costGold = getTowerTaskCostGold(role.towerTaskReCnt, role.towerTaskRefTime);
return resResult(STATUS.SUCCESS, { curTasks: treatTask(curTasks, curTime), goods, refRemainTime, nextCostGold: costGold });
}
@@ -302,7 +302,7 @@ export class TowerBattleHandler {
let serverId = session.get('serverId');
let sid = session.get('sid');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let oldTowerLv = role.towerLv;
let dicTower = gameData.tower.get(oldTowerLv);
if(!dicTower.canSkip) {
@@ -339,7 +339,7 @@ export class TowerBattleHandler {
await TowerRecordModel.skipTower(roleId, role.towerLv, toLv, warStatus);
await checkAndStartHungUp(roleId, roleName, role.towerLv);
// 更新玩家表
role = await Role.setTowerLv(roleId, toLv, newWarStar);
role = await RoleModel.setTowerLv(roleId, toLv, newWarStar);
await addItems(roleId, roleName, sid, dicTower.reward, ITEM_CHANGE_REASON.TOWER_BATTLE_END);
pushTowerMsg(roleId, roleName, serverId, MSG_SOURCE.TOWER_SUC, role.towerLv - 1);
@@ -365,7 +365,7 @@ export class TowerBattleHandler {
let sid = session.get('sid');
let { id } = msg; // id为0表示一键领取
let role = await Role.findByRoleId(roleId, 'towerLv towerReceived');
let role = await RoleModel.findByRoleId(roleId, 'towerLv towerReceived');
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { towerLv, towerReceived = [] } = role;
@@ -390,7 +390,7 @@ export class TowerBattleHandler {
rewards.push(...dicTowerGift.reward);
newReceived.push(id);
}
role = await Role.receiveTowerBox(roleId, newReceived);
role = await RoleModel.receiveTowerBox(roleId, newReceived);
let goods = await addItems(roleId, roleName, sid, combineItems(rewards), ITEM_CHANGE_REASON.RECEIVE_TOWER_BOX);
return resResult(STATUS.SUCCESS, { goods, receivedBox: newReceived });
game-server/app/servers/chat/handler/chatHandler.ts
+2 -2
View File
@@ -5,7 +5,7 @@ import { DEFAULT_MSG_PER_PAGE, SDK_PUSH_MSG_TYPE, SDK_PUSH_TARGET_TYPE, STATUS,
import { createAccuseData, createGroupMsg, createPrivateMsg, getPrivateMessages, pushGroupMsgToRoom, pushMsgToRole, updatePrivateMsgReadInfo, recentPrivateChatInfos, recentWorldMsgs, recentSysMsgs, recentGuildMsgs, updatePrivateMsgIsTop, delPrivateMsg, recentServerGroupMsgs, recentLeagueMsgs } from '../../../services/chatService';
import { getSimpleRoleInfo } from '../../../services/roleService';
import { checkTask } from '../../../services/task/taskService';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { getFriendRelationType } from '../../../services/friendService';
import { GVGLeagueModel } from '../../../db/GVGLeague';
import { getAllGroupOfServer } from '../../../services/serverService';
@@ -209,7 +209,7 @@ export class ChatHandler {
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const { targetRoleId, targetMsgCode, reason } = msg;
let targetRole = await Role.findByRoleId(targetRoleId);
let targetRole = await RoleModel.findByRoleId(targetRoleId);
if(!targetRoleId) return resResult(STATUS.ROLE_NOT_FOUND);
const accuseRec = await createAccuseData(roleId, roleName, targetRoleId, targetRole.roleName, targetMsgCode, reason);
if (!accuseRec) return resResult(STATUS.WRONG_PARMS);
game-server/app/servers/comBattle/handler/comBattleHandler.ts
+9 -9
View File
@@ -4,10 +4,10 @@ import { difference, pick } from 'underscore';
* @Author: 梁桐川
* @Date: 2020-11-30 15:05:48
* @Last Modified by: 梁桐川
* @Last Modified time: 2023-05-06 15:26:55
* @Last Modified time: 2021-08-27 17:47:56
*/
import { IT_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, CONSUME_TYPE, MSG_SOURCE, ROLE_SELECT, TASK_TYPE, KING_EXP_RATIO_TYPE, ITEM_CHANGE_REASON, getChannelType, CHANNEL_PREFIX, DEBUG_MAGIC_WORD, PUSH_ROUTE, POPULATE_TYPE } from '../../../consts';
import Role from '../../../db/Role';
import Role, { RoleModel } from '../../../db/Role';
import { STATUS } from '../../../consts/statusCode';
import { Application, BackendSession } from 'pinus';
import { resResult, getRandSingleEelm, cal } from '../../../pubUtils/util';
@@ -59,7 +59,7 @@ export class ComBattleHandler {
const enoughBlueprt = await hasEnoughBlueprt(roleId, sid, blueprtId);
if (!enoughBlueprt) return resResult(STATUS.COM_BATTLE_BLUEPRT_NOT_ENOUGH);
const roleInfo = await Role.findByRoleId(roleId, null, true);
const roleInfo = await RoleModel.findByRoleId(roleId, null, true);
const { lv, topLineupCe } = roleInfo;
if (lv < COM_BTL_CONST.ENABLE_LV) return resResult(STATUS.COM_BATTLE_LV_NOT_ENOUGH);
if(ceLimit && ceLimit > topLineupCe * (1 + COM_BTL_CONST.ROBOT_CE_RATIO)) {
@@ -102,7 +102,7 @@ export class ComBattleHandler {
let roleId = session.get('roleId');
let sid = session.get('sid');
const { lv: lvs = [], magicWord } = msg;
const roleInfo = await Role.findByRoleId(roleId, null, true);
const roleInfo = await RoleModel.findByRoleId(roleId, null, true);
const { lv: playerLv } = roleInfo;
let { topLineupCe = 1000 } = roleInfo;
@@ -717,7 +717,7 @@ export class ComBattleHandler {
let teamStatus = getComTeamByCode(teamCode);
if(!teamStatus) return resResult(STATUS.WRONG_PARMS);
let role = await Role.findByRoleId(targetRoleId, 'lv');
let role = await RoleModel.findByRoleId(targetRoleId, 'lv');
if(comBtlLvInvalid(role.lv, [teamStatus.lv])) {
return resResult(STATUS.COM_BATTLE_INVITE_LV_NOT_ENOUGH);
}
@@ -754,7 +754,7 @@ export class ComBattleHandler {
if(r != roleId) roleIdList.push(r);
}
}
const roles = await Role.findByRoleIds(roleIdList, ROLE_SELECT.SHOW_SIMPLE, true);
const roles = await RoleModel.findByRoleIds(roleIdList, ROLE_SELECT.SHOW_SIMPLE, true);
let result = new Array<FriendParams>();
for(let role of roles) {
if(role.quitTime == role.loginTime) {
@@ -769,14 +769,14 @@ export class ComBattleHandler {
async getTeamInvitation(msg: { }, session: BackendSession) {
let roleId = session.get('roleId');
let guildCode = session.get('guildCode');
let role = await Role.findByRoleId(roleId, 'lv topLineupCe');
let role = await RoleModel.findByRoleId(roleId, 'lv topLineupCe');
const assistCnt = await getAllAssistCnt(roleId);
let { minLv, maxLv } = getComBtlLvByPlayerLv(role.lv);
let refreshTime = nowSeconds() - INFO_WINDOW.TEAM_INFORMATION_TIME;
const invitations = await ComBattleTeamModel.findInvitations(roleId, guildCode, minLv, maxLv, role.topLineupCe, refreshTime, INFO_WINDOW.TEAM_VIEW);
let roleIds = invitations.map(cur => cur.capId);
let roles = await Role.findByRoleIds(roleIds);
let roles = await RoleModel.findByRoleIds(roleIds);
let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
const teams: ComBattleInvitation[] = [];
for(let invitation of invitations) {
@@ -810,7 +810,7 @@ export class ComBattleHandler {
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
let role = await Role.updateRoleInfo(roleId, { lv: targetLv });
let role = await RoleModel.updateRoleInfo(roleId, { lv: targetLv });
return resResult(STATUS.SUCCESS, { lv: role.lv, roleId });
}
game-server/app/servers/connector/handler/entryHandler.ts
+9 -9
View File
@@ -1,5 +1,5 @@
import { STATUS } from './../../../consts/statusCode';
import Role, { RoleType } from './../../../db/Role';
import { RoleModel, RoleType } from './../../../db/Role';
import { UserModel, UserType } from '../../../db/User';
import { GMUserModel } from '../../../db/GMUser';
import { Application, HandlerService, pinus, } from 'pinus';
@@ -87,7 +87,7 @@ export class EntryHandler {
let ipLocation = await getIpLocation(ip);
let role = await Role.findByUidAndSetTime(user.uid, serverId, ip, ipLocation, null, true);
let role = await RoleModel.findByUidAndSetTime(user.uid, serverId, ip, ipLocation, null, true);
if (!role) {
return resResult(STATUS.ROLE_NOT_FOUND);
}
@@ -118,7 +118,7 @@ export class EntryHandler {
async getData(msg: { }, session: FrontendSession) {
let ip = session.get('ip');
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId, '-_id', true, true);
let role = await RoleModel.findByRoleId(roleId, '-_id', true, true);
// 推送数据
pushData(role.hasInit, role, session);
@@ -189,7 +189,7 @@ export class EntryHandler {
let self = this;
let roleId = session.get('roleId');
let role = await Role.findByRoleIdAndSetTime(roleId, '-_id', true);
let role = await RoleModel.findByRoleIdAndSetTime(roleId, '-_id', true);
if (!role) {
return resResult(STATUS.ROLE_NOT_FOUND);
}
@@ -213,9 +213,9 @@ export class EntryHandler {
let roleId = session.get('roleId');
let ip = session.get('ip');
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
let apJson = await getAp(roleId, ip, role.lv);
return resResult(STATUS.SUCCESS, { apJson });
}
@@ -263,7 +263,7 @@ export class EntryHandler {
} catch(e) {
console.error(e.stack);
}
Role.updateRoleInfo(roleId, { quitTime: nowSeconds() });
RoleModel.updateRoleInfo(roleId, { quitTime: nowSeconds() });
// if(teamCode) { // 如果有寻宝中的队伍，那么等于战败
// setComBtlOnUserLeave(roleId, teamCode)
// }
@@ -375,7 +375,7 @@ export class EntryHandler {
return resResult(STATUS.TOKEN_ERR);
}
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId, '-_id', true, true);
let role = await RoleModel.findByRoleId(roleId, '-_id', true, true);
let module = await getModuleData(type, { role, session });
return resResult(STATUS.SUCCESS, { role: module });
}
@@ -394,7 +394,7 @@ export class EntryHandler {
const code = genCode(6);
const seqId = await Counter.getNewCounter(COUNTER.ROLE) || -1;
await Role.createRole(user.uid, serverId, { roleId, code, roleName: roleId, seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 }, '');
await RoleModel.createRole(user.uid, serverId, { roleId, code, roleName: roleId, seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 }, '');
}
console.log('debugQueryTokenByTel got user:', token);
return resResult(STATUS.SUCCESS, { user: token });
game-server/app/servers/gm/handler/gmOrderHandler.ts
+2 -2
View File
@@ -11,7 +11,7 @@ import { getActivityProducts, getParamStr } from '../../../services/gmService';
import { ActivityGroupModel } from '../../../db/ActivityGroup';
import { Receiver } from '../../../db/GMMail';
import { getRoleOnlineInfo } from '../../../services/redisService';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
export interface Cascader {
value: number|string;
@@ -96,7 +96,7 @@ export class GmOrderHandler {
let results = [];
for(let { roleId, serverId } of receiver) {
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if(!role && role.serverId != serverId) {
results.push(resResult(STATUS.ROLE_NOT_FOUND));
continue;
game-server/app/servers/gm/handler/gmRoleHandler.ts
+12 -12
View File
@@ -5,7 +5,7 @@ import { getRoleOnlineInfo, updateUserInfo } from '../../../services/redisServic
import { addItems } from '../../../services/role/rewardService';
import { RewardInter } from '../../../pubUtils/interface';
import { gameData, getExpByLv, getHeroExpByLv, getHeroLvByExp, getLvByExp, getEquipByJobClassAndEPlace } from '../../../pubUtils/data';
import Role, { RoleType, WarStar } from '../../../db/Role';
import { RoleModel, RoleType, WarStar } from '../../../db/Role';
import { BLOCK_TYPE, DEFAULT_HEROES, GUILD_AUTH, GUILD_DISMISS_WAY, GUILD_JOB, GUILD_MASTER_CHANGE_WAY, GUILD_STATUS, GUILD_STRUCTURE, HERO_SYSTEM_TYPE, ITEM_CHANGE_REASON, MAIL_TYPE, MEMORY_LOG_TYPE, PUSH_ROUTE, REDIS_KEY, TA_EVENT, WAR_TYPE } from '../../../consts';
import { GuildFormParam, SetHeroParam } from '../../../domain/backEndField/params';
import { GuildModel, GuildUpdateParam } from '../../../db/Guild';
@@ -57,7 +57,7 @@ export class GmRoleHandler {
let exp = getExpByLv(lv - 1)?.sum||0;
exp += expInc;
let newLv = getLvByExp(exp);
let role = await Role.updateRoleInfo(roleId, { lv: newLv, exp })
let role = await RoleModel.updateRoleInfo(roleId, { lv: newLv, exp })
let r = new Rank(REDIS_KEY.USER_LV, { serverId: serverId });
await r.setRankWithRoleInfo(roleId, newLv, Date.now(), role);
sendMessageToUserWithSuc(roleId, PUSH_ROUTE.PLAYER_EXP_CHANGE, {
@@ -65,7 +65,7 @@ export class GmRoleHandler {
}, sid);
}
if(fixedIpLocation != undefined) {
await Role.updateRoleInfo(roleId, { fixedIpLocation })
await RoleModel.updateRoleInfo(roleId, { fixedIpLocation })
}
return resResult(STATUS.SUCCESS);
}
@@ -73,7 +73,7 @@ export class GmRoleHandler {
async handleBlock(msg: { roleId: string, blockType: BLOCK_TYPE, blockReason: string }, session: BackendSession) {
let { roleId, blockType, blockReason } = msg;
if(roleId == undefined || blockType == undefined || blockReason == undefined) return resResult(STATUS.WRONG_PARMS);
let role = await Role.updateRoleInfo(roleId, { blockType, blockReason });
let role = await RoleModel.updateRoleInfo(roleId, { blockType, blockReason });
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { isOnline, sid } = await getRoleOnlineInfo(roleId);
if(isOnline) {
@@ -199,7 +199,7 @@ export class GmRoleHandler {
// 更新装备信息
await HeroModel.updateHeroInfo(roleId, hid, { ePlace: hero.ePlace });
// 获取战力重算需要的数据
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let schools = await SchoolModel.findByRoleId(roleId);
let jewels = await JewelModel.findbyRole(roleId);
let heroes = await HeroModel.findByRole(roleId);
@@ -222,10 +222,10 @@ export class GmRoleHandler {
await HeroModel.deleteHero(roleId, hid);
await SkinModel.deleteByHero(roleId, hid);
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
await PvpDefenseModel.deleteHero(roleId, hid);
await RoleCeModel.deleteHero(roleId, hid);
await Role.updateRoleInfo(roleId, { topLineup: role.topLineup.filter(cur => cur.hid != hid), topLineupCe: role.topLineupCe - hero.ce, ce: role.ce - hero.ce });
await RoleModel.updateRoleInfo(roleId, { topLineup: role.topLineup.filter(cur => cur.hid != hid), topLineupCe: role.topLineupCe - hero.ce, ce: role.ce - hero.ce });
await JewelModel.updateMany({ hid }, { $set: { hid: 0}});
return resResult(STATUS.SUCCESS);
@@ -311,7 +311,7 @@ export class GmRoleHandler {
await UserGuildModel.dismiss(code);
const { members } = guild;
await Role.dissmissGuild(members);
await RoleModel.dissmissGuild(members);
await UserGuildApplyModel.deleteApplyByGuild(code);
await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.broadcast(members.map(roleId => { return { roleId, userGuild: null } })); // 更新session
@@ -335,7 +335,7 @@ export class GmRoleHandler {
if(!guild) return resResult(STATUS.GUILD_NOT_FOUND);
if(guild.status == GUILD_STATUS.DISMISSED) return resResult(STATUS.GUILD_DELETE_ERROR);
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
let userGuild = await UserGuildModel.getMyGuild(roleId);
@@ -368,11 +368,11 @@ export class GmRoleHandler {
async skipEpilogue(msg: { roleId: string, roleName: string }, session: BackendSession) {
const { roleId, roleName } = msg;
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
if(role.hasInit) return resResult(STATUS.ROLE_HAS_INIT);
let checkName = await Role.checkName(roleName, role.serverId);
let checkName = await RoleModel.checkName(roleName, role.serverId);
if (checkName) return resResult(STATUS.NAME_HAS_USED);
let warStars: WarStar[] = [];
@@ -397,7 +397,7 @@ export class GmRoleHandler {
async reCalCe(msg: { roleId: string }, session: BackendSession) {
const { roleId } = msg;
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let schools = await SchoolModel.findByRoleId(roleId);
let jewels = await JewelModel.findbyRole(roleId);
let heroes = await HeroModel.findByRole(roleId);
game-server/app/servers/guild/handler/auctionHandler.ts
+3 -3
View File
@@ -10,7 +10,7 @@ import { getSimpleRoleInfo } from '../../../services/roleService';
import { getRoleOnlineInfo } from '../../../services/redisService';
import { lockData } from '../../../services/redLockService';
import { GuildModel } from '../../../db/Guild';
import Role, { RoleType } from '../../../db/Role';
import { RoleModel, RoleType } from '../../../db/Role';
import { openGuildRefine } from '../../../services/guildRefineService';
import { unlockTrain } from '../../../services/guildTrainService';
import { UserGuildModel } from '../../../db/UserGuild';
@@ -257,7 +257,7 @@ export class AuctionHandler {
const serverId: number = session.get('serverId');
if (!guildCode) {//创建公会
const roleId = session.get('roleId');
const role: RoleType = await Role.findByRoleId(roleId);
const role: RoleType = await RoleModel.findByRoleId(roleId);
// 创建公会
const name = '测试公会'
const icon = 1
@@ -271,7 +271,7 @@ export class AuctionHandler {
const userGuild = await UserGuildModel.createUserGuild(guild.code, role, true);
if (!userGuild) return resResult(STATUS.GUILD_CREATE_ERROR);
await Role.joinGuild(roleId, guild.code, guild.name, true);
await RoleModel.joinGuild(roleId, guild.code, guild.name, true);
await UserGuildApplyModel.deleteApply(roleId); // 删除玩家所有对其他公会的申请
guildCode = guild.code;
session.set('guildCode', guildCode);
game-server/app/servers/guild/handler/guildBossHandler.ts
+2 -2
View File
@@ -18,7 +18,7 @@ import { checkTask } from '../../../services/task/taskService';
import { guildInter } from '../../../pubUtils/interface';
import { addItems, getGoldObject, handleCost } from '../../../services/role/rewardService';
import * as dicParam from '../../../pubUtils/dicParam';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { sendMailToGuildByContent } from '../../../services/mailService';
import { genAuction, getAuctionRewardByPoolId } from '../../../services/auctionService';
import { sendMessageToGuildWithSuc } from '../../../services/pushService';
@@ -244,7 +244,7 @@ export class GuildHandler {
let freeCount = dicParam.GUILD_BOSS.GUILD_BOSS_ENCOURAGE_FREECOUNT - myEncourageCnt > 0? dicParam.GUILD_BOSS.GUILD_BOSS_ENCOURAGE_FREECOUNT - myEncourageCnt: 0;
let costGold = (count - freeCount) * dicParam.GUILD_BOSS.GUILD_BOSS_ENCOURAGE_COST;
if(costGold < 0) costGold = 0;
let { gold } = await Role.findByRoleId(roleId, 'gold');
let { gold } = await RoleModel.findByRoleId(roleId, 'gold');
if(gold < costGold) return resResult(STATUS.BATTLE_GOLD_NOT_ENOUGH);
let { code, bossLv } = bossInstance;
game-server/app/servers/guild/handler/guildHandler.ts
+24 -24
View File
@@ -4,7 +4,7 @@ import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_S
import { UserGuildModel, UserGuildType } from '../../../db/UserGuild';
import { checkAuth, joinGuild, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, setUserGuildSession, getInvitationList, addGuildRecord, pushChangeGuildLeader, pushGuildMemberQuit, pushGuildDismiss, pushGuildInfoUpdate, getTodayGuildActive, getGuildQuitCdTime } from '../../../services/guildService';
import { GuildModel, GuildType, GuildUpdateParam } from '../../../db/Guild';
import Role, { RoleType } from '../../../db/Role';
import { RoleModel, RoleType } from '../../../db/Role';
import { ARMY } from '../../../pubUtils/dicParam';
import { handleCost, addItems, getGoldObject } from '../../../services/role/rewardService';
import { nowSeconds, getTimeFun, getSeconds, getZeroPointD, DAY_TO_MS, HOUR_TO_MS } from '../../../pubUtils/timeUtil';
@@ -60,7 +60,7 @@ export class GuildHandler {
if (checkNameResult) return resResult(STATUS.GUILD_NAME_DUP);
// 检查元宝是否够
const role = await Role.findByRoleId(roleId);
const role = await RoleModel.findByRoleId(roleId);
if (ARMY.ARMY_CREAT_COST > role.gold) {
return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
}
@@ -82,7 +82,7 @@ export class GuildHandler {
const userGuild = await UserGuildModel.createUserGuild(guild.code, role, true);
if (!userGuild) return resResult(STATUS.GUILD_CREATE_ERROR);
await Role.joinGuild(roleId, guild.code, guild.name, true);
await RoleModel.joinGuild(roleId, guild.code, guild.name, true);
await UserGuildApplyModel.deleteApply(roleId); // 删除玩家所有对其他公会的申请
// 加入排行
@@ -118,7 +118,7 @@ export class GuildHandler {
const guildList = await GuildModel.getGuildList(page, showPeopleMax, name, serverId);
const applyList = await UserGuildApplyModel.findApplyByRole(roleId);
const { quitGuildTime: quitTime = 0 } = await Role.findByRoleId(roleId);
const { quitGuildTime: quitTime = 0 } = await RoleModel.findByRoleId(roleId);
const list = new Array<GuildListInfo>();
for (let guild of guildList) {
@@ -162,7 +162,7 @@ export class GuildHandler {
for(let roleId of guild.members) {
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'guildName', value: name }]);
}
await Role.updateGuildName(code, name);
await RoleModel.updateGuildName(code, name);
}
if (notice != undefined) {
pushGuildNoticeUpdateMsg(roleId, roleName, guild);
@@ -234,15 +234,15 @@ export class GuildHandler {
}
await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.broadcast([{ roleId: memberRoleId, userGuild }]);
const role = await Role.findByRoleId(memberRoleId);
const role = await RoleModel.findByRoleId(memberRoleId);
let updateObject = {};
if (auth == GUILD_AUTH.LEADER) { // 转让团长
updateObject['leader'] = role._id;
let myUserGuild = await UserGuildModel.updateInfo(roleId, { auth: GUILD_AUTH.MEMBER, job: GUILD_JOB.SHIBING }, {}); // 自己降权限
setUserGuildSession(session, myUserGuild);
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{ field: 'leader', value: new GuildLeader(role) }]);
await Role.updateRoleInfo(memberRoleId, { isGuildLeader: true });
await Role.updateRoleInfo(roleId, { isGuildLeader: false });
await RoleModel.updateRoleInfo(memberRoleId, { isGuildLeader: true });
await RoleModel.updateRoleInfo(roleId, { isGuildLeader: false });
await guildAbdicateToLeague(guild, roleId, role);
}
@@ -310,7 +310,7 @@ export class GuildHandler {
return resResult(STATUS.GUILD_MEMBER_MAX);
}
const role = await Role.findByRoleId(roleId, null, true);
const role = await RoleModel.findByRoleId(roleId, null, true);
if (ceLimit > role.ce) {
return resResult(STATUS.GUILD_NOT_REACH_CONDI);
}
@@ -407,8 +407,8 @@ export class GuildHandler {
const day = <number>getTimeFun().getBeforeDay(3);
const { quitGuildTime: quitTime = 0 } = await Role.findByRoleId(roleId);
let allList = await Role.getInviteList(day, serverId);
const { quitGuildTime: quitTime = 0 } = await RoleModel.findByRoleId(roleId);
let allList = await RoleModel.getInviteList(day, serverId);
allList = allList.filter(cur => !invitedMembers.includes(cur.roleId))
let list = getRandEelm(allList, 10);
if (!list.length) list = allList;
@@ -433,7 +433,7 @@ export class GuildHandler {
const guild = await GuildModel.findByCode(code, serverId, GUILD_SELECT.INVITED_MEMBER);
if (guild.isMemberMax) return resResult(STATUS.GUILD_MEMBER_MAX);
const roleList = await Role.findByRoleIds(roleIds);
const roleList = await RoleModel.findByRoleIds(roleIds);
let result = new Array<string>();
for (let role of roleList) {
@@ -572,7 +572,7 @@ export class GuildHandler {
await sendMailToGuildByContent(MAIL_TYPE.GUILD_DISSMISS, code, {}, guild);
await UserGuildModel.dismiss(code);
const { members } = guild;
await Role.dissmissGuild(members);
await RoleModel.dissmissGuild(members);
await UserGuildApplyModel.deleteApplyByGuild(code);
await guildDismissToLeague(guild);
@@ -609,7 +609,7 @@ export class GuildHandler {
const userGuild = await UserGuildModel.quit(code, roleId);
if (!userGuild) return resResult(STATUS.GUILD_QUIT_ERROR);
const role = await Role.quitGuild(roleId, nowSeconds());
const role = await RoleModel.quitGuild(roleId, nowSeconds());
if (!role) return resResult(STATUS.GUILD_QUIT_ERROR);
const guild = await GuildModel.quit(code, roleId, serverId, role.ce, userGuild.auth == GUILD_AUTH.MANAGER);
@@ -646,7 +646,7 @@ export class GuildHandler {
const userGuild = await UserGuildModel.quit(code, memberRoleId);
if (!userGuild) return resResult(STATUS.GUILD_KICK_ERROR);
const role = await Role.quitGuild(memberRoleId, nowSeconds());
const role = await RoleModel.quitGuild(memberRoleId, nowSeconds());
if (!role) return resResult(STATUS.GUILD_KICK_ERROR);
const guild = await GuildModel.quit(code, memberRoleId, serverId, role.ce, userGuild.auth == GUILD_AUTH.MANAGER);
@@ -688,7 +688,7 @@ export class GuildHandler {
const { code, roleId: leaderRoleId } = msg;
// 离线72小时
const { roleName: oldRoleName, quitTime } = await Role.findByRoleId(leaderRoleId);
const { roleName: oldRoleName, quitTime } = await RoleModel.findByRoleId(leaderRoleId);
if (quitTime > <number>getTimeFun().getBeforeDay(3)) {
return resResult(STATUS.GUILD_LEADER_LOGIN);
}
@@ -699,7 +699,7 @@ export class GuildHandler {
}
let topUserGuild: UserGuildType;
for (let userGuild of topUserGuilds) {
let role = await Role.findByRoleId(userGuild.roleId, 'quitTime');
let role = await RoleModel.findByRoleId(userGuild.roleId, 'quitTime');
if (role && role.quitTime > <number>getTimeFun().getBeforeDay(3)) {
topUserGuild = userGuild; break;
}
@@ -709,7 +709,7 @@ export class GuildHandler {
}
// 检查元宝是否够
const role = await Role.findByRoleId(roleId);
const role = await RoleModel.findByRoleId(roleId);
if (ARMY.ARMY_IMPEACH_COST > role.gold) {
return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
}
@@ -735,8 +735,8 @@ export class GuildHandler {
await sendMailByContent(MAIL_TYPE.GUILD_BE_SET_LEADER, topUser.roleId, { sendName: roleName, params: [guild.name] });
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{ field: 'leader', value: new GuildLeader(topUser) }]);
await Role.updateRoleInfo(leaderRoleId, { isGuildLeader: false });
let newLeader = await Role.updateRoleInfo(topUser.roleId, { isGuildLeader: true });
await RoleModel.updateRoleInfo(leaderRoleId, { isGuildLeader: false });
let newLeader = await RoleModel.updateRoleInfo(topUser.roleId, { isGuildLeader: true });
await guildAbdicateToLeague(guild, leaderRoleId, newLeader);
reportTAEvent(roleId, TA_EVENT.GUILD_MASTER_CHANGE, { way: GUILD_MASTER_CHANGE_WAY.IMPEACH, change_id_after: topUser.roleId }, ip)
@@ -957,7 +957,7 @@ export class GuildHandler {
const guild = await GuildModel.findByCode(code, serverId);
const leader = <RoleType>guild.leader;
let threeDaysBefore = <number>getTimeFun().getBeforeDay(3);
await Role.updateRoleInfo(leader.roleId, { quitTime: threeDaysBefore });
await RoleModel.updateRoleInfo(leader.roleId, { quitTime: threeDaysBefore });
return resResult(STATUS.SUCCESS, { code });
}
@@ -971,7 +971,7 @@ export class GuildHandler {
}
const roleId = session.get('roleId');
const quitGuildTime = type ? Math.floor((new Date().getTime() - HOUR_TO_MS * 2) / 1000) : 0;
await Role.updateRoleInfo(roleId, { quitGuildTime: quitGuildTime });
await RoleModel.updateRoleInfo(roleId, { quitGuildTime: quitGuildTime });
return resResult(STATUS.SUCCESS);
}
@@ -992,13 +992,13 @@ export class GuildHandler {
const { isMemberMax, isAuto, ceLimit, lv } = guild;
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if (role.guildCode) {
let oldCode = role.guildCode;
const userGuild = await UserGuildModel.quit(oldCode, roleId);
if (!userGuild) return resResult(STATUS.GUILD_QUIT_ERROR);
role = await Role.quitGuild(roleId, nowSeconds());
role = await RoleModel.quitGuild(roleId, nowSeconds());
if (!role) return resResult(STATUS.GUILD_QUIT_ERROR);
const guild = await GuildModel.quit(oldCode, roleId, serverId, role.ce, userGuild.auth == GUILD_AUTH.MANAGER);
game-server/app/servers/guild/handler/gvgBattleHandler.ts
+2 -2
View File
@@ -25,7 +25,7 @@ import { GVGCityAreaPointModel } from '../../../db/GVGCityAreaPoint';
import { Rank } from '../../../services/rankService';
import { LeagueRankInfo, RoleRankInfo } from '../../../domain/rank';
import { addBattleEndRec } from '../../../services/gvg/gvgRecService';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { EXTERIOR, GVG } from '../../../pubUtils/dicParam';
import { sendMessageToGuildWithSuc, sendMessageToGVGAreaByTeamWithSuc, sendMessageToUserWithSuc } from '../../../services/pushService';
import { checkLeagueAuth } from '../../../services/gvg/gvgTeamService';
@@ -75,7 +75,7 @@ export class GVGBattleHandler {
let durability = gameData.gvgTeamDurability.get(index)||0;
let groupKey = await getGroupKey(serverId);
let role = await Role.findByRoleId(roleId, 'lv title');
let role = await RoleModel.findByRoleId(roleId, 'lv title');
let updateParam: SaveTeamUpdateParam = { index, head, spine, frame, roleName, serverId, leagueCode, leagueName, lv: role.lv, title: role.title }
if(lineup) {
let { isOK, heroes } = await checkBattleHeroesByHid(roleId, lineup.map(cur => cur.actorId));
game-server/app/servers/guild/handler/gvgFightHandler.ts
+4 -4
View File
@@ -10,7 +10,7 @@ import { GVGVestigeRankModel } from "../../../db/GVGVestigeRank";
import { GVGVestigeRecModel, GVGVestigeRecUpdate } from "../../../db/GVGVestigeRec";
import { GVGVestigeSumRankModel } from "../../../db/GVGVestigeSumRank";
import { HeroModel } from "../../../db/Hero";
import Role from "../../../db/Role";
import { RoleModel } from "../../../db/Role";
import { GVGVestigeOppLineup, VestigeRank } from "../../../domain/gvgField/returnData";
import { RoleRankInfo } from "../../../domain/rank";
import { getRemoteRplFilePath, getRemoteRplPrefix } from "../../../pubUtils/battleUtils";
@@ -156,7 +156,7 @@ export class GVGProduceHandler {
let hisVestigeRank = await GVGVestigeRankModel.findByRole(vestigeId, targetRoleId);
if(!hisVestigeRank) return resResult(STATUS.GVG_VESTIGE_TARGET_NOT_FOUND);
let role = await Role.findByRoleId(hisVestigeRank.roleId, 'roleId roleName serverId guildName title lv heads head spines spine frames frame')
let role = await RoleModel.findByRoleId(hisVestigeRank.roleId, 'roleId roleName serverId guildName title lv heads head spines spine frames frame')
if(!hisVestigeRank) return resResult(STATUS.GVG_VESTIGE_TARGET_NOT_FOUND);
let hids = hisVestigeRank.lineup?.map(cur => cur.actorId)||[];
@@ -477,7 +477,7 @@ export class GVGProduceHandler {
for(let { roleId: targetRoleId, rank, lineup } of vestigeRanks) {
let param = <RoleRankInfo>await r.getParam(rank, targetRoleId, [rank]);
if(!param) {
let role = await Role.findByRoleId(targetRoleId, ROLE_SELECT.RANK);
let role = await RoleModel.findByRoleId(targetRoleId, ROLE_SELECT.RANK);
await r.generParamAndSet(REDIS_KEY.USER_INFO, { roleId: targetRoleId }, { role });
param = <RoleRankInfo>await r.getParam(rank, targetRoleId, [rank]);
}
@@ -492,7 +492,7 @@ export class GVGProduceHandler {
}
if(!myRank) {
let obj = new VestigeRank();
let role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK);
obj.setByRole(role, serverNames[serverId]);
myRank = obj;
}
game-server/app/servers/guild/handler/gvgHandler.ts
+2 -2
View File
@@ -11,7 +11,7 @@ import { Contribute, GVGUserDataModel } from "../../../db/GVGUserData";
import { GVGUserItemModel } from "../../../db/GVGUserItem";
import { GVGUserTaskModel } from "../../../db/GVGUserTask";
import { GVG } from "../../../pubUtils/dicParam";
import Role from "../../../db/Role";
import { RoleModel } from "../../../db/Role";
import { addGVGTechActive, calFighterContribute, calProducerContribute, checkPreTech, checkTechIsIng, checkTechProgress, getDailyLoginReward, getMyContribute, pushTechChange, pushTechRollback, sendUngotBoxReward } from "../../../services/gvg/gvgPrepareService";
import { GVGUserDailyDataModel } from "../../../db/GVGUserDailyData";
import { gameData } from "../../../pubUtils/data";
@@ -188,7 +188,7 @@ export class GVGHandler {
const members = myLeague.members||[];
const roleIds = members.map(member => member.roleId);
const roles = await Role.findByRoleIds(roleIds);
const roles = await RoleModel.findByRoleIds(roleIds);
const serverNames = await getAllServerName();
const myUserData = await GVGUserDataModel.findByRole(configId, myLeague.leagueCode, roleId);
game-server/app/servers/guild/handler/gvgManageHandler.ts
+4 -4
View File
@@ -9,7 +9,7 @@ import { checkCanManage, checkGuildLeader, checkLeagueAuth, createLeague, getLea
import { LeagueGuildInfo, LeagueListInfo, LeagueMemberListInfo, LeagueSimpleInfo } from "../../../domain/gvgField/returnData";
import { getAllServerName, getServerName, isRoleOnline, updateUserInfo } from "../../../services/redisService";
import { GVG } from "../../../pubUtils/dicParam";
import Role, { RoleType } from "../../../db/Role";
import { RoleModel, RoleType } from "../../../db/Role";
import { GVGUserDataModel } from "../../../db/GVGUserData";
import { sendMessageToGuildWithSuc, sendMessageToUserWithSuc } from "../../../services/pushService";
import { GVGLeaguePrepareModel } from "../../../db/GVGLeaguePrepare";
@@ -376,7 +376,7 @@ export class GVGManageHandler {
const members = league.members||[];
let roleIds = members.map(member => member.roleId);
const roles = await Role.findByRoleIds(roleIds);
const roles = await RoleModel.findByRoleIds(roleIds);
const serverNames = await getAllServerName();
const userdatas = await GVGUserDataModel.findByRoles(configId, targetLeagueCode, roleIds);
const result: LeagueMemberListInfo[] = [];
@@ -534,7 +534,7 @@ export class GVGManageHandler {
const members = myLeague.members||[];
const candidates = members.filter(cur => cur.auth == LEAGUE_AUTH.SUB_LEADER);
let roleIds = candidates.map(member => member.roleId);
const roles = await Role.findByRoleIds(roleIds);
const roles = await RoleModel.findByRoleIds(roleIds);
const serverNames = await getAllServerName();
const userdatas = await GVGUserDataModel.findByRoles(configId, targetLeagueCode, roleIds);
const result = roles.map(role => {
@@ -572,7 +572,7 @@ export class GVGManageHandler {
const checkHisAuth = await checkLeagueAuth(targetRoleId, myLeague, LEAGUE_MANAGE_TYPE.BE_ABDICATED);
if(!checkHisAuth) return resResult(STATUS.GVG_HE_HAS_NO_AUTH);
const targetRole = await Role.findByRoleId(targetRoleId, '_id roleName serverId guildName roleId');
const targetRole = await RoleModel.findByRoleId(targetRoleId, '_id roleName serverId guildName roleId');
let targetRoleServerName = await getServerName(targetRole.serverId);
// 修改联军数据 members，leader
game-server/app/servers/guild/handler/gvgProduceHandler.ts
+3 -3
View File
@@ -5,7 +5,7 @@ import { GVGLeagueFarmModel, GVGLeagueFarmType } from "../../../db/GVGLeagueFarm
import { GVGLeagueFarmRecModel } from "../../../db/GVGLeagueFarmRec";
import { GVGLeaguePrepareModel } from "../../../db/GVGLeaguePrepare";
import { GVGUserItemModel } from "../../../db/GVGUserItem";
import Role from "../../../db/Role";
import { RoleModel } from "../../../db/Role";
import { LeagueFarmListInfo, LeagueFarmMember, LeagueField } from "../../../domain/gvgField/returnData";
import { gameData, getGVGResourceBasesByType } from "../../../pubUtils/data";
import { ItemInter, RewardInter } from "../../../pubUtils/interface";
@@ -118,7 +118,7 @@ export class GVGProduceHandler {
}
const serverNames = await getAllServerName();
const roles = await Role.findByRoleIds(roleIds);
const roles = await RoleModel.findByRoleIds(roleIds);
const result: LeagueFarmMember[] = [];
for(let role of roles) {
let obj = new LeagueFarmMember(role, serverNames);
@@ -419,7 +419,7 @@ export class GVGProduceHandler {
}
const serverNames = await getAllServerName();
const roles = await Role.findByRoleIds(roleIds);
const roles = await RoleModel.findByRoleIds(roleIds);
const result: LeagueFarmMember[] = [];
for(let role of roles) {
let obj = new LeagueFarmMember(role, serverNames);
game-server/app/servers/guild/handler/wishPoolHandler.ts
+2 -2
View File
@@ -10,7 +10,7 @@ import { ITID, CONSUME_TYPE } from '../../../consts/constModules/itemConst';
import { GUILD_POINT_WAYS, GUILD_STRUCTURE, WISH_POOL_TYPE } from '../../../consts/constModules/guildConst';
import { getWishPool, getUserGuildWithRefActive, addActive, canWishToday } from '../../../services/guildService';
import { findIndex, findWhere } from 'underscore';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { getRoleOnlineInfo } from '../../../services/redisService';
import { ARMY } from '../../../pubUtils/dicParam';
import { guildInter } from '../../../pubUtils/interface';
@@ -89,7 +89,7 @@ export class WishPoolHandler {
const sid: string = session.get('sid');
if (wishRoleId == dntRoleId)
return resResult(STATUS.WRONG_PARMS);
let role = await Role.findByRoleId(wishRoleId);
let role = await RoleModel.findByRoleId(wishRoleId);
if (!role)
return resResult(STATUS.WRONG_PARMS);//没有玩家
let wishUserGuild = await getUserGuildWithRefActive(wishRoleId, ' wishDntCnt wishGoods guildCode');
game-server/app/servers/role/handler/friendHandler.ts
+25 -25
View File
@@ -1,7 +1,7 @@
import { Application, BackendSession, ChannelService, HandlerService, } from "pinus";
import { resResult, getRandEelm, getResStr, shouldRefresh, sortArrRandom, checkRoleIsRobot, getRobotSysType, makeRobotId, parseNumberList } from "../../../pubUtils/util";
import { STATUS, ROLE_SELECT, FRIEND_DROP_TYPE, FRIEND_RELATION_TYPE, POPULATE_TYPE, BLOCK_OPEATE, CONSUME_TYPE, ITID, HERO_SELECT, REDIS_KEY, MSG_SOURCE, MSG_TYPE, TASK_TYPE, ROBOT_SYS_TYPE, ITEM_CHANGE_REASON, PUSH_ROUTE } from "../../../consts";
import Role, { RoleModel, RoleType } from "../../../db/Role";
import { RoleModel, RoleType } from "../../../db/Role";
import { getTimeFun, getZeroPointD } from "../../../pubUtils/timeUtil";
import { FriendApplyModel } from "../../../db/FriendApply";
import { FriendListParam, FriendRecommendParams, BlackListParam, FriendValueListParam, HeroDetailParam } from "../../../domain/roleField/friend";
@@ -50,7 +50,7 @@ export class FriendHandler {
const day = <number>getTimeFun().getBeforeHour(FRIEND.FRIEND_RECONMMEND_ACTIVETIME);
const { lv, serverId: myServerId } = await Role.findByRoleId(roleId, ROLE_SELECT.GET_MY_SERVER);
const { lv, serverId: myServerId } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_MY_SERVER);
let nums = parseNumberList(FRIEND.FRIEND_RECONMMEND_LEVEL);
// let max = Math.max(...nums);
let recommendList = await RoleModel.find({ loginTime: { $gt: day }, hasInit: true }).limit(200).lean({ getters: true, virtuals: true })
@@ -117,7 +117,7 @@ export class FriendHandler {
let roleId: string = session.get('roleId');
let { value } = msg;
let allList = await Role.searchByNameOrId(value);
let allList = await RoleModel.searchByNameOrId(value);
let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
let list = new Array<FriendRecommendParams>();
@@ -141,7 +141,7 @@ export class FriendHandler {
let roleId: string = session.get('roleId');
let roleIds = msg.roleIds;
const role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_ROLE_ID);
const role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_ROLE_ID);
let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
let str = '', resultRoleIds = new Array<string>();
@@ -157,7 +157,7 @@ export class FriendHandler {
let hisRelation = await FriendRelationModel.findFriendByRole(hisRoleId, POPULATE_TYPE.NOT);
let hisType = getRecommendType(hisRelation, hisRoleId, roleId);
if(hisType == FRIEND_RELATION_TYPE.NORMAL) {
let incResult = await Role.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
let incResult = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
if (!incResult) {
str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX); continue;
}
@@ -198,7 +198,7 @@ export class FriendHandler {
let { applyCodeList, isPass } = msg;
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let roles = new Array<RoleType>();
let friendCnt = role.friendCnt;
@@ -259,7 +259,7 @@ export class FriendHandler {
}
let deleteCount = await FriendApplyModel.deleteApply(resultApplyCodeList);
role = await Role.increaseFriendApplyCnt(roleId, -1 * deleteCount, FRIEND.FRIEND_MANAGE_APPLICATION);
role = await RoleModel.increaseFriendApplyCnt(roleId, -1 * deleteCount, FRIEND.FRIEND_MANAGE_APPLICATION);
roles.push(role);
// 任务
await checkTaskWithRoles(roleId, sid, TASK_TYPE.FRIEND_NUM, roles);
@@ -280,7 +280,7 @@ export class FriendHandler {
public async getFriendList(msg: {}, session: BackendSession) {
let roleId: string = session.get('roleId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let res = await getFriendList(role);
return resResult(STATUS.SUCCESS, res);
@@ -290,7 +290,7 @@ export class FriendHandler {
public async getBlackList(msg: {}, session: BackendSession) {
let roleId: string = session.get('roleId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let list = new Array<BlackListParam>();
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.BLACKLIST);
let blacklist = myRelation ? myRelation.blacklist : [];
@@ -328,7 +328,7 @@ export class FriendHandler {
const serverId = session.get('serverId');
let { roleId: hisRoleId, type } = msg;
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let friend: RoleType;
let str = '', list = new Array<BlackListParam>(), frdRoleIds = new Array<string>(), blackRoleIds = new Array<string>();
@@ -342,11 +342,11 @@ export class FriendHandler {
return resResult(STATUS.FRIEND_BLACK_HAS_ADD);
}
role = await Role.increaseBlockCnt(roleId, 1, curFriend ? -1 : 0, FRIEND.FRIEND_BLACKLIST_MAX); // 增加黑名单人数
role = await RoleModel.increaseBlockCnt(roleId, 1, curFriend ? -1 : 0, FRIEND.FRIEND_BLACKLIST_MAX); // 增加黑名单人数
if (!role) {
return resResult(STATUS.FRIEND_BLACK_MAX)
}
friend = await Role.increaseFriendCnt(hisRoleId, curFriend ? -1 : 0); // 对方好友减少
friend = await RoleModel.increaseFriendCnt(hisRoleId, curFriend ? -1 : 0); // 对方好友减少
let friendShip: FriendShipType;
if (!!curFriend) {
@@ -360,8 +360,8 @@ export class FriendHandler {
await delPrivateMsg(roleId, hisRoleId);
let { myRecApplyCount, hisRecApplyCount } = await FriendApplyModel.deleteApplyByRoles(roleId, hisRoleId); // 删除双方的申请
if(myRecApplyCount > 0) await Role.increaseFriendApplyCnt(roleId, -1 * myRecApplyCount, FRIEND.FRIEND_MANAGE_APPLICATION);
if(hisRecApplyCount > 0) await Role.increaseFriendApplyCnt(roleId, -1 * hisRecApplyCount, FRIEND.FRIEND_MANAGE_APPLICATION);
if(myRecApplyCount > 0) await RoleModel.increaseFriendApplyCnt(roleId, -1 * myRecApplyCount, FRIEND.FRIEND_MANAGE_APPLICATION);
if(hisRecApplyCount > 0) await RoleModel.increaseFriendApplyCnt(roleId, -1 * hisRecApplyCount, FRIEND.FRIEND_MANAGE_APPLICATION);
let param = new BlackListParam(friend);
let { isOnline, sid } = await getRoleOnlineInfo(friend.roleId);
@@ -389,11 +389,11 @@ export class FriendHandler {
return resResult(STATUS.FRIEND_NOT_FOUND);
}
role = await Role.increaseFriendCnt(roleId, -1); // 减少好友
role = await RoleModel.increaseFriendCnt(roleId, -1); // 减少好友
if (!role) {
return resResult(STATUS.FRIEND_NOT_FOUND)
}
friend = await Role.increaseFriendCnt(hisRoleId, -1); // 对方好友减少
friend = await RoleModel.increaseFriendCnt(hisRoleId, -1); // 对方好友减少
let friendShip: FriendShipType;
@@ -414,7 +414,7 @@ export class FriendHandler {
return resResult(STATUS.FRIEND_BLACK_NOT_FOUND);
}
role = await Role.increaseBlockCnt(roleId, -1, 0, 100); // 黑名单人数减
role = await RoleModel.increaseBlockCnt(roleId, -1, 0, 100); // 黑名单人数减
if (!role) {
return resResult(STATUS.FRIEND_BLACK_MAX)
}
@@ -422,14 +422,14 @@ export class FriendHandler {
if (type == BLOCK_OPEATE.REMOVE_AND_APPLY) {
// 申请好友
friend = await Role.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
friend = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
if (!friend) {
str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX);
} else {
let hisRelation = await FriendRelationModel.findFriendByRole(hisRoleId, POPULATE_TYPE.NOT);
let hisType = getRecommendType(hisRelation, hisRoleId, roleId);
if(hisType == FRIEND_RELATION_TYPE.NORMAL) {
let incResult = await Role.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
let incResult = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
if (incResult) {
let apply = await FriendApplyModel.createApply(hisRoleId, role);
let hisOnlineInfo = await getRoleOnlineInfo(hisRoleId);
@@ -483,7 +483,7 @@ export class FriendHandler {
}
let canSendList = await sortByBeSentHeart(roleId, arr);
let { lv } = await Role.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let { lv } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let dicFriendLv = getDicFriendByLv(lv);
if (!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND);
@@ -553,7 +553,7 @@ export class FriendHandler {
}
let canReceiveList = await sortByBeSentHeart(roleId, arr);
let { lv } = await Role.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let { lv } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let dicFriendLv = getDicFriendByLv(lv);
if (!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND);
@@ -649,7 +649,7 @@ export class FriendHandler {
let { roleId: targetRoleId } = msg;
let isRobot = checkRoleIsRobot(targetRoleId);
if(isRobot) {
let role = await Role.findByRoleId(roleId, null, true);
let role = await RoleModel.findByRoleId(roleId, null, true);
let sysType = getRobotSysType(targetRoleId);
let addObj: any = { roleId: makeRobotId(''), roleName: '', guildName: '' };
if(sysType == ROBOT_SYS_TYPE.COM_BTL) {
@@ -667,7 +667,7 @@ export class FriendHandler {
return resResult(STATUS.SUCCESS, {...param, isRobot });
} else {
let role = await Role.findByRoleId(targetRoleId, null, true);
let role = await RoleModel.findByRoleId(targetRoleId, null, true);
let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
let type = getRecommendType(myFriendRelation, roleId, role.roleId);
@@ -690,7 +690,7 @@ export class FriendHandler {
let result: PlayerDetail;
let dbHeroes = await HeroModel.findAndSortByCe(oppoRoleId);
let role = await Role.findByRoleId(oppoRoleId, null, true);
let role = await RoleModel.findByRoleId(oppoRoleId, null, true);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { topLineupCe, towerLv, showLineup } = role;
@@ -732,7 +732,7 @@ export class FriendHandler {
let { roleId: hisRoleId, hids } = msg;
let role = await Role.findByRoleId(hisRoleId, 'title');
let role = await RoleModel.findByRoleId(hisRoleId, 'title');
if (!role) return resResult(STATUS.ROLE_NOT_FOUND);
let roleCe = await RoleCeModel.findByRoleId(hisRoleId);
game-server/app/servers/role/handler/heroHandler.ts
+7 -7
View File
@@ -4,7 +4,7 @@ import { resResult, deepCopy, parseGoodStr } from '../../../pubUtils/util';
import { STATUS } from '../../../consts/statusCode';
import { HeroModel, Connect, HeroSkin, HeroUpdate, EPlace, Talent } from '../../../db/Hero';
import { CURRENCY_BY_TYPE, CURRENCY_TYPE, CONSUME_TYPE, HERO_GROW_MAX, HERO_SYSTEM_TYPE, ABI_STAGE, DEBUG_MAGIC_WORD, HERO_INITIAL_QUALITY, REDIS_KEY, TASK_TYPE, ITEM_CHANGE_REASON, CHECK_HERO_CONSUME } from '../../../consts';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { ItemModel } from '../../../db/Item';
import { gameData, getHeroExpByLv, getHeroStarByQuality, getHeroWakeByQuality, getHeroLvByExp, getMaxGradeByjobClass, getJobByGradeAndClass, getConnectLvByExp, getEquipByJobClassAndEPlace, getScollByStar, getExpByLv, getConnectMaxLv, getFriendShipByIdAndLv } from '../../../pubUtils/data';
import { ItemInter, RewardInter } from '../../../pubUtils/interface';
@@ -89,7 +89,7 @@ export class HeroHandler {
// 计算武将可以升的级数
let hero = await HeroModel.findByHidAndRole(hid, roleId);
if (!hero) return resResult(STATUS.ROLE_HERO_NOT_EXISTS);
let { lv: playerLv } = await Role.findByRoleId(roleId);
let { lv: playerLv } = await RoleModel.findByRoleId(roleId);
let { lv: oldLv, exp: oldExp } = hero;
if (oldLv >= playerLv) return resResult(STATUS.ROLE_HERO_LV_OVER);
if (oldLv + addLv > playerLv) addLv = playerLv - oldLv;
@@ -812,7 +812,7 @@ export class HeroHandler {
await SkinModel.deleteMany({ roleId });
await SchoolModel.deleteAccount(roleId);
await RoleCeModel.deleteMany({ roleId });
await Role.updateRoleInfo(roleId, { jewelCount: 0 });
await RoleModel.updateRoleInfo(roleId, { jewelCount: 0 });
let heroInfos = [];
for(let [actorId] of gameData.recruit) {
@@ -850,9 +850,9 @@ export class HeroHandler {
if (!hero) return resResult(STATUS.HERO_NOT_FIND);
await HeroModel.deleteHero(roleId, hid);
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
await PvpDefenseModel.deleteHero(roleId, hid);
await Role.updateRoleInfo(roleId, { topLineup: role.topLineup, topLineupCe: role.topLineupCe, ce: role.ce - hero.ce });
await RoleModel.updateRoleInfo(roleId, { topLineup: role.topLineup, topLineupCe: role.topLineupCe, ce: role.ce - hero.ce });
return resResult(STATUS.SUCCESS);
}
@@ -865,14 +865,14 @@ export class HeroHandler {
//let result = await handleCost(roleId, sid, [{id, count}] );
let items = [{ id, count }];
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if (id == 999999) {
items = getDropItems();
if (role.lv < 60) {
role.lv = 60;
let roleLvInfo = gameData.kingexp.get(role.lv - 1);
role.exp = roleLvInfo.sum;
await Role.updateRoleInfo(roleId, role);
await RoleModel.updateRoleInfo(roleId, role);
}
}
let result = await addItems(roleId, roleName, sid, items, ITEM_CHANGE_REASON.DEBUG);
game-server/app/servers/role/handler/itemHandler.ts
+7 -7
View File
@@ -4,7 +4,7 @@ import { RewardInter } from "../../../pubUtils/interface";
import { resResult } from "../../../pubUtils/util";
import { addItems, handleCost } from "../../../services/role/rewardService";
import Role from "../../../db/Role";
import { RoleModel } from "../../../db/Role";
import { gameData } from "../../../pubUtils/data";
import { ITID } from "../../../consts/constModules/itemConst";
import { useGiftPackage } from "../../../services/activity/giftPackageService";
@@ -100,7 +100,7 @@ export class ItemHandler {
return resResult(STATUS.ROLE_METERIAL_ERROR);
}
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let { ap, isOver } = await getAp(roleId, ip, role.lv);
if (isOver) return resResult(STATUS.AP_IS_FULL);
@@ -138,7 +138,7 @@ export class ItemHandler {
return resResult(STATUS.ROLE_METERIAL_ERROR);
}
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let { buyTimes = 0 } = await getAp(roleId, ip, role.lv);
if (buyTimes + count > gameData.apMaxBuyTimes.max) return resResult(STATUS.AP_BUY_TIMES_LACK);
@@ -208,7 +208,7 @@ export class ItemHandler {
let roleId = session.get('roleId');
let ip = session.get('ip');
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let apJson = await getAp(roleId, ip, role.lv);
return resResult(STATUS.SUCCESS, { apJson });
}
@@ -222,7 +222,7 @@ export class ItemHandler {
let lvRecord = lvRecords.find(cur => cur.lv == lv);
let ap = 0, apBefore = 0;
if(!lvRecord) {
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let apJson = await getAp(roleId, ip, role.lv);
ap = apJson.ap;
apBefore = apJson.ap;
@@ -244,7 +244,7 @@ export class ItemHandler {
const ip = session.get('ip');
const serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let apJson = await setAp(serverId, roleId, ip, role.lv, msg.ap, sid, ITEM_CHANGE_REASON.DEBUG);
if (!apJson) return resResult(STATUS.BATTLE_ACTION_POINT_LACK)
return resResult(STATUS.SUCCESS, { apJson });
@@ -257,7 +257,7 @@ export class ItemHandler {
}
let roleId = session.get('roleId');
let ip = session.get('ip');
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
await ActionPointModel.resetBuyTimes(roleId);
let apJson = await getAp(roleId, ip, role.lv);
return resResult(STATUS.SUCCESS, { apJson });
game-server/app/servers/role/handler/mailHandler.ts
+2 -2
View File
@@ -9,7 +9,7 @@ import { checkMailGoods, getMails } from '../../../services/mailService';
import { ServerMailModel, ServerMailType } from '../../../db/ServerMail';
import { MailParam } from '../../../domain/roleField/mail';
import { ItemInter, RewardInter } from '../../../pubUtils/interface';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { gameData } from '../../../pubUtils/data';
import { ITEM_CHANGE_REASON, ITID, RECEIVE_MAIL_TYPE } from '../../../consts';
import { BAG } from '../../../pubUtils/dicParam';
@@ -110,7 +110,7 @@ export class MailHandler {
let sid: string = session.get('sid');
let serverId: number = session.get('serverId');
let { id, type, mailType } = msg;
let { jewelCount } = await Role.findByRoleId(roleId, 'jewelCount');
let { jewelCount } = await RoleModel.findByRoleId(roleId, 'jewelCount');
let originMails: {mailType: GM_MAIL_TYPE, mail: MailType|GroupMailType|ServerMailType}[] = []
game-server/app/servers/role/handler/rankHandler.ts
+5 -5
View File
@@ -1,7 +1,7 @@
import { Application, BackendSession, HandlerService, pinus, } from "pinus";
import { resResult } from "../../../pubUtils/util";
import { STATUS, getRedisKeyByRankType, ROLE_SELECT, RANK_TYPE, HERO_SELECT, GUILD_SELECT, RANK_FIRST_REWARD_STATUS, ITEM_CHANGE_REASON, REDIS_KEY } from "../../../consts";
import Role from "../../../db/Role";
import Role,{RoleModel} from "../../../db/Role";
import { UserGuildModel } from "../../../db/UserGuild";
import { GuildModel } from "../../../db/Guild";
import { Rank, getGeneralRank, getRankFirstReward, getRankInHandler } from "../../../services/rankService";
@@ -26,7 +26,7 @@ export class RoleHandler {
let roleName = session.get('roleName');
let serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId, 'rankReceived');
let role = await RoleModel.findByRoleId(roleId, 'rankReceived');
if (!role) return resResult(STATUS.WRONG_PARMS);
let ranks = await getGeneralRank(role, serverId);
@@ -40,7 +40,7 @@ export class RoleHandler {
let roleName = session.get('roleName');
let serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId, 'rankReceived');
let role = await RoleModel.findByRoleId(roleId, 'rankReceived');
if (!role) return resResult(STATUS.WRONG_PARMS);
let ranks = await getRankFirstReward(role, serverId);
@@ -189,7 +189,7 @@ export class RoleHandler {
}
let rewards: RewardInter[] = [];
let canReceiveId: number[] = [];
let role = await Role.findByRoleId(roleId, 'rankReceived');
let role = await RoleModel.findByRoleId(roleId, 'rankReceived');
for (let id of ids) {
let dicReward = gameData.generalRankReward.get(id);
@@ -205,7 +205,7 @@ export class RoleHandler {
canReceiveId.push(id);
}
role = await Role.receiveRankReward(roleId, canReceiveId);
role = await RoleModel.receiveRankReward(roleId, canReceiveId);
if (canReceiveId.length <= 0) return resResult(STATUS.REWARD_CONDITION_NOT_REACH);
let rewardStatus = canReceiveId.map(id => {
game-server/app/servers/role/handler/roleHandler.ts
+25 -25
View File
@@ -1,5 +1,5 @@
import { STATUS } from '../../../consts/statusCode';
import Role, { RoleUpdate } from './../../../db/Role';
import { RoleModel, RoleUpdate } from './../../../db/Role';
import { HeroModel, HeroType, HeroUpdate } from '../../../db/Hero';
import { resResult, decodeIdCntArrayStr, parseGoodStr, genCode } from '../../../pubUtils/util';
import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
@@ -48,14 +48,14 @@ export class RoleHandler {
let { roleName } = msg;
let role = await Role.findByRoleId(roleId, 'roleName hasInit title teraphs lv', true);
let role = await RoleModel.findByRoleId(roleId, 'roleName hasInit title teraphs lv', true);
if (role.hasInit) return resResult(STATUS.ROLE_HAS_INIT);
let checkName = await Role.checkName(roleName, serverId);
let checkName = await RoleModel.checkName(roleName, serverId);
if (checkName) return resResult(STATUS.NAME_HAS_USED);
let { resultHeroes: heroes } = await createHeroes(roleId, roleName, sid, serverId, DEFAULT_HEROES.map(hid => ({hid, count: 1})), { roleName, hasInit: true, title: role.title, teraphs: role.teraphs, lv: role.lv });
// role = await Role.updateRoleInfo(roleId, { roleName, hasInit: true }); // 在算战力的时候一起更新
// role = await RoleModel.updateRoleInfo(roleId, { roleName, hasInit: true }); // 在算战力的时候一起更新
session.set('roleName', roleName);
session.push('roleName', () => { });
@@ -74,7 +74,7 @@ export class RoleHandler {
async getRoleInfo(msg: { targetRoleId: string }, session: BackendSession) {
let { targetRoleId } = msg;
let { roleId, roleName, head = EXTERIOR.EXTERIOR_FACE, frame = EXTERIOR.EXTERIOR_FACECASE, spine = EXTERIOR.EXTERIOR_APPEARANCE, ce = 0, topLineup, topLineupCe = 0 } = await Role.findByRoleId(targetRoleId);
let { roleId, roleName, head = EXTERIOR.EXTERIOR_FACE, frame = EXTERIOR.EXTERIOR_FACECASE, spine = EXTERIOR.EXTERIOR_APPEARANCE, ce = 0, topLineup, topLineupCe = 0 } = await RoleModel.findByRoleId(targetRoleId);
return resResult(STATUS.SUCCESS, { roleId, roleName, head, frame, spine, ce, topLineup, topLineupCe });
}
@@ -85,7 +85,7 @@ export class RoleHandler {
const serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let { title } = role;
let titleInfo = getTitle(title + 1);
@@ -115,7 +115,7 @@ export class RoleHandler {
let serverId: number = session.get('serverId');
let role = await Role.findByRoleId(roleId, 'roleId teraphs gold coin');
let role = await RoleModel.findByRoleId(roleId, 'roleId teraphs gold coin');
let teraphs = role.teraphs;
let index = findIndex(teraphs, { id });
if (index < 0)
@@ -149,7 +149,7 @@ export class RoleHandler {
const serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let teraphs = role.teraphs;
let index = findIndex(teraphs, { id });
if (index < 0)
@@ -353,7 +353,7 @@ export class RoleHandler {
return resResult(STATUS.LINEUP_MAX);
}
let role = await Role.updateRoleInfo(roleId, { showLineup });
let role = await RoleModel.updateRoleInfo(roleId, { showLineup });
let r = new Rank(REDIS_KEY.SHOW_LINEUP, {});
await r.generParamAndSet(REDIS_KEY.SHOW_LINEUP, { roleId }, { role });
@@ -368,7 +368,7 @@ export class RoleHandler {
if(isGoodsHidden(id)) return resResult(STATUS.ITEM_IS_HIDDEN);
let role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
if (!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { heads } = role;
@@ -383,7 +383,7 @@ export class RoleHandler {
}
curHead.enable = true;
role = await Role.updateRoleInfo(roleId, { heads });
role = await RoleModel.updateRoleInfo(roleId, { heads });
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'head', value: id }]);
if(role.isGuildLeader) {
await updateUserInfo(REDIS_KEY.GUILD_INFO, guildCode, [{ field: 'leader', value: new GuildLeader(role) }]);
@@ -400,7 +400,7 @@ export class RoleHandler {
if(isGoodsHidden(id)) return resResult(STATUS.ITEM_IS_HIDDEN);
let role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
if (!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { frames } = role;
@@ -415,7 +415,7 @@ export class RoleHandler {
}
curFrame.enable = true;
role = await Role.updateRoleInfo(roleId, { frames });
role = await RoleModel.updateRoleInfo(roleId, { frames });
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'frame', value: id }]);
if(role.isGuildLeader) {
await updateUserInfo(REDIS_KEY.GUILD_INFO, guildCode, [{ field: 'leader', value: new GuildLeader(role) }]);
@@ -432,7 +432,7 @@ export class RoleHandler {
if(isGoodsHidden(id)) return resResult(STATUS.ITEM_IS_HIDDEN);
let role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
if (!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { spines } = role;
@@ -447,7 +447,7 @@ export class RoleHandler {
}
curSpine.enable = true;
role = await Role.updateRoleInfo(roleId, { spines });
role = await RoleModel.updateRoleInfo(roleId, { spines });
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'spine', value: id }]);
if(role.isGuildLeader) {
await updateUserInfo(REDIS_KEY.GUILD_INFO, guildCode, [{ field: 'leader', value: new GuildLeader(role) }]);
@@ -465,17 +465,17 @@ export class RoleHandler {
let sid = session.get('sid');
if(!roleName) return resResult(STATUS.WRONG_PARMS);
let checkName = await Role.checkName(roleName, serverId);
let checkName = await RoleModel.checkName(roleName, serverId);
if (checkName) return resResult(STATUS.NAME_HAS_USED);
let role = await Role.findByRoleId(roleId, 'renameCnt');
let role = await RoleModel.findByRoleId(roleId, 'renameCnt');
let costGold = role.renameCnt >= dicParam.NAMEPLATE.NAMEPLATE_FREECOST? dicParam.NAMEPLATE.NAMEPLATE_FEECOST: 0;
if(costGold > 0) {
let result = await handleCost(roleId, sid, [getGoldObject(costGold)], ITEM_CHANGE_REASON.RENAME);
if(!result) return resResult(STATUS.BATTLE_GOLD_NOT_ENOUGH);
}
role = await Role.incRoleInfo(roleId, { renameCnt: 1 }, { roleName });
role = await RoleModel.incRoleInfo(roleId, { renameCnt: 1 }, { roleName });
session.set('roleName', role.roleName);
session.push('roleName', () => { });
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'roleName', value: roleName }]);
@@ -498,7 +498,7 @@ export class RoleHandler {
if(ids == undefined || ids.length <= 0) {
return resResult(STATUS.WRONG_PARMS);
}
let role = await Role.saveGuide(roleId, ids);
let role = await RoleModel.saveGuide(roleId, ids);
return resResult(STATUS.SUCCESS, {
guide: role.guide
});
@@ -508,7 +508,7 @@ export class RoleHandler {
const roleId = session.get('roleId');
const { isClosePush } = msg;
let role = await Role.setPushMsgOpen(roleId, isClosePush);
let role = await RoleModel.setPushMsgOpen(roleId, isClosePush);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
return resResult(STATUS.SUCCESS, {
isClosePush: role.isClosePush
@@ -519,7 +519,7 @@ export class RoleHandler {
const roleId = session.get('roleId');
const { hasComment } = msg;
let role = await Role.setHasComment(roleId, hasComment);
let role = await RoleModel.setHasComment(roleId, hasComment);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
return resResult(STATUS.SUCCESS, {
hasComment: role.hasComment
@@ -581,7 +581,7 @@ export class RoleHandler {
}
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
if(role.hasInit) {
await deletRole(roleId);
@@ -598,7 +598,7 @@ export class RoleHandler {
let roleId = session.get('roleId');
let roleLvInfo = gameData.kingexp.get(lv - 1);
let role = await Role.updateRoleInfo(roleId, { lv, exp: roleLvInfo.sum });
let role = await RoleModel.updateRoleInfo(roleId, { lv, exp: roleLvInfo.sum });
return resResult(STATUS.SUCCESS, { lv: role.lv });
}
@@ -610,7 +610,7 @@ export class RoleHandler {
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
let role = await Role.updateRoleInfo(roleId, params);
let role = await RoleModel.updateRoleInfo(roleId, params);
return resResult(STATUS.SUCCESS, { role });
@@ -624,7 +624,7 @@ export class RoleHandler {
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let user = await UserModel.findUserByUid(role.userInfo.uid);
reportTAEvent(roleId, 'test', { serverId }, user.ip);
game-server/app/servers/role/handler/shopHandler.ts
+2 -2
View File
@@ -11,7 +11,7 @@ import { RewardInter } from "../../../pubUtils/interface";
import { UserShopTypeModel } from "../../../db/UserShopType";
import { nowSeconds } from "../../../pubUtils/timeUtil";
import { isGoodsHidden } from "../../../services/dataService";
import Role from './../../../db/Role';
import { RoleModel } from './../../../db/Role';
export default function(app: Application) {
return new ShopHandler(app);
@@ -86,7 +86,7 @@ export class ShopHandler {
userShop = await UserShopModel.purchase(roleId, roleName, activityId, dicShopItem, count, seasonNum);
if (!userShop || (userShop && userShop.count > totalCanBuyTimes)) {
// rollback 消耗
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
addItems(roleId, role.roleName, sid, cost, ITEM_CHANGE_REASON.SHOP_PURCHASE);
// rollback 购买次数
game-server/app/servers/role/handler/taskHandler.ts
+2 -2
View File
@@ -11,7 +11,7 @@ import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask,
import { TASK } from "../../../pubUtils/dicParam";
import { ActivityTaskPointModel, ActivityTaskPointModelType } from "../../../db/ActivityTaskPoint";
import { ItemInter, RewardInter } from "../../../pubUtils/interface";
import Role from "../../../db/Role";
import { RoleModel } from "../../../db/Role";
import { roleLevelup } from "../../../services/normalBattleService";
import _ = require("underscore");
import { addActvityTaskPoint } from "../../../services/activity/activityService";
@@ -333,7 +333,7 @@ export class ShopHandler {
let roleId = session.get('roleId');
let serverId = session.get('serverId');
let sid = session.get('sid');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let server = await ServerlistModel.findByServerId(serverId);
return resResult(STATUS.SUCCESS)
}