From 534067f5660a69c0452fd4452e8d98278c5fa4af Mon Sep 17 00:00:00 2001
From: walkpan <panfudan0209@qq.com>
Date: Tue, 6 Jan 2026 10:47:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B8=B8=E6=88=8F=E9=80=BB=E8=BE=91):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=B1=E9=9B=84=E5=88=9D=E5=A7=8B=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E5=92=8C=E5=A5=96=E5=8A=B1=E8=A7=A6=E5=8F=91=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将SingletonModuleComp中英雄初始等级从0改为1，避免可能的逻辑错误。在MissionComp中重构奖励触发逻辑，将call_cards方法提取为独立函数并在to_fight中调用，确保战斗开始时正确触发当前等级的奖励。
---
 .../script/game/common/SingletonModuleComp.ts   |  2 +-
 assets/script/game/map/MissionComp.ts           | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts
index 7c0968ea..34d1ce68 100644
--- a/assets/script/game/common/SingletonModuleComp.ts
+++ b/assets/script/game/common/SingletonModuleComp.ts
@@ -109,7 +109,7 @@ export class SingletonModuleComp extends ecs.Comp {
             path:'',
             as:0,
             type:0,
-            lv:0,
+            lv:1,
             exp:0,
             exp_max:100,
             exp_pre:0,
diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts
index 91909b99..e9982727 100644
--- a/assets/script/game/map/MissionComp.ts
+++ b/assets/script/game/map/MissionComp.ts
@@ -54,9 +54,16 @@ export class MissionComp extends CCComp {
     // 升级奖励触发
     onLevelUp(event: string, args: any) {
         console.log(`[MissionComp] 英雄升级到 ${args.lv} 级!`);
-        
+        this.call_cards(args.lv)
         // 获取当前等级对应的奖励类型
-        const rewardType = getLevelRewardType(args.lv);
+        
+       
+
+        // 触发奖励选择界面 (暂时留空)
+        // this.showLevelUpReward();
+    }
+    call_cards(lv:number){
+        const rewardType = getLevelRewardType(lv);
         console.log(`[MissionComp] 触发奖励选择, 类型: ${rewardType}`);
 
         // 根据类型发送对应的事件
@@ -78,11 +85,7 @@ export class MissionComp extends CCComp {
                 oops.message.dispatchEvent(GameEvent.TalentSelect); // 默认回退到天赋选择
                 break;
         }
-
-        // 触发奖励选择界面 (暂时留空)
-        // this.showLevelUpReward();
     }
-    
     showLevelUpReward() {
         // TODO: 显示三选一技能/属性奖励界面
         console.log("[MissionComp] 显示升级奖励界面 (TODO)");
@@ -171,7 +174,7 @@ export class MissionComp extends CCComp {
     to_fight(){
         smc.mission.in_fight=true
         oops.message.dispatchEvent(GameEvent.FightStart) //GameSetMonComp 监听刷怪
-        oops.message.dispatchEvent(GameEvent.TalentSelect)
+        this.call_cards(smc.vmdata.hero.lv)
     }