提交

JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts

@@ -52,6 +52,8 @@ export default class GOnHookManager extends Singleton{
 
     //需要捕捉的宠物
     onHookCatchPets:TB.TbGRole[] = [];
+    //是否自动下一关
+    isAutoNext:boolean = false;
 
     //是否挂机
     _isOnHook:boolean = false;
@@ -98,8 +100,12 @@ export default class GOnHookManager extends Singleton{
     onSpawnSreeps = NGameUtil.ThrottleASync((async () => {
         let data = await GAPI.GOnHookSpawnCreeps();
         if(!data) return;
+        this._sreeps = new Map();
+        let ids = this.getKillSreepsIds();
         data.pets.forEach(pet => {
-            this._sreeps.set(pet.key,pet as GOnHookPet);
+            if(ids.indexOf(pet.key) < 0){
+                this._sreeps.set(pet.key,pet as GOnHookPet);
+            }
         })
     }).bind(this))
 
@@ -111,6 +117,11 @@ export default class GOnHookManager extends Singleton{
         return creeps;
     }
 
+    //获取已经死亡待处理的野怪Id列表
+    getKillSreepsIds(){
+        return this.killSreeps.map(item => item.key);
+    }
+
     //野怪死亡
     onKillSreeps(creeps:GOnHookPet){
 
@@ -176,6 +187,11 @@ export default class GOnHookManager extends Singleton{
         app.event.emit(GOnHookManagerEvent.RESET_DATA);
     }
 
+    //重置Sreeps
+    onResetSreeps(){
+        this._sreeps = new Map();
+    }
+
     //下一关
     async onNextLevel(){
         await GOnHookData.getIns().onNextLevel();
@@ -185,6 +201,8 @@ export default class GOnHookManager extends Singleton{
     //战胜当前关卡
     async onWinLevel(){
         await GOnHookData.getIns().onWinLevel();
+        //如果在自动挂机并且勾选上了自动下一关 则 自动下一关
+        if(this.isOnHook && this.isAutoNext && GOnHookData.getIns().isNextLevel) this.onNextLevel();
     }
 
     //切换场景
@@ -199,8 +217,8 @@ export default class GOnHookManager extends Singleton{
     onResetMap(){
         //通知地图已切换
         app.event.emit(GOnHookManagerEvent.UPDATE_MAP);
-        //重置数据
-        this.onResetData();
+        //重置Sreeps数据
+        this.onResetSreeps();
         //重置场景
         GBattleModeManager.getIns().Open(BattleMode.OnHook,true);
     }