From 197fcb95182d69ae253c8e0b4a311255eb10b6c9 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Fri, 2 Jun 2023 11:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E5=9C=BA=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/module/battle/battle_manager.lua         | 16 +++++++++-------
 .../battle/controller/battle_controller.lua      |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lua/app/module/battle/battle_manager.lua b/lua/app/module/battle/battle_manager.lua
index 621beb99..b593a36f 100644
--- a/lua/app/module/battle/battle_manager.lua
+++ b/lua/app/module/battle/battle_manager.lua
@@ -46,13 +46,15 @@ function BattleManager:isInBattle()
 end
 
 function BattleManager:playBattle(battleType, params, returnFunc)
-    params = params or {}
-    if self.battleController then -- 同一时间只能有一场战斗
-        self:clear()
-    end
-    self.returnFunc = returnFunc
-    UIManager:stopCurrentBGM()
-    self:_play(battleType, params)
+    UIManager:showLoading(UIManager.LOADING_TYPE.CLOUD, function()
+        params = params or {}
+        if self.battleController then -- 同一时间只能有一场战斗
+            self:clear()
+        end
+        self.returnFunc = returnFunc
+        UIManager:stopCurrentBGM()
+        self:_play(battleType, params)
+    end)
 end
 
 function BattleManager:_play(battleType, params)
diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua
index 08e072ea..13abc9d3 100644
--- a/lua/app/module/battle/controller/battle_controller.lua
+++ b/lua/app/module/battle/controller/battle_controller.lua
@@ -434,6 +434,7 @@ function BattleController:getOtherSideTeam(side)
 end
 
 function BattleController:onLoadComplete()
+    UIManager:closeLoading()
     self:handleBuffs()
     self:battleStart()
 end