From 0e306dc681063fb6fc2cd1232e232dea9a4a74fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Tue, 10 Jun 2025 15:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=98=E7=AE=A1=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base_project/Game/View/PlayerInfoView.lua | 223 ++++++++++--------
 wb_new_ui/.objs/workspace.json                |  28 +--
 wb_new_ui/assets/Main_Majiang/Main_2.xml      |   8 +-
 .../Main_style_2/PlayerHead_1_s2(1).xml       |   7 +-
 .../Main_style_2/PlayerHead_3_s2(1).xml       |   6 +
 .../Main_Majiang/component/PlayerHead_1.xml   |  14 +-
 .../Main_Majiang/component/PlayerHead_3.xml   |  14 +-
 .../Main_Majiang/component/pb_tuoGuan_Bg.xml  |   9 +
 .../component/pb_tuoGuan_Border.xml           |  12 +
 wb_new_ui/assets/Main_Majiang/images/bg.png   | Bin 0 -> 6885 bytes
 .../assets/Main_Majiang/images/tuoguan.png    | Bin 0 -> 3399 bytes
 wb_new_ui/assets/Main_Majiang/package.xml     |   4 +
 12 files changed, 196 insertions(+), 129 deletions(-)
 create mode 100644 wb_new_ui/assets/Main_Majiang/component/pb_tuoGuan_Bg.xml
 create mode 100644 wb_new_ui/assets/Main_Majiang/component/pb_tuoGuan_Border.xml
 create mode 100644 wb_new_ui/assets/Main_Majiang/images/bg.png
 create mode 100644 wb_new_ui/assets/Main_Majiang/images/tuoguan.png

diff --git a/lua_probject/base_project/Game/View/PlayerInfoView.lua b/lua_probject/base_project/Game/View/PlayerInfoView.lua
index 3cf632e9..c1af3f40 100644
--- a/lua_probject/base_project/Game/View/PlayerInfoView.lua
+++ b/lua_probject/base_project/Game/View/PlayerInfoView.lua
@@ -22,13 +22,13 @@ local M = PlayerInfoView
 
 function M.new(view, main_view, isHideIpAdds)
     local self = {}
-    setmetatable(self, {__index = PlayerInfoView})
+    setmetatable(self, { __index = PlayerInfoView })
     self._view = view
     self._main_view = main_view
     self._isHideIpAdds = isHideIpAdds
-	self.isShowTGTimer=false
-	self.currentTime=0
-	self.totalTime=0
+    self.isShowTGTimer = false
+    self.currentTime = 0
+    self.totalTime = 0
     --self.isShow = fasle
     self:init()
     return self
@@ -41,36 +41,36 @@ function M:init()
     self._tex_player_name = player_name_score:GetChild('tex_player_name')
     self._tex_player_id = player_name_score:GetChild('tex_player_id')
     self._tex_score = player_name_score:GetChild('tex_score')
-	self._tex_score.visible=true
-	
-	self._tex_score1 = self._view:GetChild("info"):GetChild("tex_score1")
-	if self._tex_score1 then
-		self._tex_score1.visible=true
-	end
+    self._tex_score.visible = true
+
+    self._tex_score1 = self._view:GetChild("info"):GetChild("tex_score1")
+    if self._tex_score1 then
+        self._tex_score1.visible = true
+    end
     self._tex_score2 = self._view:GetChild("info"):GetChild("tex_score2")
-	if self._tex_score2 then
-		self._tex_score2.visible=true
-	end
-	
-	self._tex_n4 = self._view:GetChild("info"):GetChild("n4")
-	if self._tex_n4 then
-		self._tex_n4.visible=true
-	end
+    if self._tex_score2 then
+        self._tex_score2.visible = true
+    end
+
+    self._tex_n4 = self._view:GetChild("info"):GetChild("n4")
+    if self._tex_n4 then
+        self._tex_n4.visible = true
+    end
     self._tex_n5 = self._view:GetChild("info"):GetChild("n5")
