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

🐞 fix(巅峰演武): 赛季结算条件修改

Browse Source 
当新玩家，或是未结算到的玩家进入时，结算弹出条件错误
This commit is contained in:
luying
2022-10-19 15:58:54 +08:00
parent f4a3695ba8
commit 1870673fbd
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/pvpHandler.ts
+3 -2
View File
@@ -46,9 +46,10 @@ export class PvpHandler {
if(!pvpDefense) { if(!pvpDefense) {
let role = await RoleModel.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 }); pvpDefense = await PvpDefenseModel.createPvpDefense(seasonNum, { serverId: role.serverId, roleId: role.roleId, roleName: role.roleName, role: role._id });
} else {
// 如果没有发过，将上赛季的奖励发下
pvpDefense = await sendLastSeasonRewardIfNotSent(pvpDefense);
} }
// 如果没有发过，将上赛季的奖励发下
pvpDefense = await sendLastSeasonRewardIfNotSent(pvpDefense);
let update: pvpUpdateInter = { }; let update: pvpUpdateInter = { };
let result = new PvpDataReturn(); // 返回对象 let result = new PvpDataReturn(); // 返回对象
game-server/app/services/pvpService.ts
+6 -6
View File
@@ -371,8 +371,8 @@ export async function comsumeChallengeCnt(challengeCnt: number, challengeRefTime
export async function sendLastSeasonRewardIfNotSent(pvpDefense: PvpDefenseType) { export async function sendLastSeasonRewardIfNotSent(pvpDefense: PvpDefenseType) {
let seasonSettleNum: number = pinus.app.get('pvpSettleSeasonNum'); let seasonSettleNum: number = pinus.app.get('pvpSettleSeasonNum');
console.log('##### sendLastSeasonRewardIfNotSent seasonSettleNum', seasonSettleNum) console.log('##### sendLastSeasonRewardIfNotSent seasonSettleNum', pvpDefense.roleId, pvpDefense.rankSeasonNum, seasonSettleNum)
if(seasonSettleNum && pvpDefense.score && !await checkHasSettled(seasonSettleNum, pvpDefense.roleId)) { if(seasonSettleNum && pvpDefense.rankSeasonNum < seasonSettleNum) {
let oldPvpCongig = await PVPConfigModel.findPVPConfig(seasonSettleNum); let oldPvpCongig = await PVPConfigModel.findPVPConfig(seasonSettleNum);
let result = await sendPVPRewardToUser(pvpDefense, seasonSettleNum, oldPvpCongig.seasonEndTime); let result = await sendPVPRewardToUser(pvpDefense, seasonSettleNum, oldPvpCongig.seasonEndTime);
pvpDefense = result.pvpDefense; pvpDefense = result.pvpDefense;
@@ -380,10 +380,10 @@ export async function sendLastSeasonRewardIfNotSent(pvpDefense: PvpDefenseType)
return pvpDefense; return pvpDefense;
} }
async function checkHasSettled(seasonSettleNum: number, roleId: string) { // async function checkHasSettled(seasonSettleNum: number, roleId: string) {
let hasData = await PvpSeasonResultModel.checkResultBySeasonNum(roleId, seasonSettleNum); // let hasData = await PvpSeasonResultModel.checkResultBySeasonNum(roleId, seasonSettleNum);
return hasData; // return hasData;
} // }
// 获取刷新对手次数及消耗 // 获取刷新对手次数及消耗
export function refreshRefOppCnt(pvpDefense: PvpDefenseType) { export function refreshRefOppCnt(pvpDefense: PvpDefenseType) {