fixbug:解决抢答和获取任务的问题

game_task/game_task_encyclopedia.py

@@ -103,14 +103,14 @@ def start_game(group_id, player_id, player_name="未知玩家"):
         conn.close()
 
 
-# 随机分配任务
+# 随机分配任务（支持指定玩家）
-def assign_random_task(group_id):
+def assign_random_task(group_id, player_id=None):
     conn = get_db_connection()
     cursor = conn.cursor()
     try:
         # 获取当前群聊的玩家列表
-        cursor.execute("SELECT player_id FROM t_encyclopedia_players WHERE group_id = %s", (group_id,))
+        cursor.execute("SELECT player_id, player_name FROM t_encyclopedia_players WHERE group_id = %s", (group_id,))
-        players = [row['player_id'] for row in cursor.fetchall()]
+        players = cursor.fetchall()
         if not players:
             return (
                 f"😔 哎呀，群 {group_id} 好安静\n"
@@ -118,6 +118,23 @@ def assign_random_task(group_id):
                 f"🎈 快叫朋友来玩吧！"
             )
 
+        # 如果指定了 player_id，检查其是否在群聊中
+        if player_id:
+            player_dict = {p['player_id']: p['player_name'] for p in players}
+            if player_id not in player_dict:
+                return (
+                    f"😅 嘿，小朋友\n"
+                    f"🌟 ID: {player_id} 还没加入群 {group_id}\n"
+                    f"🎈 用 /start 先报名吧！"
+                )
+            holder_id = player_id
+            holder_name = player_dict[player_id]
+        else:
+            # 未指定 player_id 时，随机选择
+            holder = random.choice(players)
+            holder_id = holder['player_id']
+            holder_name = holder['player_name']
+
         # 使用内部方法获取任务
         task = game_question_json("请从不同的学科领域(历史学：古代历史、近现代史、战争与政治、文化遗产与考古学；生物学：进化论、动植物学、基因与遗传学、生态学；化学：有机化学、无机化学、生物化学、环境化学；地理学：人文地理、自然地理、地质学、气候变化；文学：古典文学、现代文学、小说与戏剧、诗歌与散文；艺术：美术、音乐、戏剧与舞蹈、电影与媒体；哲学：西方哲学、东方哲学、道德与伦理学、逻辑与认识论；社会学：人类学、心理学、政治学、经济学；计算机科学：编程语言、人工智能、数据科学、网络与安全；工程学：机械工程、电气工程、化学工程、土木工程；医学：解剖学、生理学、临床医学、药学与护理；体育：球类运动、奥林匹克运动、运动心理学、健身与营养；宗教与神话：世界宗教、神话与民间故事、宗教哲学；语言学：语法与词汇、语言习得、方言与语言变异；经济学：宏观经济学、微观经济学、国际贸易、金融与投资；法律：民法与刑法、国际法、知识产权法、环境法)生成一个全新问题。")
 
@@ -126,26 +143,30 @@ def assign_random_task(group_id):
         score = int(task["score"])
         description = task.get("description", "")
 
-        # 分配给随机玩家
+        # 插入任务
-        holder_id = random.choice(players)
         cursor.execute(
             "INSERT INTO t_encyclopedia_active_tasks (group_id, question, answer, score, description, holder_id) VALUES (%s, %s, %s, %s, %s, %s)",
             (group_id, question, answer, score, description, holder_id)
         )
         conn.commit()
 
-        # 获取分配的任务ID和持有者名称
+        # 获取分配的任务ID
         cursor.execute(
             "SELECT active_task_id FROM t_encyclopedia_active_tasks WHERE group_id = %s AND question = %s AND holder_id = %s ORDER BY assigned_at DESC LIMIT 1",
             (group_id, question, holder_id)
         )
         active_task_id = cursor.fetchone()['active_task_id']
-        cursor.execute(
-            "SELECT player_name FROM t_encyclopedia_players WHERE group_id = %s AND player_id = %s",
-            (group_id, holder_id)
-        )
-        holder_name = cursor.fetchone()['player_name']
 
+        # 根据是否指定玩家，返回不同消息
+        if player_id:
+            return (
+                f"🎁 {holder_name}，你的新任务来啦！\n"
+                f"🎈 问题：{question}\n"
+                f"🌈 群 {group_id} 等你作答\n"
+                f"🎀 任务ID: task_{active_task_id}\n"
+                f"🌼 积分：{score}"
+            )
+        else:
             return (
                 f"🎁 新任务来啦！\n"
                 f"🌟 幸运玩家：{holder_name} \n"
@@ -220,9 +241,7 @@ def submit_answer(group_id, player_id, task_id, answer):
         # 调用内部方法校验答案
         answer_json = {"question": question, "top_score": str(top_score), "answer": answer}
         result = game_answer_json(answer_json)
-        user_answer = answer.strip().lower()
         points = int(result["score"])
-        correct_answer = result["answer"].lower()
         description = result["description"]
         is_correct = points > 0
 
@@ -261,7 +280,7 @@ def submit_answer(group_id, player_id, task_id, answer):
                 f"😅 {player_name} 有点小遗憾！\n"
                 f"🌼 任务：{question}\n"
                 f"🎈 你答：{answer}\n"
-                f"🌟 正确答案：{correct_answer}\n"
+                f"🌟 正确答案：{correct_answer_db}\n"
                 f"🌈 扣 1 分，别灰心！\n"
                 f"🎀 提示：{description}"
             )
@@ -379,7 +398,7 @@ def run_random_task_assignment(group_id):
     if current_hour >= 23 or current_hour < 9:  # 排除23:00-08:00
         print(f"{datetime.now()} 群 {group_id} 当前时间 {current_hour}:00 在23:00-08:00区间，跳过任务发放")
         return
-    result = assign_random_task(group_id)
+    result = assign_random_task(group_id)  # 不传入 player_id，保持随机
     print(f"{datetime.now()} {result}")
 
 
@@ -414,7 +433,7 @@ def game_process_message(group_id, player_id, message, player_name="未知玩家
                 f"🌙 太晚啦，小伙伴们休息中\n"
                 f"🌞 9点到22点再来玩吧！"
             )
-        return assign_random_task(group_id)
+        return assign_random_task(group_id, player_id)  # 传入 player_id
     else:
         return (
             f"😄 嘿，小调皮\n"