From 2f73cc010cc4c0b0d734148630d87d68bfbccbc8 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 22 Feb 2023 14:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E9=81=97=E8=BF=B9?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AF=B9=E6=89=8B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/gvg/gvgFightService.ts | 2 +-
 game-server/app/services/ladderService.ts       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/game-server/app/services/gvg/gvgFightService.ts b/game-server/app/services/gvg/gvgFightService.ts
index 0b8b0036d..e3c8bec12 100644
--- a/game-server/app/services/gvg/gvgFightService.ts
+++ b/game-server/app/services/gvg/gvgFightService.ts
@@ -86,7 +86,7 @@ export function refreshVestigeOppRanks(rank: number) {
     let beforeRanks = randomRank(rangeBeforeFrom == -1? rank: rangeBeforeFrom, rangeBeforeTo == -1? rank: rangeBeforeTo, rangeBeforeNum);
     let afterRanks = randomRank(rangeAfterFrom == -1? rank: rangeAfterFrom, rangeAfterTo == -1? rank: rangeAfterTo, rangeAfterNum);
 
-    let topRanks = getNumberArr(dicRange.topChallengeFrom + 1, dicRange.topChallengeTo);
+    let topRanks = getNumberArr(dicRange.topChallengeFrom, dicRange.topChallengeTo);
     let ranks = [...topRanks, ...beforeRanks, ...afterRanks];
     return uniqueArr(ranks.sort((a, b) => a - b));
 }
diff --git a/game-server/app/services/ladderService.ts b/game-server/app/services/ladderService.ts
index e11f44ee6..b4a55d991 100644
--- a/game-server/app/services/ladderService.ts
+++ b/game-server/app/services/ladderService.ts
@@ -161,7 +161,9 @@ export function uniqueArr<T>(arr: T[]) {
 
 export function getNumberArr(from: number, to: number) {
     let arr: number[] = [];
-    for(let i = from; i <= to; i++) arr.push(i);
+    for(let i = from; i <= to; i++) {
+        if(i > 0) arr.push(i);
+    }
     return arr;
 }