From 8a64b03c295e5e4adc95c57758eb67384a5ff2b2 Mon Sep 17 00:00:00 2001
From: puxuan <413323644@qq.com>
Date: Thu, 14 Aug 2025 18:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=8C=91=E6=88=98=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/config/strings/cn/task_daily_challenge.lua    |  6 +++---
 lua/app/ui/daily_challenge/cell/task_cell.lua         | 11 ++++++-----
 lua/app/ui/daily_challenge/daily_challenge_ui.lua     |  4 ++++
 .../userdata/daily_challenge/daily_challenge_data.lua |  8 ++++----
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lua/app/config/strings/cn/task_daily_challenge.lua b/lua/app/config/strings/cn/task_daily_challenge.lua
index 7583ee21..be10cfae 100644
--- a/lua/app/config/strings/cn/task_daily_challenge.lua
+++ b/lua/app/config/strings/cn/task_daily_challenge.lua
@@ -9,13 +9,13 @@ local task_daily_challenge = {
 		["desc"]="通关时，战斗中超过连接8消{0}次"
 	},
 	[4]={
-		["desc"]="10回合内击败最终首领"
+		["desc"]="通关时{0}色元素英雄释放技能{1}次"
 	},
 	[5]={
-		["desc"]="通关时，{0}造成伤害占比超过{1}%"
+		["desc"]="{0}回合内击败最终首领"
 	},
 	[6]={
-		["desc"]="通关时，{0}造成伤害占比超过{1}%"
+		["desc"]="通关时，{0}颜色元素造成伤害占比超过{1}%"
 	}
 }
 local config = {
diff --git a/lua/app/ui/daily_challenge/cell/task_cell.lua b/lua/app/ui/daily_challenge/cell/task_cell.lua
index f697c2b8..7feb7af0 100644
--- a/lua/app/ui/daily_challenge/cell/task_cell.lua
+++ b/lua/app/ui/daily_challenge/cell/task_cell.lua
@@ -7,6 +7,7 @@ function TaskCell:refresh(taskInfo, customProgress)
 	local complete = taskInfo.claimed
 	customProgress = customProgress or 0
 	local uiMap = self:getUIMap()
+	local cfg = DataManager.DailyChallengeData:getTaskCfg()[taskInfo.task_id]
 	local icon = complete and ICON_BG[2] or ICON_BG[1]
 	-- uiMap["task_cell.task_icon_bg"]:setSprite(GConst.ATLAS_PATH.COMMON, icon)
 	-- icon = complete and ICON[2] or ICON[1]
@@ -14,12 +15,12 @@ function TaskCell:refresh(taskInfo, customProgress)
 	uiMap["task_cell.desc"]:setText(DataManager.DailyChallengeData:getTaskDesc(taskInfo.task_id, true, customProgress))
 
 	for i = 1, 3 do
-		local cell = uiMap["daily_challenge_task_ui.bg.task_cell_" .. i]
-		if taskInfo.reward[i] then
-			cell:setVisible(true)
-			cell:refresh(taskInfo.reward[i])
+		local cell = uiMap["task_cell.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+		if cfg.reward[i] then
+			cell:setActive(true)
+			cell:refreshByConfig(cfg.reward[i])
 		else
-			cell:setVisible(false)
+			cell:setActive(false)
 		end
 	end
 end
diff --git a/lua/app/ui/daily_challenge/daily_challenge_ui.lua b/lua/app/ui/daily_challenge/daily_challenge_ui.lua
index 5798fc42..a462faae 100644
--- a/lua/app/ui/daily_challenge/daily_challenge_ui.lua
+++ b/lua/app/ui/daily_challenge/daily_challenge_ui.lua
@@ -69,6 +69,10 @@ function DailyChallengeUI:onRefresh()
 	self:refreshBoss()
 	self:updateTime()
 	self:refreshFightBtn()
+
+	if DataManager.DailyChallengeData:getIsPopTask() then
+		ModuleManager.DailyChallengeManager:showBattleTaskUI()
+	end
 end
 
 function DailyChallengeUI:refreshTask()
diff --git a/lua/app/userdata/daily_challenge/daily_challenge_data.lua b/lua/app/userdata/daily_challenge/daily_challenge_data.lua
index b642af3f..8b272b77 100644
--- a/lua/app/userdata/daily_challenge/daily_challenge_data.lua
+++ b/lua/app/userdata/daily_challenge/daily_challenge_data.lua
@@ -1,9 +1,9 @@
 local DailyChallengeData = class("DailyChallengeData", BaseData)
 local TASK_CFG = ConfigManager:getConfig("task_daily_challenge")
-local PER_TASK = {[7] = true, [8] = true}
-local FIXED_HERO_TASK = {[2] = true, [7] = true}
-local MATCH_TYPE_TASK = {[5] = true, [8] = true}
-local NEED_PROGRESS_TASK = {[3] = true, [4] = true, [5] = true, [7] = true, [8] = true}
+local PER_TASK = {[6] = true}
+local FIXED_HERO_TASK = {}
+local MATCH_TYPE_TASK = {[4] = true, [6] = true}
+local NEED_PROGRESS_TASK = {[2] = true, [3] = true, [4] = true, [6] = true}
 
 function DailyChallengeData:ctor()
 	self.data.isDirty = false