From 2521af3a55226c075484392273d127026ffb4ffe Mon Sep 17 00:00:00 2001
From: walkpan <panfudan0209@qq.com>
Date: Mon, 3 Feb 2025 22:36:14 +0800
Subject: [PATCH] dd

---
 assets/script/game/battle.meta        |  9 ----
 assets/script/game/map/MissionComp.ts | 59 ++++++++++++++++-----------
 2 files changed, 35 insertions(+), 33 deletions(-)
 delete mode 100644 assets/script/game/battle.meta

diff --git a/assets/script/game/battle.meta b/assets/script/game/battle.meta
deleted file mode 100644
index e56e8c8b..00000000
--- a/assets/script/game/battle.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "98ac6b4e-90c9-4719-bae3-a65982701915",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts
index 956c37d6..a116b588 100644
--- a/assets/script/game/map/MissionComp.ts
+++ b/assets/script/game/map/MissionComp.ts
@@ -21,7 +21,6 @@ import { UIID } from "../common/config/GameUIConfig";
 import { CardControllerComp } from "./CardController";
 import { MissionHomeComp } from "./MissionHomeComp";
 import { GameEvent } from "../common/config/GameEvent";
-import { BattleManager } from "../battle/BattleManager";
 const { ccclass, property } = _decorator;
 
 /** 视图层对象 */
@@ -69,32 +68,44 @@ export class MissionComp extends CCComp {
         // }
         // this.shuaxin(dt)
     } 
-    mission_start(missionId: number) {
-        // 初始化关卡数据
-        this.colose_victory();
-        this.mission_init();
-        
-        // 启动战斗（外部控制入口）
-        BattleManager.startBattle(smc.mission.lv);
-        
-        // 生成怪物和英雄
-        this.mon_refresh();
-        this.heros_call();
-
+    mission_start(){
+        /* todo   关卡设定完善*/
+        console.log("mission_start Missions mons:",Missions[smc.mission.lv])
+        this.colose_victory()
+        this.mission_init()
+        // this.mskill_init()
+        this.mon_refresh()
+        this.heros_call()
     }
 
-    mission_end() {
-        // 结束战斗（外部控制出口）
-        BattleManager.endBattle();
-        
-        // 更新游戏状态
-        oops.message.dispatchEvent(GameEvent.MissionEnd);
-        smc.mission.play = false;
-        
-        // 显示结算界面
-        this.open_victory();
+    mission_end(){
+        oops.message.dispatchEvent(GameEvent.MissionEnd)
+        smc.mission.play=false
+        smc.mission.pause=false
+        let heros:any= this.get_heros();;
+        let monsters:any= this.get_mons();
+        let hcards:any= ecs.query(ecs.allOf(HCardComp));
+        let rewards:any= ecs.query(ecs.allOf(ItemComp));
+        // let hcns=this.node.getChildByName("hcards")
+        // for(let i=0;i<hcns.children.length;i++){
+        //     hcns.children[i].destroy()
+        // }
+        for(let i=0;i<heros.length;i++){
+            heros[i].HeroView.reset()
+            heros[i].HeroView.ent.destroy()
+        }
+        for(let i=0;i<hcards.length;i++){
+            hcards[i].HCardComp.reset()
+            hcards[i].HCardComp.ent.destroy()
+        }
+        for(let i=0;i<monsters.length;i++){
+            monsters[i].HeroView.reset()
+            monsters[i].HeroView.ent.destroy()
+        }
+     
+        // this.to_mission_home()
+        this.open_victory()
     }
-
     open_victory(){
         this.node.getChildByName("victory").active=true
         this.node.getChildByName("victory").getComponent(VictoryComp).open()