xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

天梯返回数据中增加字段

Browse Source
This commit is contained in:
liangtongchuan
2020-10-19 15:38:35 +08:00
parent 81bce4f57b
commit 59e07eac0c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/towerBattleHandler.ts
+3 -3
View File
@@ -68,12 +68,12 @@ export class TowerBattleHandler {
async checkHangUpRewards(msg: {}, session: BackendSession) { async checkHangUpRewards(msg: {}, session: BackendSession) {
let roleId = session.get('roleId'); let roleId = session.get('roleId');
const { multi, timeReward } = await calcuHangUpReward(roleId); const { multi, timeReward, startTime } = await calcuHangUpReward(roleId);
if (multi == 0) { if (multi == 0) {
return resResult(STATUS.TOWER_HANG_UP_NOT_VALID); return resResult(STATUS.TOWER_HANG_UP_NOT_VALID);
} }
const rewards = decodeIdCntArrayStr(timeReward, multi); const rewards = decodeIdCntArrayStr(timeReward, multi);
return resResult(STATUS.SUCCESS, {rewards: Array.from(rewards, item => ({[item[0]]: item[1]}))}); return resResult(STATUS.SUCCESS, {startTime, rewards: Array.from(rewards, item => ({[item[0]]: item[1]}))});
} }
async recHangUpRewards(msg: {}, session: BackendSession) { async recHangUpRewards(msg: {}, session: BackendSession) {
@@ -85,7 +85,7 @@ export class TowerBattleHandler {
} }
const goods = await handleFixedReward(roleId, roleName, timeReward, multi); const goods = await handleFixedReward(roleId, roleName, timeReward, multi);
const newRec = await HangUpRecordModel.updateRec(roleId, roleName, endLv, endTime); const newRec = await HangUpRecordModel.updateRec(roleId, roleName, endLv, endTime);
return resResult(STATUS.SUCCESS, { goods, hangUpRec: newRec }); return resResult(STATUS.SUCCESS, { endTime, goods, hangUpRec: newRec });
} }
async hangUpSpeedUp(msg: {speedUpCnt: number}, session: BackendSession) { async hangUpSpeedUp(msg: {speedUpCnt: number}, session: BackendSession) {
game-server/app/services/battleService.ts
+2 -1
View File
@@ -102,7 +102,7 @@ async function startHangUp(roleId: string, roleName: string) {
export async function calcuHangUpReward(roleId: string, speedUp = false, speedUpCnt = 1, curTime = new Date()) { export async function calcuHangUpReward(roleId: string, speedUp = false, speedUpCnt = 1, curTime = new Date()) {
let { towerLv, hangUpSpdUpCnt, lastSpdUpTime } = await RoleModel.findByRoleId(roleId); let { towerLv, hangUpSpdUpCnt, lastSpdUpTime } = await RoleModel.findByRoleId(roleId);
let { startLv, startTime} = await HangUpRecordModel.getCurRec(roleId); let { startTime} = await HangUpRecordModel.getCurRec(roleId);
let towerInfo = getTowerDataByLv(towerLv - 1); // towerLv 是当前层，奖励计算按照已经通过的层，即上一层 let towerInfo = getTowerDataByLv(towerLv - 1); // towerLv 是当前层，奖励计算按照已经通过的层，即上一层
let multi = 1; // 结算奖励的倍数，受最大时间限制 let multi = 1; // 结算奖励的倍数，受最大时间限制
let multiReal = 1; // 距开始挂机实际过去的时间单位 let multiReal = 1; // 距开始挂机实际过去的时间单位
@@ -120,6 +120,7 @@ export async function calcuHangUpReward(roleId: string, speedUp = false, speedUp
} }
return { return {
endLv: towerLv - 1, endLv: towerLv - 1,
startTime,
endTime: new Date(startTime.getTime() + multiReal * HANG_UP_CONSTS.UNIT_TIME), endTime: new Date(startTime.getTime() + multiReal * HANG_UP_CONSTS.UNIT_TIME),
timeReward: towerInfo.timeReward, timeReward: towerInfo.timeReward,
multi multi