merge: resolve onmyoji_gacha conflicts

2026-05-11 22:32:13 +08:00
parent 7556352477 698b0ec93a
commit 3db17fc08b
19 changed files with 1941 additions and 1091 deletions
--- a/danding_bot/plugins/onmyoji_gacha/api_utils.py
+++ b/danding_bot/plugins/onmyoji_gacha/api_utils.py
@@ -249,4 +249,4 @@ async def process_achievement_reward(user_id: str, achievement_id: str) -> Tuple
                   f"获得奖励：蛋定助手{reward_type}一张\n"
                   f"⚠️自动加时失败: {message}\n"
                   f"请联系管理员手动领取奖励！")
-            return False, msg
+            return False, msg