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

pvp：巅峰之路

Browse Source
This commit is contained in:
luying
2022-05-25 10:03:53 +08:00
parent eec9de2fc6
commit 79293c5a4a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
game-server/app/services/connectorService.ts
View File

@@ -35,7 +35,7 @@ import { getAllOnlineRoles, getAllServers } from './redisService';
import Item, { ItemModel } from '../db/Item';
import { PvpDefenseModel } from '../db/PvpDefense';
import { getDonation } from './donateService';
import { refChallengeCnt } from './pvpService';
import { refChallengeCnt, sendLastSeasonRewardIfNotSent } from './pvpService';
import { HeroModel } from '../db/Hero';
import { JewelModel } from '../db/Jewel';
import { SkinModel } from '../db/Skin';
@@ -248,12 +248,14 @@ async function getTowerEntryData(role: RoleType) {
async function getPvpEntryData(roleId: string) {
let pvpDefense = await PvpDefenseModel.findByRoleId(roleId);
if (pvpDefense) {
let seasonEndTime = pinus.app.get('pvpSeasonEndTime');
pvpDefense = await sendLastSeasonRewardIfNotSent(pvpDefense);
let seasonNum: number = pinus.app.get('pvpSeasonNum');
let seasonEndTime: number = pinus.app.get('pvpSeasonEndTime');
let refChallengeObj = await refChallengeCnt(pvpDefense.challengeCnt, pvpDefense.challengeRefTime, seasonEndTime, roleId);
let { challengeCnt } = refChallengeObj;
let { receivedBox, score, hisScore } = pvpDefense;
let { receivedBox, score, seasonWinNum } = pvpDefense;
return { challengeCnt, score, hisScore, receivedBox }
return { challengeCnt, score, seasonWinNum, receivedBox, seasonNum, seasonEndTime }
} else {
return null
}

2
game-server/app/services/pvpService.ts
View File

@@ -387,7 +387,7 @@ export function getRobotAttribute(hid: number, posRatio: number, score: number)
// 获取我方战报记录
export async function generMyRecInfo(pvpDefense: PvpDefenseType, role: RoleType, isSuccess: boolean, pos: number, myHeroes: pvpEndParamInter[]) {
let { attack, defense, heroScores, winStreakNum, hisWinStreakNum = 0, score, hisScore, seasonWinNum } = pvpDefense;
let { attack, defense, heroScores, winStreakNum, hisWinStreakNum = 0, score, hisScore, seasonWinNum = 0 } = pvpDefense;
let { roleId } = role;
if (isSuccess) {
winStreakNum ++;