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

活动：弹出商店pvp改成score

Browse Source
This commit is contained in:
luying
2022-04-29 23:24:22 +08:00
parent 1401de6d6e
commit 11cdf9008f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/pvpHandler.ts
+1 -1
View File
@@ -276,7 +276,7 @@ export class PvpHandler {
let myRank = await r.getMyRank({ roleId }); let myRank = await r.getMyRank({ roleId });
result.setMyRank(myRank); result.setMyRank(myRank);
await checkTaskInPvpEnd(serverId, roleId, sid, isSuccess, pvpDefense.heroScores, myRank); await checkTaskInPvpEnd(serverId, roleId, sid, isSuccess, pvpDefense.heroScores, pvpDefense.score);
if(hisWinStreakNum < pvpDefense.hisWinStreakNum) { if(hisWinStreakNum < pvpDefense.hisWinStreakNum) {
await unlockFigure(sid, roleId, [{ type: FIGURE_UNLOCK_CONDITION.PVP_WIN_SERIES, paramWinStreakNum: pvpDefense.hisWinStreakNum }]); await unlockFigure(sid, roleId, [{ type: FIGURE_UNLOCK_CONDITION.PVP_WIN_SERIES, paramWinStreakNum: pvpDefense.hisWinStreakNum }]);
} }
game-server/app/services/task/taskService.ts
+3 -3
View File
@@ -201,14 +201,14 @@ export async function checkTaskInComBattleEnd(roleStatus: RoleStatus[], capId: s
} }
} }
export async function checkTaskInPvpEnd(serverId: number, roleId: string, sid: string, isSuccess: boolean, heroScores: HeroScores[], myRank: number) { export async function checkTaskInPvpEnd(serverId: number, roleId: string, sid: string, isSuccess: boolean, heroScores: HeroScores[], score: number) {
let task = new CheckTask(serverId, roleId); let task = new CheckTask(serverId, roleId);
task.setParam(TASK_TYPE.PVP_WIN, { isSuccess }); task.setParam(TASK_TYPE.PVP_WIN, { isSuccess });
task.setParam(TASK_TYPE.PVP_WIN_SERIES, { isSuccess }); task.setParam(TASK_TYPE.PVP_WIN_SERIES, { isSuccess });
task.setParam(TASK_TYPE.PVP_HERO_SCORE, { heroScores }); task.setParam(TASK_TYPE.PVP_HERO_SCORE, { heroScores });
await task.saveAndPush(sid); await task.saveAndPush(sid);
if(myRank) { if(score) {
checkPopUpCondition(serverId, roleId, POP_UP_SHOP_CONDITION_TYPE.PVP, { rank: myRank }, sid); checkPopUpCondition(serverId, roleId, POP_UP_SHOP_CONDITION_TYPE.PVP, { score }, sid);
} }
} }
shared/domain/activityField/popUpShopField.ts
+2 -2
View File
@@ -375,7 +375,7 @@ export class PopShopItem {
case POP_UP_SHOP_CONDITION_TYPE.MAIN_BATTLE: case POP_UP_SHOP_CONDITION_TYPE.MAIN_BATTLE:
return param.warId == this.conditionParam[0]; return param.warId == this.conditionParam[0];
case POP_UP_SHOP_CONDITION_TYPE.PVP: case POP_UP_SHOP_CONDITION_TYPE.PVP:
return param.rank <= this.conditionParam[0]; return param.score >= this.conditionParam[0];
case POP_UP_SHOP_CONDITION_TYPE.EQUIP_STAR: case POP_UP_SHOP_CONDITION_TYPE.EQUIP_STAR:
return param.equipStar >= this.conditionParam[0]; return param.equipStar >= this.conditionParam[0];
case POP_UP_SHOP_CONDITION_TYPE.AUCTION: case POP_UP_SHOP_CONDITION_TYPE.AUCTION:
@@ -445,7 +445,7 @@ export interface PopUpConditionParamInter {
newLv?: number; newLv?: number;
quality?: number; quality?: number;
warId?: number; warId?: number;
rank?: number; score?: number;
equipStar?: number; equipStar?: number;
} }