From 536c3bfa8beea12aa598737e0e0fedc969485b3d Mon Sep 17 00:00:00 2001
From: fatiao <515948292@qq.com>
Date: Fri, 6 Mar 2026 10:30:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E8=B5=8F=E7=A4=BC=E7=89=A9=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=BB=E6=92=AD=E6=84=9F=E8=B0=A2=E5=8F=B0=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Lua/Config/LiveRoomTalkCfg.lua       |  8 ++++----
 Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua | 15 +++++++++++----
 Assets/Lua/Util/CommonUtil.lua              |  8 ++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Assets/Lua/Config/LiveRoomTalkCfg.lua b/Assets/Lua/Config/LiveRoomTalkCfg.lua
index b19d9a38a..bd05233b5 100644
--- a/Assets/Lua/Config/LiveRoomTalkCfg.lua
+++ b/Assets/Lua/Config/LiveRoomTalkCfg.lua
@@ -396,14 +396,14 @@ local LiveRoomTalkCfg = {
 ['Params1']={1},
 ['Params2']={'没有拍到的老板不要气馁，说不定下一个，老板会更喜欢呢？'},
 },
-[37]={
-['Id']=37,
-['Type']=100,
+[45]={
+['Id']=45,
+['Type']=1000,
 ['Stage']=0,
 ['Time']=5,
 ['CMD']=1,
 ['Params1']={1},
-['Params2']={'感谢【{0}】哥哥，送的{1}！谢谢哥哥！'},
+['Params2']={'感谢【%s】哥哥，送的{%s}！谢谢哥哥！'},
 },
 }
 return LiveRoomTalkCfg
\ No newline at end of file
diff --git a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua
index eaa8cace6..5bb829587 100644
--- a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua
+++ b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua
@@ -149,7 +149,7 @@ function UILiveRoomView:AddEventListener()
 
 			local itemlua = self:GetCurrPageLua()
 			self:Set_Streamer_Animation(data.room_id, info.act)
-			self:Set_Streamer_Talk(data.talk_id, info.talk)
+			self:Set_Streamer_Talk(data.talk_id, info)
 		end)
 
 	--进行中 数据
@@ -448,7 +448,7 @@ function UILiveRoomView:OnCloseBtn()
 	if self.sv_room.loopListView.ListViewInited then
 		self.sv_room.loopListView:Dispose()
 	end
-	self:ResetTalk()
+	self:ResetTimer()
 	self:UIClose()
 end
 
@@ -648,6 +648,7 @@ end
 --工具 LoadIcon
 function UILiveRoomView:LoadIcon_SetSprite(go, path)
 	CommonUtil.LoadIcon(self, path, function(sprite)
+		--LogError("LoadIcon_SetSprite: path="..path.." go.name"..go.name)
 		go.image.sprite = sprite
 	end)
 end
@@ -711,8 +712,11 @@ function UILiveRoomView:Set_Streamer_Animation(room_id, act)
 	end
 end
 
-function UILiveRoomView:Set_Streamer_Talk(talk, talk_params)
-	local talk_str = talkCfg[talk].Params2[talk_params]
+function UILiveRoomView:Set_Streamer_Talk(talkId, talk_params)
+	local talk_str = talkCfg[talkId].Params2[talk_params.talk]
+	if talkCfg[talkId].Type == 1000 then
+		talk_str = string.format(talk_str, talk_params.player, giftCfg[talk_params.gift].Name)
+	end
 	self:ShowTalk(talk_str)
 	if self.showTalkTimerId ~= nil then
 		ManagerContainer.LuaTimerMgr:RemoveTimer(self.showTalkTimerId)
@@ -728,6 +732,9 @@ end
 function UILiveRoomView:ResetTalk()
 	local itemlua = self:GetCurrPageLua()
 	itemlua.bg_talk:SetActive(false)
+	self:ResetTimer()
+end
+function UILiveRoomView:ResetTimer()
 	if self.showTalkTimerId ~= nil then
 		ManagerContainer.LuaTimerMgr:RemoveTimer(self.showTalkTimerId)
 		self.showTalkTimerId = nil
diff --git a/Assets/Lua/Util/CommonUtil.lua b/Assets/Lua/Util/CommonUtil.lua
index 1e4892970..39e82e600 100644
--- a/Assets/Lua/Util/CommonUtil.lua
+++ b/Assets/Lua/Util/CommonUtil.lua
@@ -3107,6 +3107,14 @@ function GetRole_Illustration_Info(idx)
     return pos
 end
 
+-- 简单的 {0} {1} 替换函数
+function Format(str, ...)
+    local args = {...}
+    return (str:gsub("{(%d+)}", function(index)
+        local i = tonumber(index) + 1  -- Lua 索引从1开始
+        return tostring(args[i] or "{" .. index .. "}")
+    end))
+end
 
 function CurrLevelHasStory()
     local mapLevel = ManagerContainer.LuaBattleMgr:GetCurLevelUniqueId()