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

🐞 fix(巅峰演武): 当没有pvp数据时，登录也还是下发

Browse Source
This commit is contained in:
luying
2022-10-19 14:27:15 +08:00
parent 13650db78f
commit 83d1384794
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/connectorService.ts
+8 -5
View File
@@ -256,13 +256,14 @@ async function getTowerEntryData(role: RoleType) {
* @param roleId * @param roleId
*/ */
async function getPvpEntryData(roleId: string) { async function getPvpEntryData(roleId: string) {
let seasonNum: number = pinus.app.get('pvpSeasonNum');
let seasonEndTime: number = pinus.app.get('pvpSeasonEndTime');
let seasonStartTime: number = pinus.app.get('pvpSeasonStartTime');
let seasonRewardTime: number = pinus.app.get('pvpSeasonRewardTime');
let pvpDefense = await PvpDefenseModel.findByRoleId(roleId); let pvpDefense = await PvpDefenseModel.findByRoleId(roleId);
if (pvpDefense) { if (pvpDefense) {
pvpDefense = await sendLastSeasonRewardIfNotSent(pvpDefense); pvpDefense = await sendLastSeasonRewardIfNotSent(pvpDefense);
let seasonNum: number = pinus.app.get('pvpSeasonNum');
let seasonEndTime: number = pinus.app.get('pvpSeasonEndTime');
let seasonStartTime: number = pinus.app.get('pvpSeasonStartTime');
let seasonRewardTime: number = pinus.app.get('pvpSeasonRewardTime');
let result = new PvpDataReturn(); // 返回对象 let result = new PvpDataReturn(); // 返回对象
result.setPvpConfig(seasonNum, seasonStartTime, seasonEndTime, seasonRewardTime); result.setPvpConfig(seasonNum, seasonStartTime, seasonEndTime, seasonRewardTime);
@@ -273,7 +274,9 @@ async function getPvpEntryData(roleId: string) {
result.setChallengeCnt(challengeCnt); result.setChallengeCnt(challengeCnt);
return pick(result, ['challengeCnt', 'score', 'seasonWinNum', 'receivedBox', 'hasSaveDefense', 'seasonNum', 'seasonEndTime', 'seasonStartTime', 'seasonRewardTime']) return pick(result, ['challengeCnt', 'score', 'seasonWinNum', 'receivedBox', 'hasSaveDefense', 'seasonNum', 'seasonEndTime', 'seasonStartTime', 'seasonRewardTime'])
} else { } else {
return null let result = new PvpDataReturn(); // 返回对象
result.setPvpConfig(seasonNum, seasonStartTime, seasonEndTime, seasonRewardTime);
return pick(result, ['seasonNum', 'seasonEndTime', 'seasonStartTime', 'seasonRewardTime'])
} }
} }