-	if self._tex_n5 then
-		self._tex_n5.visible=true
-	end
-	
-	self.n3Bg=self._view:GetChild("info"):GetChild("n3")
-	if self.n3Bg then
-		--self.n3Bg:SetSize(138,55)
-	end
-	self.zhanjitext=self._view:GetChild("text_jifen")
-	if self.zhanjitext then
-		self.zhanjitext.text=0
-	end
-	
-	
+    if self._tex_n5 then
+        self._tex_n5.visible = true
+    end
+
+    self.n3Bg = self._view:GetChild("info"):GetChild("n3")
+    if self.n3Bg then
+        --self.n3Bg:SetSize(138,55)
+    end
+    self.zhanjitext = self._view:GetChild("text_jifen")
+    if self.zhanjitext then
+        self.zhanjitext.text = 0
+    end
+
+
     self._biaoqing = view:GetChild('face')
     self._chat = view:GetChild('chat')
 
@@ -82,69 +82,90 @@ function M:init()
     self._ctr_room_owner = view:GetController('room_owner')
     self._ctr_mask_voice = view:GetController('mask_voice')
     self._ctr_dismiss_room = view:GetController('dismiss_room')
-	
-	self.PlayerTGTips=view:GetChild('tuoguanTips')
-	if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
-		self.PlayerTGTips.displayObject.gameObject:SetActive(false)
-	end
-	
+
+    self.PlayerTGTips = view:GetChild('tuoguanTips')
+    if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
+        self.PlayerTGTips.displayObject.gameObject:SetActive(false)
+    end
+
+    self.PlayerTGBg = view:GetChild('pb_tuoGuan_Bg')
+    if self.PlayerTGBg and self.PlayerTGBg.displayObject.gameObject then
+        self.PlayerTGBg.displayObject.gameObject:SetActive(false)
+    end
+    self.PlayerTGBorder = view:GetChild('pb_tuoGuan_Border')
+    if self.PlayerTGBorder and self.PlayerTGBorder.displayObject.gameObject then
+        self.PlayerTGBorder.displayObject.gameObject:SetActive(false)
+    end
 end
 
-
-function M:IsShowTGTips(isShow,time)
+function M:IsShowTGTips(isShow, time)
     --printlog("isShowisShowisShow====     ",isShow,"     time    ",time)
-	if time==nil then  time=0 end
-	
-    self.isShowTGTimer = isShow
-	if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
-		self.PlayerTGTips.displayObject.gameObject:SetActive(isShow)
-	end
-	self.currentTime=0
-	if isShow then
-		if self.PlayerTGTips  then
-			self.PlayerTGTips.text="开启托管剩余时间"..time.."s"
-		end	
-		self.totalTime=time
-        --UpdateBeat:Remove(self.OnUpdate,self)
-		--UpdateBeat:Add(self.OnUpdate,self)
-       -- printlog("aaaaaaaaa111111111111111111111111111111")
-		--TimerManager.RemoveTimer(self.OnUpdate)
-		TimerManager.AddTimer(self.OnUpdate,self)
-		--printlog(self)
-	else
-       -- printlog("移除IsShowTGTips",self.isShow)
-		--UpdateBeat:Remove(self.OnUpdate,self)
-		TimerManager.RemoveTimer(self.OnUpdate,self)
-	end
-	
-end
+    if time == nil then time = 0 end
 
+    self.isShowTGTimer = isShow
+    if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
+        self.PlayerTGTips.displayObject.gameObject:SetActive(isShow)
+    end
+    if self.PlayerTGBg and self.PlayerTGBg.displayObject.gameObject then
+        self.PlayerTGBg.displayObject.gameObject:SetActive(isShow)
+    end
+    if self.PlayerTGBorder and self.PlayerTGBorder.displayObject.gameObject then
+        self.PlayerTGBorder.displayObject.gameObject:SetActive(isShow)
+    end
+    self.currentTime = 0
+    if isShow then
+        if self.PlayerTGTips then
+            self.PlayerTGTips.text = "开启托管剩余时间" .. time .. "s"
+        end
+        if self.PlayerTGBg then
+            self.PlayerTGBg.max = time
+        end
+        if self.PlayerTGBorder then
+            self.PlayerTGBorder.max = time
+        end
+        self.totalTime = time
+        --UpdateBeat:Remove(self.OnUpdate,self)
+        --UpdateBeat:Add(self.OnUpdate,self)
+        -- printlog("aaaaaaaaa111111111111111111111111111111")
+        --TimerManager.RemoveTimer(self.OnUpdate)
+        TimerManager.AddTimer(self.OnUpdate, self)
+        --printlog(self)
+    else
+        -- printlog("移除IsShowTGTips",self.isShow)
+        --UpdateBeat:Remove(self.OnUpdate,self)
+        TimerManager.RemoveTimer(self.OnUpdate, self)
+    end
+end
 
 function M:OnUpdate()
