Merge pull request #11 from Dante0909/fpgachafix

fix lb6 gacha fp
O-Isaac · Aug 10, 2023 · 79676f7 · 79676f7
2 parents 1eec9d8 + 161b594
commit 79676f7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/libs/GetSubGachaId.py b/libs/GetSubGachaId.py
@@ -8,10 +8,15 @@ def GetGachaSubIdFP(region):
     response = requests.get(f"https://git.atlasacademy.io/atlasacademy/fgo-game-data/raw/branch/{region}/master/mstGachaSub.json");
     gachaList = json.loads(response.text)
     timeNow = GetTimeStamp()
-
+    priority = 0
+    goodGacha = {}
     for gacha in gachaList:
         openedAt = gacha["openedAt"]
         closedAt = gacha["closedAt"]
 
         if openedAt <= timeNow & timeNow <= closedAt:
-            return str(gacha["id"])
+            p = int(gacha["priority"])
+            if(p > priority):
+                priority = p
+                goodGacha = gacha
+    return str(goodGacha["id"])