From 09e4b06ccd8f2d7cad47bbddac39bc21ed22eafa Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Thu, 1 Jun 2023 22:10:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/ui/battle/battle_box_open_ui.lua       | 17 +++++++++++++++++
 lua/app/ui/battle/cell/grid_cell.lua           |  2 ++
 lua/app/userdata/battle/battle_grid_entity.lua |  4 ++++
 3 files changed, 23 insertions(+)

diff --git a/lua/app/ui/battle/battle_box_open_ui.lua b/lua/app/ui/battle/battle_box_open_ui.lua
index ab386b4b..74ed4164 100644
--- a/lua/app/ui/battle/battle_box_open_ui.lua
+++ b/lua/app/ui/battle/battle_box_open_ui.lua
@@ -24,14 +24,31 @@ function BattleBoxOpenUI:onLoadRootComplete()
         self.rewardCell:refreshByConfig(reward)
     end
 
+    self.aniOver = false
     uiMap["battle_box_open_ui.mask"]:addClickListener(function()
+        if not self.aniOver then
+            return
+        end
         self:closeUI()
         if self.callback then
             self.callback()
         end
     end)
 
+    if self.seqAni then
+        self.seqAni:Kill()
+        self.seqAni = nil
+    end
+
+    local canvasGroup = uiMap["battle_box_open_ui.title_bg"]:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP)
+    canvasGroup.alpha = 0
     uiMap["battle_box_open_ui.title_bg.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_11))
+    uiMap["battle_box_open_ui.ui_spine_obj"]:playAnim("born", false, true)
+    self.seqAni = self.root:createBindTweenSequence()
+    self.seqAni:Insert(0.75, canvasGroup:DOFade(1, 0.5))
+    self.seqAni:AppendCallback(function()
+        self.aniOver = true
+    end)
 end
 
 return BattleBoxOpenUI
\ No newline at end of file
diff --git a/lua/app/ui/battle/cell/grid_cell.lua b/lua/app/ui/battle/cell/grid_cell.lua
index 3fee2761..198bb43a 100644
--- a/lua/app/ui/battle/cell/grid_cell.lua
+++ b/lua/app/ui/battle/cell/grid_cell.lua
@@ -32,6 +32,8 @@ function GridCell:refresh(gridEntity, curElement, skillPosId)
         local spineObj = uiMap["grid_cell.touch_node.ani_node.up_bg.ui_spine_obj"]
         local upBg = uiMap["grid_cell.touch_node.ani_node.up_bg"]
         if gridEntity:getSpineAsset() then
+            local scale = gridEntity:getSpineScale()
+            spineObj:setLocalScale(scale, scale, scale)
             spineObj:setActive(true)
             spineObj:loadAssetAsync(gridEntity:getSpineAsset(), function()
                 if gridEntity:getSpineChangeName() then
diff --git a/lua/app/userdata/battle/battle_grid_entity.lua b/lua/app/userdata/battle/battle_grid_entity.lua
index 9984e0e7..d47393ab 100644
--- a/lua/app/userdata/battle/battle_grid_entity.lua
+++ b/lua/app/userdata/battle/battle_grid_entity.lua
@@ -406,4 +406,8 @@ function BattleGridEntity:getSpineChangeName()
     return self:getGridTypeConfig().spine_change
 end
 
+function BattleGridEntity:getSpineScale()
+    return self:getGridTypeConfig().zoom or 1
+end
+
 return BattleGridEntity
\ No newline at end of file