-	--printlog("OnUpdate=====================")
-	if self.isShowTGTimer then
-		self.currentTime=self.currentTime+Time.deltaTime
-		if self.currentTime>=1 then
-			self.currentTime=0
-			self.totalTime=self.totalTime-1
-			--printlog("当前计时器===>>>",self.totalTime)
-			if self.PlayerTGTips then
-				self.PlayerTGTips.text="开启托管剩余时间"..self.totalTime.."s"
-			end
-			
-			if self.totalTime<=0 then
-                self.isShowTGTimer=false
-				if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
-					self.PlayerTGTips.displayObject.gameObject:SetActive(false)
-				end
-			end
-		end
+    --printlog("OnUpdate=====================")
+    if self.isShowTGTimer then
+        self.currentTime = self.currentTime + Time.deltaTime
+        if self.currentTime >= 1 then
+            self.currentTime = 0
+            self.totalTime = self.totalTime - 1
+            --printlog("当前计时器===>>>",self.totalTime)
+            if self.PlayerTGTips then
+                self.PlayerTGTips.text = "开启托管剩余时间" .. self.totalTime .. "s"
+            end
+            if self.PlayerTGBg then
+                self.PlayerTGBg.value = self.totalTime
+            end
+            if self.PlayerTGBorder then
+                self.PlayerTGBorder.value = self.totalTime
+            end
+            if self.totalTime <= 0 then
+                self.isShowTGTimer = false
+                if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
+                    self.PlayerTGTips.displayObject.gameObject:SetActive(false)
+                end
+            end
+        end
 
-		if self.muShiPlayerUpdate then
-			self:muShiPlayerUpdate()
-		end
-	end
-	
+        if self.muShiPlayerUpdate then
+            self:muShiPlayerUpdate()
+        end
+    end
 end
 
 function M:FillData(player)
@@ -164,7 +185,7 @@ function M:FillData(player)
                 --local headView = HeadView.new(self._main_view._root_view, player.self_user, self._isHideIpAdds)
                 --headView:Show()
             end
-        )    
+        )
     else
         local ctr = self._btn_head:GetController("hidden")
         if ctr then
@@ -172,13 +193,13 @@ function M:FillData(player)
         end
     end
 
-    if isHidden 
-        --and player.self_user.account_id ~= room.self_player.self_user.account_id 
+    if isHidden
+    --and player.self_user.account_id ~= room.self_player.self_user.account_id
     then
         if player.orgSeat and player.orgSeat > 0 then
-            self._tex_player_name.text = "玩家"..player.orgSeat
+            self._tex_player_name.text = "玩家" .. player.orgSeat
         else
-            self._tex_player_name.text = "玩家"..player.seat
+            self._tex_player_name.text = "玩家" .. player.seat
             player.orgSeat = membe_clone(player.seat)
         end
         if self._tex_player_id then
@@ -187,7 +208,7 @@ function M:FillData(player)
     else
         self._tex_player_name.text = player.self_user.nick_name
         if self._tex_player_id then
-            self._tex_player_id.text = "ID:".. player.self_user.account_id
+            self._tex_player_id.text = "ID:" .. player.self_user.account_id
         end
     end
     self._ctr_room_owner.selectedIndex = room.owner_id == player.self_user.account_id and 1 or 0
@@ -213,7 +234,7 @@ function M:UpdateScore(score)
                 --     score = d2ad(self._player.total_hp).."/"..d2ad(self._player.cur_hp)
                 -- else
                 score = d2ad(self._player.cur_hp)
-            -- end
+                -- end
             end
         end
     end
@@ -339,9 +360,11 @@ function M:MarkTuoguan()
     local com_tuoguan = UIPackage.CreateObjectFromURL('ui://Common/com_tuoguan')
     self:AddMarkToHead(com_tuoguan, 'mark_tuoguan')
 end
+
 function M:UnmarkTuoguan()
     self:RemoveMarkFromHead('mark_tuoguan')
 end
+
 -- 动态的往头像上加载组件
 function M:AddMarkToHead(com, key)
     if key then
@@ -354,6 +377,7 @@ function M:AddMarkToHead(com, key)
     com.touchable = false
     com.xy = self:GetHeadCenter()
 end
+
 -- 动态移除组件
 function M:RemoveMarkFromHead(key)
     if self[key] then
@@ -363,11 +387,10 @@ function M:RemoveMarkFromHead(key)
 end
 
 function M:Destroy()
