Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

2023-05-30 15:33:04 +08:00 · 2023-05-30 15:33:04 +08:00 · 1c4589843c
commit 1c4589843c
parent 5d7771fd87 27d3a92769
26 changed files with 170 additions and 240 deletions
--- a/lua/app/config/chapter.lua
+++ b/lua/app/config/chapter.lua
@ -4311,7 +4311,7 @@ local chapter = {
 		["before_chapter"]=21,
 		["next_chapter"]=23,
 		["icon"]="chapter_10",
-		["scene"]="bg_20",
+		["scene"]="bg_21",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -4530,7 +4530,7 @@ local chapter = {
 		["before_chapter"]=22,
 		["next_chapter"]=24,
 		["icon"]="chapter_9",
-		["scene"]="bg_20",
+		["scene"]="bg_22",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -4749,7 +4749,7 @@ local chapter = {
 		["before_chapter"]=23,
 		["next_chapter"]=25,
 		["icon"]="chapter_10",
-		["scene"]="bg_20",
+		["scene"]="bg_23",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -4968,7 +4968,7 @@ local chapter = {
 		["before_chapter"]=24,
 		["next_chapter"]=26,
 		["icon"]="chapter_9",
-		["scene"]="bg_20",
+		["scene"]="bg_23",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -5187,7 +5187,7 @@ local chapter = {
 		["before_chapter"]=25,
 		["next_chapter"]=27,
 		["icon"]="chapter_10",
-		["scene"]="bg_20",
+		["scene"]="bg_24",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -5406,7 +5406,7 @@ local chapter = {
 		["before_chapter"]=26,
 		["next_chapter"]=28,
 		["icon"]="chapter_9",
-		["scene"]="bg_20",
+		["scene"]="bg_24",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -5625,7 +5625,7 @@ local chapter = {
 		["before_chapter"]=27,
 		["next_chapter"]=29,
 		["icon"]="chapter_10",
-		["scene"]="bg_20",
+		["scene"]="bg_24",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -5844,7 +5844,7 @@ local chapter = {
 		["before_chapter"]=28,
 		["next_chapter"]=30,
 		["icon"]="chapter_9",
-		["scene"]="bg_20",
+		["scene"]="bg_25",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -6062,7 +6062,7 @@ local chapter = {
 	[30]={
 		["before_chapter"]=29,
 		["icon"]="chapter_10",
-		["scene"]="bg_20",
+		["scene"]="bg_25",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
 		["board"]={
--- a/lua/app/config/chapter_daily_challenge.lua
+++ b/lua/app/config/chapter_daily_challenge.lua
@ -243,10 +243,10 @@ local chapter_daily_challenge = {
 		["scene"]="bg_2",
 		["chess_board"]="chessboard_2",
 		["chapter_board_daily_challenge"]={
-			23,
-			24,
-			25,
-			26
+			1,
+			2,
+			3,
+			4
 		},
 		["monster"]={
 			11101,
@ -483,10 +483,10 @@ local chapter_daily_challenge = {
 		["scene"]="bg_3",
 		["chess_board"]="chessboard_2",
 		["chapter_board_daily_challenge"]={
-			39,
-			40,
-			41,
-			42
+			5,
+			6,
+			7,
+			8
 		},
 		["monster"]={
 			19101,
@ -723,10 +723,10 @@ local chapter_daily_challenge = {
 		["scene"]="bg_4",
 		["chess_board"]="chessboard_2",
 		["chapter_board_daily_challenge"]={
-			55,
-			56,
-			57,
-			58
+			9,
+			10,
+			1,
+			2
 		},
 		["monster"]={
 			27101,
@ -963,10 +963,10 @@ local chapter_daily_challenge = {
 		["scene"]="bg_5",
 		["chess_board"]="chessboard_2",
 		["chapter_board_daily_challenge"]={
-			71,
-			72,
-			73,
-			74
+			3,
+			4,
+			5,
+			6
 		},
 		["monster"]={
 			35101,
@ -1203,10 +1203,10 @@ local chapter_daily_challenge = {
 		["scene"]="bg_6",
 		["chess_board"]="chessboard_2",
 		["chapter_board_daily_challenge"]={
-			87,
-			88,
-			89,
-			90
+			7,
+			8,
+			9,
+			10
 		},
 		["monster"]={
 			43101,
@ -1443,10 +1443,10 @@ local chapter_daily_challenge = {
 		["scene"]="bg_7",
 		["chess_board"]="chessboard_2",
 		["chapter_board_daily_challenge"]={
-			103,
-			104,
-			105,
-			106
+			1,
+			2,
+			3,
+			4
 		},
 		["monster"]={
 			51101,
@ -1683,10 +1683,10 @@ local chapter_daily_challenge = {
 		["scene"]="bg_1",
 		["chess_board"]="chessboard_2",
 		["chapter_board_daily_challenge"]={
-			39,
-			40,
-			41,
-			42
+			5,
+			6,
+			7,
+			8
 		},
 		["monster"]={
 			19101,
@ -1923,10 +1923,10 @@ local chapter_daily_challenge = {
 		["scene"]="bg_2",
 		["chess_board"]="chessboard_2",
 		["chapter_board_daily_challenge"]={
-			55,
-			56,
-			57,
-			58
+			9,
+			10,
+			1,
+			2
 		},
 		["monster"]={
 			27101,
@ -2163,10 +2163,10 @@ local chapter_daily_challenge = {
 		["scene"]="bg_3",
 		["chess_board"]="chessboard_2",
 		["chapter_board_daily_challenge"]={
-			71,
-			72,
-			73,
-			74
+			3,
+			4,
+			5,
+			6
 		},
 		["monster"]={
 			35101,
--- a/lua/app/config/func_open.lua
+++ b/lua/app/config/func_open.lua
@ -5,8 +5,7 @@ local func_open = {
 	},
 	["bounty_open"]={
 		["stage"]=3,
-		["pop_ups"]=1,
-		["icon"]="main_bounty"
+		["pop_ups"]=1
 	},
 	["task"]={
 		["stage"]=3,
@ -26,8 +25,7 @@ local func_open = {
 	},
 	["mall"]={
 		["stage"]=2,
-		["pop_ups"]=1,
-		["icon"]="main_mall"
+		["pop_ups"]=1
 	},
 	["mall_daily"]={
 		["stage"]=5,
@ -35,13 +33,11 @@ local func_open = {
 	},
 	["store_box_open"]={
 		["stage"]=2,
-		["pop_ups"]=1,
-		["icon"]="main_store_box"
+		["pop_ups"]=1
 	},
 	["store_box_3_open"]={
 		["stage"]=5,
-		["pop_ups"]=1,
-		["icon"]="main_store_box_3"
+		["pop_ups"]=1
 	},
 	["daily_challenge"]={
 		["stage"]=8,
--- a/lua/app/config/grid_type.lua
+++ b/lua/app/config/grid_type.lua
@ -170,6 +170,7 @@ local grid_type = {
 		},
 		["break_count"]=1,
 		["break_fly_to_character"]=1,
+		["bftc_icon"]="battle_obstacle_lamp",
 		["cant_link"]=1,
 		["element_invalid"]=1,
 		["effect"]=3,
@ -184,6 +185,7 @@ local grid_type = {
 		},
 		["break_count"]=1,
 		["break_fly_to_character"]=1,
+		["bftc_icon"]="battle_obstacle_chest_4",
 		["cant_link"]=1,
 		["element_invalid"]=1,
 		["break_sfx"]="sfx_piece_za_b01",
--- a/lua/app/config/localization/localization_global_const.lua
+++ b/lua/app/config/localization/localization_global_const.lua
@ -184,6 +184,8 @@ local LocalizationGlobalConst =
 	SHOP_DESC_36 = "SHOP_DESC_36",
 	FUNC_OPEN_LEVEL = "FUNC_OPEN_LEVEL",
 	FUNC_OPEN_STAGE = "FUNC_OPEN_STAGE",
+	HERO_UNLOCK = "HERO_UNLOCK",
+	HERO_UNLOCK_DESC = "HERO_UNLOCK_DESC",
 }

 return LocalizationGlobalConst
--- a/lua/app/config/mail.lua
+++ b/lua/app/config/mail.lua
@ -14,8 +14,8 @@ local mail = {
 				["type_for_nothing"]="Vw==",
 				["id"]=2,
 				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
 			}
 		}
 	},
@ -34,76 +34,13 @@ local mail = {
 				["type_for_nothing"]="Vw==",
 				["id"]=2,
 				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			}
-		}
-	},
-	[3]={
-		["type"]=3,
-		["time_type"]=2,
-		["time_send"]={
-			5,
-			0,
-			0,
-			0
-		},
-		["time"]=24,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			}
-		}
-	},
-	[4]={
-		["type"]=3,
-		["time_type"]=2,
-		["time_send"]={
-			6,
-			0,
-			0,
-			0
-		},
-		["time"]=24,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=50,
- 				["num_for_nothing"]="Uwg="
-			}
-		}
-	},
-	[5]={
-		["type"]=3,
-		["time_type"]=2,
-		["time_send"]={
-			7,
-			0,
-			0,
-			0
-		},
-		["time"]=24,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=70,
- 				["num_for_nothing"]="UQg="
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
 			}
 		}
 	}
 }
 local config = {
-data=mail,count=5
+data=mail,count=2
 }
 return config
--- a/lua/app/config/monster_chapter.lua
+++ b/lua/app/config/monster_chapter.lua
@ -5094,7 +5094,8 @@ local monster_chapter = {
 			30030
 		},
 		["skill"]={
-			10041
+			10041,
+			10066
 		},
 		["passive_skill"]={
 			10008,
@ -5423,7 +5424,8 @@ local monster_chapter = {
 			30030
 		},
 		["skill"]={
-			10041
+			10041,
+			10066
 		},
 		["passive_skill"]={
 			10008,
@ -5948,7 +5950,8 @@ local monster_chapter = {
 			30030
 		},
 		["skill"]={
-			10041
+			10041,
+			10066
 		},
 		["passive_skill"]={
 			10008,
@ -6801,7 +6804,8 @@ local monster_chapter = {
 			30030
 		},
 		["skill"]={
-			10041
+			10041,
+			10066
 		},
 		["passive_skill"]={
 			10008,
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@ -5549,16 +5549,17 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="counterattack",
-				["num"]=5000,
+				["type"]="hurt",
+				["num"]=20000,
 				["ratio"]=10000,
-				["round"]=2
+				["round"]=0
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=3,
-		["cd_start"]=0
+		["cd_start"]=0,
+		["name_act"]="skill01"
 	},
 	[10042]={
 		["effect_type"]=1,
@ -6294,6 +6295,22 @@ local skill = {
 			666
 		}
 	},
+	[10066]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="counterattack",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["cd"]=3,
+		["cd_start"]=0
+	},
 	[20001]={
 		["effect_type"]=1,
 		["trigger"]=1,
@ -11796,6 +11813,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=556
+data=skill,count=557
 }
 return config
--- a/lua/app/config/strings/cn/global.lua
+++ b/lua/app/config/strings/cn/global.lua
@ -184,6 +184,8 @@ local localization_global =
    ["SHOP_DESC_36"] = "商店",
    ["FUNC_OPEN_LEVEL"] = "玩家等级{0}开启",
    ["FUNC_OPEN_STAGE"] = "通关章节{0}开启",
+    ["HERO_UNLOCK"] = "英雄解锁",
+    ["HERO_UNLOCK_DESC"] = "现在可从宝箱中获得",
 }

 return localization_global
--- a/lua/app/config/strings/cn/mail.lua
+++ b/lua/app/config/strings/cn/mail.lua
@ -4,21 +4,9 @@ local mail = {
 	},
 	[2]={
 		["name"]="国王的日常补给"
-	},
-	[3]={
-		["name"]="哼哼哈嘿",
-		["desc"]="乐观的人总在不经意间获得意外之喜"
-	},
-	[4]={
-		["name"]="仁者无敌",
-		["desc"]="心地善良的人,会善有善报的"
-	},
-	[5]={
-		["name"]="风生水起",
-		["desc"]="精力充沛,运势良好,财运连连"
 	}
 }
 local config = {
-data=mail,count=5
+data=mail,count=2
 }
 return config
--- a/lua/app/config/strings/de/mail.lua
+++ b/lua/app/config/strings/de/mail.lua
@ -4,18 +4,9 @@ local mail = {
 	},
 	[2]={

-	},
-	[3]={
-
-	},
-	[4]={
-
-	},
-	[5]={
-
 	}
 }
 local config = {
-data=mail,count=5
+data=mail,count=2
 }
 return config
--- a/lua/app/config/strings/en/mail.lua
+++ b/lua/app/config/strings/en/mail.lua
@ -4,21 +4,9 @@ local mail = {
 	},
 	[2]={
 		["name"]="Daily Allowance of the King"
-	},
-	[3]={
-		["name"]="Hey! See what's inside!",
-		["desc"]="An optimistic person is always surprised by the unexpected"
-	},
-	[4]={
-		["name"]="To my beloved...",
-		["desc"]="A good heart will be rewarded with good deeds"
-	},
-	[5]={
-		["name"]="Thrive!",
-		["desc"]="Good energy, good luck and good fortune"
 	}
 }
 local config = {
-data=mail,count=5
+data=mail,count=2
 }
 return config
--- a/lua/app/config/strings/fr/mail.lua
+++ b/lua/app/config/strings/fr/mail.lua
@ -4,21 +4,9 @@ local mail = {
 	},
 	[2]={
 		["name"]="Approvisionnement quotidien du roi"
-	},
-	[3]={
-		["name"]="Hoho hahé",
-		["desc"]="Une personne optimiste est toujours surprise par l'inattendu"
-	},
-	[4]={
-		["name"]="Le bienveillant invincible",
-		["desc"]="Une personne au bon cœur sera récompensée par de bonnes actions"
-	},
-	[5]={
-		["name"]="En plein forme",
-		["desc"]="Bonne énergie, bonne chance et bonne fortune"
 	}
 }
 local config = {
-data=mail,count=5
+data=mail,count=2
 }
 return config
--- a/lua/app/config/strings/ja/mail.lua
+++ b/lua/app/config/strings/ja/mail.lua
@ -4,18 +4,9 @@ local mail = {
 	},
 	[2]={

-	},
-	[3]={
-
-	},
-	[4]={
-
-	},
-	[5]={
-
 	}
 }
 local config = {
-data=mail,count=5
+data=mail,count=2
 }
 return config
--- a/lua/app/config/strings/ko/mail.lua
+++ b/lua/app/config/strings/ko/mail.lua
@ -4,21 +4,9 @@ local mail = {
 	},
 	[2]={
 		["name"]="왕의 일상 보급품"
-	},
-	[3]={
-		["name"]="으랏차차!",
-		["desc"]="낙관적 인 사람은 항상 예상치 못한 것에 놀란다."
-	},
-	[4]={
-		["name"]="자비로운 자는 무적입니다.",
-		["desc"]="마음이 착한 사람은 선행으로 보상을받을 것입니다."
-	},
-	[5]={
-		["name"]="막힘없이 뻗어나가요!",
-		["desc"]="좋은 에너지, 행운과 행운"
 	}
 }
 local config = {
-data=mail,count=5
+data=mail,count=2
 }
 return config
--- a/lua/app/config/strings/zh/mail.lua
+++ b/lua/app/config/strings/zh/mail.lua
@ -4,21 +4,9 @@ local mail = {
 	},
 	[2]={
 		["name"]="國王的日常補給"
-	},
-	[3]={
-		["name"]="哼哼哈嘿",
-		["desc"]="樂觀的人總在不經意間獲得意外之喜"
-	},
-	[4]={
-		["name"]="仁者無敵",
-		["desc"]="心地善良的人,會善有善報的"
-	},
-	[5]={
-		["name"]="風生水起",
-		["desc"]="精力充沛,運勢良好,財運連連"
 	}
 }
 local config = {
-data=mail,count=5
+data=mail,count=2
 }
 return config
--- a/lua/app/config/tutorial.lua
+++ b/lua/app/config/tutorial.lua
@ -21,7 +21,7 @@ local tutorial = {
 		["txt"]="tutorial_txt_1",
 		["txt_offset"]={
 			0,
-			110
+			40
 		},
 		["target_name"]="battle_ui(Clone)/bg_2/battle_select_skill_comp/skill_node/skill_select_cell_1",
 		["arrow_direction"]=1,
@ -89,7 +89,7 @@ local tutorial = {
 			0,
 			180
 		},
-		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_1",
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter_comp/progress_bg/box_1",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
@ -236,7 +236,7 @@ local tutorial = {
 			0,
 			180
 		},
-		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_1",
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter_comp/progress_bg/box_1",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
@ -272,8 +272,8 @@ local tutorial = {
 		},
 		["show_mask"]=1,
 		["square_size"]={
-			25,
-			50
+			18,
+			35
 		},
 		["square_offset"]={
 			0,
@ -297,7 +297,7 @@ local tutorial = {
 			0,
 			180
 		},
-		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_2",
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter_comp/progress_bg/box_2",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
@ -343,6 +343,7 @@ local tutorial = {
 	},
 	[40040]={
 		["next_id"]=40050,
+		["delay"]=0.5,
 		["type"]=2,
 		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_2/prop_node/hero_cell_3",
 		["arrow_direction"]=1,
@ -420,9 +421,13 @@ local tutorial = {
 	},
 	[40090]={
 		["next_id"]=40100,
-		["type"]=2,
+		["type"]=3,
 		["txt"]="tutorial_txt_5",
-		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1",
+		["txt_offset"]={
+			0,
+			180
+		},
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_3",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
--- a/lua/app/module/battle/controller/battle_controller.lua
+++ b/lua/app/module/battle/controller/battle_controller.lua
@ -1094,6 +1094,15 @@ function BattleController:dealGridBreak(posId, condition, time, breakedMap, sequ
            aniUnit.noAni = false
            aniUnit.overCallback = aniUnit.callback
            aniUnit.callback = nil
+            if entity:getBreakFlyToCharacterIcon() then
+                aniUnit.callback = function()
+                    local cell = entity:getCell()
+                    if not cell then
+                        return
+                    end
+                    cell:setGridTypeIcon(entity:getBreakFlyToCharacterIcon())
+                end
+            end
        end
    end

@ -1291,8 +1300,10 @@ function BattleController:generateBoard(isFirst)
        return
    end

-
    self.curBoardIndex = (self.curBoardIndex or 0) + 1
+    if not boardList[self.curBoardIndex] then -- 容错
+        return
+    end
    local board = boardList[self.curBoardIndex].board
    local mysteryBoard = boardList[self.curBoardIndex].mysteryBoard
    if mysteryBoard and mysteryBoxIndexMap and mysteryBoxIndexMap[self.curBoardIndex] then
--- a/lua/app/ui/battle/cell/grid_cell.lua
+++ b/lua/app/ui/battle/cell/grid_cell.lua
@ -216,4 +216,9 @@ function GridCell:setOrder(uiOder)
    skillEffect:setActive(false)
 end

+function GridCell:setGridTypeIcon(icon)
+    local uiMap = self:getUIMap()
+    uiMap["grid_cell.touch_node.ani_node.up_bg"]:setSprite(GConst.ATLAS_PATH.BATTLE, icon)
+end
+
 return GridCell
--- a/lua/app/ui/shop/box_hero_ui.lua
+++ b/lua/app/ui/shop/box_hero_ui.lua
@ -103,7 +103,7 @@ function BoxHeroUI:onClickSummon()
 	if GFunc.checkCost(costItem.id, costItem.num, false) then
 		ModuleManager.SummonManager:summon(self.summonType, 1)
 		self:closeUI()
-	elseif GFunc.checkCost(cost.id, cost.num, false) then
+	elseif GFunc.checkCost(cost.id, cost.num, true) then
 		ModuleManager.SummonManager:summon(self.summonType, 2)
 		self:closeUI()
 	end
--- a/lua/app/ui/shop/cell/box_sell_cell.lua
+++ b/lua/app/ui/shop/cell/box_sell_cell.lua
@ -116,13 +116,6 @@ function BoxSellCell:refreshCost()
 end

 function BoxSellCell:onClickBox(summonType)
-	local costItem, cost = DataManager.SummonData:getSummonCost(summonType)
-	if not GFunc.checkCost(costItem.id, costItem.num, false) then	
-		if not GFunc.checkCost(cost.id, cost.num, true) then
-			return
-		end
-	end
-
 	ModuleManager.ShopManager:showBoxHeroUI(summonType)
 end

--- a/lua/app/ui/shop/cell/coin_sell_cell.lua
+++ b/lua/app/ui/shop/cell/coin_sell_cell.lua
@ -43,7 +43,8 @@ end
 function CoinSellCell:refresh()
    local actGiftId = DataManager.ShopData:getValidCoinGiftId()
    if actGiftId and actGiftId > 0 then
-        local cfgInfo = ConfigManager:getConfig("act_gift")[actGiftId]
+        self.actGiftId = actGiftId -- 记录当前金币礼包ID
+        local cfgInfo = ConfigManager:getConfig("act_gift")[self.actGiftId]
        -- 超值
        self.offText:setText(tostring(cfgInfo.value) .. "%")
        -- 限购
@ -77,8 +78,13 @@ function CoinSellCell:refresh()
        self:refreshTime()

        self.clickArea:addClickListener(function()
-            self:onClickGift(actGiftId)
+            self:onClickGift(self.actGiftId)
        end)
+    else -- 倒计时结束的情况
+        if self.actGiftId then
+            DataManager.ShopData:setDirty()
+            self.actGiftId = nil
+        end
    end
 end

@ -100,9 +106,8 @@ end

 function CoinSellCell:refreshTime()
    local remainTime = 0
-    local actId = DataManager.ShopData:getValidCoinGiftId()
-    if actId > 0 then
-        local cfgInfo = DataManager.ShopData:getActGiftConfig()[actId]
+    if self.actGiftId and self.actGiftId > 0 then
+        local cfgInfo = DataManager.ShopData:getActGiftConfig()[self.actGiftId]
        local triggerTime = DataManager.ShopData:getCoinGiftTriggerTime()
        remainTime = triggerTime + (cfgInfo.limit_time or 0) * 3600 - Time:getServerTime()
        if remainTime <= 0 then
@ -112,4 +117,12 @@ function CoinSellCell:refreshTime()
    self.timeText:setText(Time:formatNumTimeStr(remainTime))
 end

+function CoinSellCell:getCellCount()
+    if self.actGiftId and self.actGiftId > 0 then
+        return 1
+    else
+        return 0
+    end
+end
+
 return CoinSellCell
--- a/lua/app/ui/shop/cell/grow_sell_cell.lua
+++ b/lua/app/ui/shop/cell/grow_sell_cell.lua
@ -39,9 +39,12 @@ function GrowSellCell:refreshTime()
    end
 end

+function GrowSellCell:getCellCount()
+    return self.actGifts and #self.actGifts or 0
+end
+
 function GrowSellCell:getCellHeight()
-    local cellCount = self.actGifts and #self.actGifts or 0
-	return BASE_CELL_HEIGHT * cellCount
+	return BASE_CELL_HEIGHT * self:getCellCount()
 end

 function GrowSellCell:getIsOpen()
--- a/lua/app/ui/shop/gift_pop_ui.lua
+++ b/lua/app/ui/shop/gift_pop_ui.lua
@ -181,6 +181,7 @@ function GiftPopUI:updateTime()
                remainTime = triggerTime + (cfgInfo.limit_time or 0) * 3600 - Time:getServerTime()
                if remainTime <= 0 then
                    remainTime = 0
+                    self:checkNextPopGiftOrClose()
                end
                self.timeText:setText(GFunc.getTimeStr(remainTime))
            end
@ -194,6 +195,7 @@ function GiftPopUI:updateTime()
        remainTime = triggerTime + (cfgInfo.limit_time or 0) * 3600 - Time:getServerTime()
        if remainTime <= 0 then
            remainTime = 0
+            self:checkNextPopGiftOrClose()
        end
        self.timeText:setText(GFunc.getTimeStr(remainTime))
    end
--- a/lua/app/ui/shop/shop_comp.lua
+++ b/lua/app/ui/shop/shop_comp.lua
@ -135,12 +135,24 @@ function ShopComp:refreshTime()
 	if self.hotSellCell and self.hotSellCell:getIsOpen() then
 		self.hotSellCell:refreshTime()
 	end
+	local coinCellCount = 0
 	if self.coinSellCell and self.coinSellCell:getIsOpen() then
+		coinCellCount = self.coinSellCell:getCellCount()
 		self.coinSellCell:refreshTime()
 	end
+	if self.coinCellCount ~= coinCellCount then
+		self.coinCellCount = coinCellCount
+		DataManager.ShopData:setDirty() 
+	end
+	local growCellCount = 0
 	if self.growSellCell and self.growSellCell:getIsOpen() then
+		growCellCount = self.growSellCell:getCellCount()
 		self.growSellCell:refreshTime()
 	end
+	if self.growCellCount ~= growCellCount then
+		self.growCellCount = growCellCount
+		DataManager.ShopData:setDirty() 
+	end
 end

 function ShopComp:refreshDiscountPage()
--- a/lua/app/userdata/battle/battle_grid_entity.lua
+++ b/lua/app/userdata/battle/battle_grid_entity.lua
@ -390,4 +390,8 @@ function BattleGridEntity:getBreakFlyToCharacter()
    return self:getGridTypeConfig().break_fly_to_character == 1
 end

+function BattleGridEntity:getBreakFlyToCharacterIcon()
+    return self:getGridTypeConfig().bftc_icon
+end
+
 return BattleGridEntity