AlasGG

2026-03-12 00:28:20 +08:00 · 2024-06-06 00:27:00 +08:00
parent abfbbe5064
commit 162ec3d14d
53 changed files with 4845 additions and 3671 deletions
--- a/module/gacha/ui.py
+++ b/module/gacha/ui.py
@@ -103,19 +103,6 @@ class GachaUI(UI):
    def _construct_bottom_navbar(self):
        """
        limited 4 options
-<<<<<<< HEAD
-            build.
-            limited_build.
-            orders.
-            shop.
-            retire.
-
-        regular 3 options
-            build.
-            orders.
-            shop.
-            retire.
-=======
            event.
            light.
            heavy.
@@ -125,7 +112,6 @@ class GachaUI(UI):
            light.
            heavy.
            special.
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
        """
        construct_bottom_navbar = ButtonGrid(
            origin=(262, 615), delta=(209, 0),