-	self.isShowTGTimer=false
-	TimerManager.RemoveTimer(self.OnUpdate,self)
-	self.OnUpdate=nil
-    self.muShiPlayerUpdate=nil
+    self.isShowTGTimer = false
+    TimerManager.RemoveTimer(self.OnUpdate, self)
+    self.OnUpdate = nil
+    self.muShiPlayerUpdate = nil
 end
 
-
 return M
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index df48d804..47c432ba 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -25,6 +25,12 @@
     "ui://m7iejg46ilon7ias",
     "ui://m7iejg46ilon7ibc",
     "ui://m7iejg46imp57ihp",
+    "ui://9n9stu2eprgzf0",
+    "ui://v0j9abjygq7ms2",
+    "ui://v0j9abjyp0aisn",
+    "ui://v0j9abjyp0aism",
+    "ui://v0j9abjygq7mgx",
+    "ui://v0j9abjygq7mh1",
     "ui://m7iejg46z3847i6m",
     "ui://m7iejg46kwi0hk0",
     "ui://m7iejg46imp57igy",
@@ -42,27 +48,17 @@
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://m7iejg46imp57ihp",
+  "doc.activeDoc": "ui://v0j9abjygq7ms2",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "27vd145b",
+    "s63l0suw",
     "/",
-    "27vd145b",
-    "/buttons/",
-    "0khx14ar",
+    "v0j9abjy",
     "/",
-    "m7iejg46",
-    "/",
-    "m7iejg46",
+    "v0j9abjy",
     "/component/",
-    "m7iejg46",
-    "/component/Lst_room/",
-    "m7iejg46",
-    "/images/",
-    "m7iejg46",
-    "/images/allNumber/",
-    "m7iejg46",
-    "/mgr/"
+    "v0j9abjy",
+    "/images/"
   ],
   "auxline1": true,
   "snapToGrid": true,
diff --git a/wb_new_ui/assets/Main_Majiang/Main_2.xml b/wb_new_ui/assets/Main_Majiang/Main_2.xml
index 74eeab14..5bf33011 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_2.xml
@@ -5,23 +5,23 @@
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
   <displayList>
-    <text id="n76_pady" name="tex_round" xy="707,284" pivot="0.5,0" anchor="true" size="98,39" group="n60_v38k" fontSize="28" color="#cccccc" align="center" text="第1/8局">
+    <text id="n76_pady" name="tex_round" xy="707,284" pivot="0.5,0" anchor="true" size="100,39" group="n60_v38k" fontSize="28" color="#cccccc" align="center" text="第1/8局">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n77_pady" sidePair="left-right"/>
     </text>
-    <text id="n77_pady" name="remaining_card" xy="545,284" size="90,39" group="n60_v38k" fontSize="28" color="#cccccc" text="剩余72">
+    <text id="n77_pady" name="remaining_card" xy="545,284" size="92,39" group="n60_v38k" fontSize="28" color="#cccccc" text="剩余72">
       <gearDisplay controller="state" pages="3"/>
     </text>
     <text id="n78_pady" name="txt_remain" xy="617,434" size="174,47" group="n60_v38k" fontSize="40" color="#ffffff" autoSize="shrink" singleLine="true" text="剩         张">
       <gearDisplay controller="state" pages="1"/>
     </text>
-    <text id="n79_pady" name="txt_remaincount" xy="704,458" pivot="0.5,0.5" anchor="true" size="58,44" group="n60_v38k" font="Microsoft YaHei" fontSize="40" color="#ffffff" align="center" vAlign="middle" text="80">
+    <text id="n79_pady" name="txt_remaincount" xy="704,458" pivot="0.5,0.5" anchor="true" size="50,54" group="n60_v38k" font="Microsoft YaHei" fontSize="40" color="#ffffff" align="center" vAlign="middle" text="80">
       <gearDisplay controller="state" pages="1"/>
     </text>
     <component id="n80_pady" name="cardbox" src="gq7m6d" fileName="component/turn/Gcm_box_4.xml" xy="643,311" group="n60_v38k">
       <gearDisplay controller="state" pages="1,3"/>
     </component>
-    <group id="n60_v38k" name="n60" xy="545,284" size="246,197" advanced="true">
+    <group id="n60_v38k" name="n60" xy="545,284" size="246,201" advanced="true">
       <gearXY controller="3d" pages="0,1" values="545,284|545,239"/>
       <relation target="" sidePair="center-center"/>
     </group>
