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/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 });