From 94128b05ca5c782a0a2b9e68438860abe2dea768 Mon Sep 17 00:00:00 2001
From: panw <panfudan0209@qq.com>
Date: Fri, 6 Jun 2025 16:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BC=80=E5=A7=8B=20?=
 =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/script/game/map/EquipsComp.ts  | 139 ++++++++++++++------------
 assets/script/game/map/MissionComp.ts |   3 +-
 2 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/assets/script/game/map/EquipsComp.ts b/assets/script/game/map/EquipsComp.ts
index 788935c3..aefada8e 100644
--- a/assets/script/game/map/EquipsComp.ts
+++ b/assets/script/game/map/EquipsComp.ts
@@ -14,83 +14,92 @@ const { ccclass, property } = _decorator;
 @ecs.register('EquipsComp', false)
 export class EquipsCompComp extends CCComp {
     
-    weapon:any={
-        uuid:0,
-        name:"weapon",
-        type:"weapon",
-        level:0,
-        quality:0,
-        
-        skill_uuid:0,
-        skill_name:"skill1",
-        skill_type:0,
-        cd:0,
-        cd_time:0,
-    }
-    armor:any={
-        uuid:0,
-        name:"armor",
-        type:"armor",
-        level:0,
-        quality:0,
-        skill_uuid:0,
-        skill_name:"skill1",
-        skill_type:0,
-        cd:0,
-        cd_time:0,
-    }
-    ring:any={
-        uuid:0,
-        name:"ring",
-        type:"ring",
-        level:0,
-        quality:0,
-        skill_uuid:0,
-        skill_name:"skill1",
-        skill_type:0,
-        cd:0,
-        cd_time:0,
-    }
-    skill1:any={
-        uuid:0,
-        name:"skill1",
-        type:0, //1 被动 0 主动
-        level:0,
-        quality:0,
-        cd:0,
-        cd_time:0,
-    }
-    skill2:any={
-        uuid:0,
-        name:"skill2",
-        type:0,//
-        level:0,
-        quality:0,
-        cd:0,
-        cd_time:0,
-    }
-    skill3:any={
-        uuid:0,
-        name:"skill3",
-        type:0,//
-        level:0,
-        quality:0,
-        cd:0,
-        cd_time:0,
-    }
+    weapon:any=null
+    armor:any=null
+    ring:any=null
+    skill1:any=null
+    skill2:any=null
+    skill3:any=null
     boxs:Node=null
     /** 视图层逻辑代码分离演示 */
     onLoad() {
         this.on(GameEvent.UseSkillCard, this.get_skill, this);
+        this.on(GameEvent.FightReady,this.fight_ready,this)
+        this.boxs=this.node.getChildByName("boxs")
     }
     start(){
-        this.boxs=this.node.getChildByName("boxs")
+        this.fight_ready()
+    }
+    fight_ready(){
         this.boxs.getChildByName("skill1").getChildByName("icon").active=false
         this.boxs.getChildByName("skill2").getChildByName("icon").active=false
         this.boxs.getChildByName("skill3").getChildByName("icon").active=false
         this.boxs.getChildByName("weapon").getChildByName("icon").active=false
         this.boxs.getChildByName("armor").getChildByName("icon").active=false
         this.boxs.getChildByName("ring").getChildByName("icon").active=false
+        this.weapon={
+            uuid:0,
+            name:"weapon",
+            type:"weapon",
+            level:0,
+            quality:0,
+            skill_uuid:0,
+            skill_name:"skill1",
+            skill_type:0,
+            cd:0,
+            cd_time:0,
+        }
+        this.armor={
+            uuid:0,
+            name:"armor",
+            type:"armor",
+            level:0,
+            quality:0,
+            skill_uuid:0,
+            skill_name:"skill1",
+            skill_type:0,
+            cd:0,
+            cd_time:0,
+        }
+        this.ring={
+            uuid:0,
+            name:"ring",
+            type:"ring",
+            level:0,
+            quality:0,
+            skill_uuid:0,
+            skill_name:"skill1",
+            skill_type:0,
+            cd:0,
+            cd_time:0,
+        }
+        this.skill1={
+            uuid:0,
+            name:"skill1",
+            type:0, //1 被动 0 主动
+            level:0,
+            quality:0,
+            cd:0,
+            cd_time:0,
+        }
+        this.skill2={
+            uuid:0,
+            name:"skill2",
+            type:0,//
+            level:0,
+            quality:0,
+            cd:0,
+            cd_time:0,
+        }
+        this.skill3={
+            uuid:0,
+            name:"skill3",
+            type:0,//
+            level:0,
+            quality:0,
+            cd:0,
+            cd_time:0,
+        }
     }
     update(dt: number): void {
         if(!smc.mission.play||smc.mission.pause) return
diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts
index f9356a55..f4b8f150 100644
--- a/assets/script/game/map/MissionComp.ts
+++ b/assets/script/game/map/MissionComp.ts
@@ -52,6 +52,7 @@ export class MissionComp extends CCComp {
 
     async mission_start(){
         smc.mission.status=MissionStatus.ready
+        oops.message.dispatchEvent(GameEvent.FightReady)
         this.node.active=true
         this.data_init()
         this.hart_hero_load()
@@ -79,7 +80,7 @@ export class MissionComp extends CCComp {
                 break
             case MissionStatus.ready_hero_select:
                 console.log("netx to_fight")
-                    this.to_fight()
+                this.to_fight()
                 break
             case MissionStatus.playing:
                 break