diff --git a/wb_new_ui/assets/Main_Majiang/Main_style_2/PlayerHead_1_s2(1).xml b/wb_new_ui/assets/Main_Majiang/Main_style_2/PlayerHead_1_s2(1).xml
index 249a63e1..2fdc02dd 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_style_2/PlayerHead_1_s2(1).xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_style_2/PlayerHead_1_s2(1).xml
@@ -10,7 +10,6 @@
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="text_color" pages="0,,1," selected="0"/>
   <displayList>
-    <text id="n47_nkur" name="tuoguanTips" xy="0,-29" size="302,48" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间"/>
     <image id="n28_e54q" name="n28" src="gq7m4a" fileName="Main_style_2/images/head/index_bg_01.png" xy="-1,14" size="100,98" group="n33_e7qn" aspect="true"/>
     <component id="n5" name="btn_head" src="gq7m43" fileName="Main_style_2/head/Head.xml" xy="10,24" size="79,79" group="n33_e7qn" aspect="true"/>
     <graph id="n32_kba2" name="offLine" xy="4,18" size="90,90" group="n33_e7qn" aspect="true" touchable="false" type="eclipse" lineSize="0" fillColor="#b3000000">
@@ -53,5 +52,11 @@
     </text>
     <text id="n45_rfcn" name="n45" xy="-3,165" size="48,32" group="n46_rfcn" fontSize="22" color="#512e06" vAlign="middle" text="战绩"/>
     <group id="n46_rfcn" name="zhanji" xy="-9,163" size="132,35" advanced="true"/>
+    <component id="n48_psed" name="pb_tuoGuan_Bg" src="p0aisn" fileName="component/pb_tuoGuan_Bg.xml" xy="10,24" size="79,79">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <component id="n49_psed" name="pb_tuoGuan_Border" src="p0aism" fileName="component/pb_tuoGuan_Border.xml" xy="14,27" size="72,72" aspect="true">
+      <ProgressBar max="100"/>
+    </component>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_style_2/PlayerHead_3_s2(1).xml b/wb_new_ui/assets/Main_Majiang/Main_style_2/PlayerHead_3_s2(1).xml
index 7c236e64..06f5f2ce 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_style_2/PlayerHead_3_s2(1).xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_style_2/PlayerHead_3_s2(1).xml
@@ -57,5 +57,11 @@
     </text>
     <text id="n49_rfcn" name="n49" xy="-5,153" size="48,32" group="n50_rfcn" fontSize="22" color="#512e06" vAlign="middle" text="战绩"/>
     <group id="n50_rfcn" name="zhanji" xy="-11,151" size="132,35" advanced="true"/>
+    <component id="n52_psed" name="pb_tuoGuan_Bg" src="p0aisn" fileName="component/pb_tuoGuan_Bg.xml" xy="13,12" size="79,79">
+      <ProgressBar value="77" max="100"/>
+    </component>
+    <component id="n53_psed" name="pb_tuoGuan_Border" src="p0aism" fileName="component/pb_tuoGuan_Border.xml" xy="18,14" size="70,70" aspect="true">
+      <ProgressBar value="77" max="100"/>
+    </component>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/PlayerHead_1.xml b/wb_new_ui/assets/Main_Majiang/component/PlayerHead_1.xml
index 85dad7ce..ff5abb29 100644
--- a/wb_new_ui/assets/Main_Majiang/component/PlayerHead_1.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/PlayerHead_1.xml
@@ -2,18 +2,18 @@
 <component size="98,163" opaque="false" initName="gcm_info">
   <controller name="room_owner" pages="0,,1," selected="0"/>
   <controller name="bank" pages="0,,1," selected="0"/>
-  <controller name="read" pages="0,,1," selected="1"/>
+  <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="dismiss_room" pages="0,,1," selected="0"/>
   <controller name="piao_niao" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n28_e54q" name="n28" src="gq7m5p" fileName="images/head/index_bg_01.png" xy="-1,14" size="100,98" group="n33_e7qn" aspect="true"/>
+    <image id="n28_e54q" name="n28" src="gq7m5p" fileName="font/images/head/index_bg_01.png" xy="-1,14" size="100,98" group="n33_e7qn" aspect="true"/>
     <component id="n5" name="btn_head" src="gq7m5q" fileName="component/head/Head.xml" xy="10,24" size="79,79" group="n33_e7qn" aspect="true"/>
     <graph id="n32_kba2" name="offLine" xy="4,18" size="90,90" group="n33_e7qn" aspect="true" touchable="false" type="eclipse" lineSize="0" fillColor="#b3000000">
       <gearDisplay controller="offline" pages="1"/>
     </graph>
