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/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, {