From 7fc5a76f18243dc948dfc5825ca4bbefc3239b50 Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Thu, 24 Dec 2020 16:45:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=B8=E6=88=8F=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B/=E7=BB=93=E6=9D=9F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/BattleHandler.ts | 7 ++++++-
 src/rooms/logic/Handler/PetHandler.ts    | 6 ++++--
 src/rooms/logic/Handler/PlayerHandler.ts | 5 ++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index c646dbc..57d57f9 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -560,7 +560,12 @@ export class BattleHandler {
      * 一局游戏结束
      */
     public onGameEnd(){
-
+        this._players.forEach((item: PlayerHandler) => {
+            item.clear(true);
+        });
+        this._players.clear();
+        this._playerids.clear();
+        this._gamestart = false;
     };
     // end--------------------------------------------------
 
diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts
index 27a00a8..e378454 100644
--- a/src/rooms/logic/Handler/PetHandler.ts
+++ b/src/rooms/logic/Handler/PetHandler.ts
@@ -379,11 +379,13 @@ export class PetHandler {
         return this._rebornskill != null && !this._isSilent && !this._hasreborned;
     };
 
-    public clear(){
+    public clear(resetAll: boolean = false){
         if(this._halos.length > 0){
             this._halos.length = 0;
             this.clearEffHalos();
-            this._owner.onHaloRemove(this);
+            if(!resetAll){
+                this._owner.onHaloRemove(this);
+            }
         }
         this._waitskills.length = 0;
     };
diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index cf330df..9348d53 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -45,8 +45,11 @@ export class PlayerHandler {
         this._unitcfg = this._playercfg && CfgMan.findUnitCfg(this._playercfg.herounit_id);
     };
 
-    public clear(){
+    public clear(bresetAll: boolean = false){
         this._self = null;
+        this._pets.forEach((item: PetHandler)=>{
+            item.clear(bresetAll);
+        });
         this._pets.length = 0;
     };