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

名将擂台：修改时间精度和debug接口

Browse Source
This commit is contained in:
luying
2022-07-20 17:02:33 +08:00
parent 083201462e
commit cf03a7d4bd
6 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/ladderService.ts
+12 -5
View File
@@ -196,18 +196,25 @@ export function checkRank(myRank: number, targetRank: number) {
export async function getLadderOppStatus(ladderData: LadderMatchType, targetRoleId: string, myRank: number, rank: number) {
if(ladderData.rank != myRank) return { status: LADDER_OPP_STATUS.MY_RANK_CHANGE };
let { oppPlayers } = ladderData;
let curOppPlayer = oppPlayers.find(cur => cur.roleId == targetRoleId);
if(!curOppPlayer|| curOppPlayer.rank != rank) return { status: LADDER_OPP_STATUS.OPP_RANK_CHANGE };
let isRobot = targetRoleId.startsWith('robot');
if(curOppPlayer.isRobot) {
if(isRobot) {
if(rank <= 3000) {
let hisLadderData = await LadderMatchRecModel.checkByRank(ladderData.serverId, `robot${rank}`);
if(hisLadderData) return { status: LADDER_OPP_STATUS.OPP_RANK_CHANGE };
if(hisLadderData) return { status: LADDER_OPP_STATUS.OPP_IS_LOCKED };
let ladderMatch = await LadderMatchModel.isRankExist(rank);
if(ladderMatch) {
return { status: LADDER_OPP_STATUS.OPP_RANK_CHANGE };
}
}
return { status: LADDER_OPP_STATUS.BATTLE, isRobot: true };
} else {
let ladderMatch = await LadderMatchModel.findByRoleId(targetRoleId);
if(!ladderMatch || ladderMatch.rank != rank) {
return { status: LADDER_OPP_STATUS.OPP_RANK_CHANGE };
}
let hisLadderData = await LadderMatchModel.lock(ladderData.serverId, targetRoleId, rank);
if(!hisLadderData) return { status: LADDER_OPP_STATUS.OPP_IS_LOCKED };
game-server/app/services/timeTaskService.ts
+3 -3
View File
@@ -746,12 +746,12 @@ export async function setLadderCountDown(battleCode: string, time: number, statu
if(scheduledJobs[`ladder${battleCode}`]) {
scheduledJobs[`ladder${battleCode}`].cancel();
}
let endTime = time + (status == LADDER_STATUS.CHECK? LADDER.LADDER_BATTLE_PREPARE_COUNTDOWN: LADDER.LADDER_BATTLE_COUNTDOWN);
scheduleJob(`ladder${battleCode}`, endTime * 1000, async () => {
let endTime = time + (status == LADDER_STATUS.CHECK? LADDER.LADDER_BATTLE_PREPARE_COUNTDOWN: LADDER.LADDER_BATTLE_COUNTDOWN) * 1000;
scheduleJob(`ladder${battleCode}`, endTime, async () => {
await ladderTimeWillout(battleCode, status);
scheduledJobs[`ladder${battleCode}`].cancel();
scheduleJob(`ladder${battleCode}`, endTime * 1000 + LADDER_SERVER_GAP_TIME * 1000, async () => {
scheduleJob(`ladder${battleCode}`, endTime + LADDER_SERVER_GAP_TIME * 1000, async () => {
await ladderTimeout(battleCode, status);
scheduledJobs[`ladder${battleCode}`].cancel();
});