修正部分錯誤

Author: IanDesuyo

utils/fetch_rank.py

@@ -126,12 +126,15 @@ async def nonplume(self):
                 self.logger.error(f"Error {name} ({id})")
 
             nonplume = {}
-            nonplume["pvp"] = row[cols["pvp"]]["v"]
-            nonplume["cb"] = row[cols["cb"]]["v"]
-            nonplume["preferRank"] = row[cols["preferRank"]]["v"] if row[cols["preferRank"]] else "-"
-            nonplume["preferRarity"] = row[cols["preferRarity"]]["v"]
-            nonplume["comment"] = row[cols["comment"]]["v"]
-            self.result[id]["nonplume"] = nonplume
+            try:
+                nonplume["pvp"] = row[cols["pvp"]]["v"]
+                nonplume["cb"] = row[cols["cb"]]["v"]
+                nonplume["preferRank"] = row[cols["preferRank"]]["v"] if row[cols["preferRank"]] else "-"
+                nonplume["preferRarity"] = row[cols["preferRarity"]]["v"]
+                nonplume["comment"] = row[cols["comment"]]["v"]
+                self.result[id]["nonplume"] = nonplume
+            except:
+                pass
 
         self.source["nonplume"] = f"https://docs.google.com/spreadsheets/d/{self.nonplume_sheet['key']}/htmlview"
 

utils/game_data.py

@@ -35,7 +35,7 @@ def get_featured_gacha_pickup(self) -> dict:
                 CASE a.rarity_odds WHEN 600000 THEN 1 ELSE 0 END rarity3_double
             FROM gacha_data a
             WHERE a.exchange_id != 0 AND a.gacha_times_limit10 != 1 AND (a.prizegacha_id != 0 OR a.gacha_bonus_id != 0) AND REPLACE(a.start_time, '/', '-') <= datetime('now', '+8 hours')
-            ORDER BY a.start_time DESC LIMIT 1
+            ORDER BY a.start_time DESC, a.gacha_bonus_id DESC LIMIT 1
             """,
         ).fetchone()
         data["unit_ids"] = [int(i[:4]) for i in data.get("unit_ids").split(",")]