From 13a137a6fd0e06c7b0b45a9a3a05229642e7eeb3 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Fri, 4 Aug 2023 15:16:19 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/module/battle/controller/battle_base_controller.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua
index 8b7136c7..587e2f0f 100644
--- a/lua/app/module/battle/controller/battle_base_controller.lua
+++ b/lua/app/module/battle/controller/battle_base_controller.lua
@@ -2215,7 +2215,7 @@ function BattleBaseController:shuffleBoard(callback)
     else
         self.resetList = table.clearOrCreate(self.resetList)
         for posId, entity in pairs(self.battleData:getGridEnties()) do
-            if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() then
+            if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() and not entity:getCantUpset() then
                 table.insert(self.resetList, entity)
             end
         end