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