diff --git a/Assets/GameRes/Config/Audio/AudioCode.asset b/Assets/GameRes/Config/Audio/AudioCode.asset
index 9e9e81d..7e4cef3 100644
--- a/Assets/GameRes/Config/Audio/AudioCode.asset
+++ b/Assets/GameRes/Config/Audio/AudioCode.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 47b44627e5f34323bc394721daf7d29f, type: 3}
   m_Name: AudioCode
   m_EditorClassIdentifier: 
-  LobbyBgm: 
+  LobbyBgm: At the beginning
   FightBgm: 
   NormalBgm: 
   SE_Btn_Click: UI/Button/Water_Bow_Buff_01
diff --git a/Assets/GameRes/View/EndAboutPanel.prefab b/Assets/GameRes/View/EndAboutPanel.prefab
index c829cd3..2361c46 100644
--- a/Assets/GameRes/View/EndAboutPanel.prefab
+++ b/Assets/GameRes/View/EndAboutPanel.prefab
@@ -1421,7 +1421,7 @@ MonoBehaviour:
   table3: {fileID: 3970012542898596748}
   table4: {fileID: 4059678398121849229}
   _closeBtn: {fileID: 9180588384656380933}
-  BGM: 
+  BGM: In the End
 --- !u!1 &4964899364994535113
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Game/Component/EnemyEntity.cs b/Assets/Scripts/Game/Component/EnemyEntity.cs
index a1079eb..bbdd14a 100644
--- a/Assets/Scripts/Game/Component/EnemyEntity.cs
+++ b/Assets/Scripts/Game/Component/EnemyEntity.cs
@@ -250,7 +250,7 @@ namespace Game.Component
 
             if (this._curAttackCDTime > 0)
             {
-                _curAttackCDTime -= Time.deltaTime;
+                this._curAttackCDTime -= Time.deltaTime;
             }
 
             AttackCheck ();
diff --git a/Assets/Scripts/Game/Component/PropEffect_PoolObject.cs b/Assets/Scripts/Game/Component/PropEffect_PoolObject.cs
index fb4731f..db53495 100644
--- a/Assets/Scripts/Game/Component/PropEffect_PoolObject.cs
+++ b/Assets/Scripts/Game/Component/PropEffect_PoolObject.cs
@@ -20,7 +20,7 @@ namespace Game.Component
 
         private TimeHandler _timeHandler;
 
-        private void OnEnable ()
+        public override void Pool_Enable ()
         {
             this._timeHandler?.Kill ();
             if (!this.audioSetting.audioPath.IsNullOrWhitespace ())
@@ -28,9 +28,10 @@ namespace Game.Component
                 AudioManager.Instance.PlaySound (this.audioSetting.audioPath , this.audioSetting.volume);
             }
             this._timeHandler = GameUpdateMgr.Instance.CreateTimer (this.duration , this.DestroyPoolObject);
+            base.Pool_Enable ();
         }
 
-        private void OnDisable ()
+        public void Pool_OnDisable ()
         {
             this._timeHandler?.Kill ();
         }
diff --git a/Assets/Scripts/Game/FsmNode/GameFight.cs b/Assets/Scripts/Game/FsmNode/GameFight.cs
index 0ef2701..3399913 100644
--- a/Assets/Scripts/Game/FsmNode/GameFight.cs
+++ b/Assets/Scripts/Game/FsmNode/GameFight.cs
@@ -23,6 +23,7 @@ namespace Game.FsmNode
         public static string GroupName = typeof(GameFight).FullName;
         protected override async void OnEnter (params object[] args)
         {
+            UIManager.Instance.CloseView (UIPanel.GamePanel);
             UIManager.Instance.OpenView (UIPanel.GamePanel);
             CameraEffectUtils.Instance.SetAberration (0f , 0.5f);
             CameraEffectUtils.Instance.SetGameCamBlur (0f , 0.5f , null);
diff --git a/Assets/Scripts/System/StateSystem/State/StateRoom.cs b/Assets/Scripts/System/StateSystem/State/StateRoom.cs
index d98e149..1a0ebdc 100644
--- a/Assets/Scripts/System/StateSystem/State/StateRoom.cs
+++ b/Assets/Scripts/System/StateSystem/State/StateRoom.cs
@@ -68,7 +68,7 @@ namespace StateSystem.State
 
         private void PoolObjectPreload ()
         {
-            GamePoolManager.Instance.LoadPoolObjects("",RoomGroup , 5);
+            GamePoolManager.Instance.LoadPoolObjects("",RoomGroup , 0);
             // GamePoolManager.Instance.LoadPoolObjects("Object/",RoomGroup , 5);
         }
 
diff --git a/Assets/Scripts/Views/HomePanel.cs b/Assets/Scripts/Views/HomePanel.cs
index 419d9d6..4b3b847 100644
--- a/Assets/Scripts/Views/HomePanel.cs
+++ b/Assets/Scripts/Views/HomePanel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.StateSystem;
+using Framework.Audio;
 using Framework.UI;
 using Game;
 using Game.Component;
@@ -10,6 +11,7 @@ using MintAnimation.Runtime.Components.MintAnimation;
 using Script.Core.Utils.Extend;
 using StateSystem;
 using UnityEngine.Playables;
+using AudioType = Framework.Audio.AudioType;
 
 namespace Views{
 
@@ -78,6 +80,7 @@ namespace Views{
             this._playableDirector.stopped     += ToGaming;
             this._playableDirector.initialTime =  0;
             this._playableDirector.Play ();
+            AudioManager.Instance.StopPlayers (AudioType.BGM , 1f);
         }