-    <text id="n37_aawn" name="n37" xy="16,48" size="65,39" group="n33_e7qn" fontSize="30" color="#ffffff" text="离线">
+    <text id="n37_aawn" name="n37" xy="16,48" size="64,42" group="n33_e7qn" fontSize="30" color="#ffffff" text="离线">
       <gearDisplay controller="offline" pages="1"/>
     </text>
     <image id="n6" name="fangzhu" src="gq7m5t" fileName="images/z02.png" xy="-4,83" group="n33_e7qn">
@@ -22,7 +22,7 @@
     <image id="n34_u4l2" name="zhuang" src="gq7m5u" fileName="images/z01.png" xy="65,2" group="n33_e7qn">
       <gearDisplay controller="bank" pages="1"/>
     </image>
-    <component id="n36_h4ge" name="n36" xy="9,24" group="n33_e7qn" touchable="false">
+    <component id="n36_h4ge" name="n36" xy="9,24" size="100,100" group="n33_e7qn" touchable="false">
       <gearDisplay controller="dismiss_room" pages="1"/>
     </component>
     <group id="n33_e7qn" name="n33" xy="-4,2" size="113,124"/>
@@ -41,5 +41,11 @@
     <component id="n39_nip5" name="mask_piao" src="gq7m65" fileName="component/piao_niao/mask_piao.xml" xy="-21,82" touchable="false">
       <gearDisplay controller="piao_niao" pages="1"/>
     </component>
+    <component id="n41_p0ai" name="pb_tuoGuan_Bg" src="p0aisn" fileName="component/pb_tuoGuan_Bg.xml" xy="10,24" size="79,79">
+      <ProgressBar max="100"/>
+    </component>
+    <component id="n40_p0ai" name="pb_tuoGuan_Border" src="p0aism" fileName="component/pb_tuoGuan_Border.xml" xy="13,26" size="74,74" aspect="true">
+      <ProgressBar max="100"/>
+    </component>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/PlayerHead_3.xml b/wb_new_ui/assets/Main_Majiang/component/PlayerHead_3.xml
index 4906028b..7ba62a4b 100644
--- a/wb_new_ui/assets/Main_Majiang/component/PlayerHead_3.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/PlayerHead_3.xml
@@ -2,13 +2,13 @@
 <component size="104,150" opaque="false" initName="gcm_info">
   <controller name="room_owner" pages="0,,1," selected="0"/>
   <controller name="bank" pages="0,,1," selected="0"/>
-  <controller name="read" pages="0,,1," selected="1"/>
+  <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="dismiss_room" pages="0,,1," selected="0"/>
   <controller name="piao_niao" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n32_e7qn" name="n32" src="gq7m5p" fileName="images/head/index_bg_01.png" xy="2,3" size="100,98" group="n37_e7qn" aspect="true"/>
+    <image id="n32_e7qn" name="n32" src="gq7m5p" fileName="font/images/head/index_bg_01.png" xy="2,3" size="100,98" group="n37_e7qn" aspect="true"/>
     <component id="n33_e7qn" name="btn_head" src="gq7m5q" fileName="component/head/Head.xml" xy="13,12" size="79,79" group="n37_e7qn" aspect="true"/>
     <graph id="n34_e7qn" name="offLine" xy="7,7" size="90,90" group="n37_e7qn" aspect="true" touchable="false" type="eclipse" lineSize="0" fillColor="#b3000000">
       <gearDisplay controller="offline" pages="1"/>
@@ -19,10 +19,10 @@
     <image id="n36_e7qn" name="zhuang" src="gq7m5u" fileName="images/z01.png" xy="64,-7" group="n37_e7qn" aspect="true">
       <gearDisplay controller="bank" pages="1"/>
     </image>
-    <component id="n39_h4ge" name="n39" xy="12,13" group="n37_e7qn" touchable="false">
+    <component id="n39_h4ge" name="n39" xy="12,13" size="100,100" group="n37_e7qn" touchable="false">
       <gearDisplay controller="dismiss_room" pages="1"/>
     </component>
-    <text id="n40_aawn" name="n40" xy="20,33" size="65,39" group="n37_e7qn" fontSize="30" color="#ffffff" text="离线">
+    <text id="n40_aawn" name="n40" xy="20,33" size="64,42" group="n37_e7qn" fontSize="30" color="#ffffff" text="离线">
       <gearDisplay controller="offline" pages="1"/>
     </text>
     <group id="n37_e7qn" name="n37" xy="-1,-7" size="113,120"/>
@@ -41,5 +41,11 @@
     <component id="n44_nip5" name="mask_piao" src="gq7m65" fileName="component/piao_niao/mask_piao.xml" xy="-19,67" touchable="false">
       <gearDisplay controller="piao_niao" pages="1"/>
     </component>
+    <component id="n45_p0ai" name="pb_tuoGuan_Bg" src="p0aisn" fileName="component/pb_tuoGuan_Bg.xml" xy="13,12" size="79,79">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <component id="n46_p0ai" name="pb_tuoGuan_Border" src="p0aism" fileName="component/pb_tuoGuan_Border.xml" xy="15,14" size="72,72">
+      <ProgressBar max="100"/>
+    </component>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/pb_tuoGuan_Bg.xml b/wb_new_ui/assets/Main_Majiang/component/pb_tuoGuan_Bg.xml
new file mode 100644
index 00000000..2240c62d
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/component/pb_tuoGuan_Bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="108,108" extention="ProgressBar" initName="pb_tuoGuan_Bg">
+  <displayList>
+    <image id="n5_psed" name="bar" src="psedso" fileName="images/bg.png" xy="0,0" size="108,108" alpha="0.5" fillMethod="radial360" fillClockwise="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <ProgressBar titleType="value"/>
+</component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/pb_tuoGuan_Border.xml b/wb_new_ui/assets/Main_Majiang/component/pb_tuoGuan_Border.xml
new file mode 100644
index 00000000..2040c6a7
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/component/pb_tuoGuan_Border.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="108,108" extention="ProgressBar" initName="pb_tuoGuan_Border">
+  <displayList>
+    <image id="n1_p0ai" name="bar" src="p0aisl" fileName="images/tuoguan.png" xy="-10,-10" size="129,128" fillMethod="radial360" fillClockwise="false" fillAmount="78">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n2_p0ai" name="title" xy="0,2" size="108,108" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <ProgressBar titleType="value"/>
+</component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/images/bg.png b/wb_new_ui/assets/Main_Majiang/images/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e11f5b38a5c3773ca457cb3120e58e9e6292fee
GIT binary patch
literal 6885
zcmeAS@N?(olHy`uVBq!ia0y~yV6gyU4mP038-bjDAjMc5<nF|<?wrg^AcrO0(btiI
zVPik{pF~z5pR>RtvY3H^?=T269?xHq!oVO^<>}%WQW5v|gd-<|0mG3EKh5|09+1>n
zGQt1+dnTZ!BWF2*WPp)6kaRdX2S_rg7K0?FoEeoE4U*BsFq#cUONP-hakMrVtsqC6
z2BVFl(RLy*7mPNFMjJ(=jiS+PFxn^@Z4`~x2BVFl(MHi|qiA%%baV`Pbo3lp4vaR6
gMjJ)IWFYw5?s!`5wgRjBlR=e(r>mdKI;Vst0B3Zy761SM

literal 0
HcmV?d00001

diff --git a/wb_new_ui/assets/Main_Majiang/images/tuoguan.png b/wb_new_ui/assets/Main_Majiang/images/tuoguan.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4abc879841c6c83a3e5b71e1090eca613a804a3
GIT binary patch
literal 3399
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

literal 0
HcmV?d00001

diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index 739aa380..81972035 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1028,6 +1028,10 @@
     <image id="m16msh" name="Rectangle 406.png" path="/component/clearing/clearing1/"/>
     <image id="m16msi" name="Rectangle 407.png" path="/component/clearing/clearing1/"/>
     <image id="m16msj" name="Group 215.png" path="/component/clearing/clearing1/"/>
+    <image id="p0aisl" name="tuoguan.png" path="/images/"/>
+    <component id="p0aism" name="pb_tuoGuan_Border.xml" path="/component/"/>
+    <component id="p0aisn" name="pb_tuoGuan_Bg.xml" path="/component/"/>
+    <image id="psedso" name="bg.png" path="/images/"/>
   </resources>
   <publish name="main_majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>
\ No newline at end of file