From 4240289bcbe4d8affe36f4150ace307ef7022a7f Mon Sep 17 00:00:00 2001
From: fy <>
Date: Wed, 6 May 2026 20:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E6=94=BE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=E5=B7=B2=E7=BB=8F=E4=BF=AE=E6=94=B9=E7=99=BE?=
 =?UTF-8?q?=E5=88=86=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Game/View/NewGroup/GroupInfoView.lua      |   8 +-
 .../NewGroup/MngView/GroupGameSettingView.lua |   6 +-
 .../extend/majiang/changsha/EXGameInfo.lua    |  20 ++---
 .../extend/majiang/gejiu/EXGameInfo.lua       |  20 ++---
 .../extend/majiang/gejiu/EXPlayBackView.lua   |  16 +++-
 .../extend/majiang/zhuanzhuan/EXGameInfo.lua  |  20 ++---
 .../extend/poker/chuntian/EXGameInfo.lua      |  20 ++---
 .../extend/poker/runfast/EXGameInfo.lua       |  20 ++---
 .../extend/poker/sanqianfen/EXGameInfo.lua    |   4 +-
 .../zipai/changdepaohuzi/EXGameInfo.lua       |  20 ++---
 .../zipai/changdepaohuzi/EXPlayBackView.lua   |  18 +++-
 .../extend/zipai/fulushou/EXGameInfo.lua      |  20 ++---
 .../extend/zipai/hsrunbeard/EXGameInfo.lua    |   4 +-
 .../extend/zipai/runbeard/EXGameInfo.lua      |  20 ++---
 .../zipai/yueyangwaihuzi/EXGameInfo.lua       |  20 ++---
 .../zipai/yueyangwaihuzi/EXPlayBackView.lua   |  17 +++-
 .../zipai/yueyangwaihuzi_bak/EXGameInfo.lua   |   4 +-
 fk101/wb_new_ui/.objs/workspace.json          |  85 ++++++++++--------
 .../wb_new_ui/assets/Main_Majiang/Main_2.xml  |  58 ++++++------
 .../Main_RunBeard/component/Main/Main_2.xml   |   8 +-
 .../Main/component/Player_card_info_2.xml     |   2 +-
 .../Main/component/Player_card_info_2.xml     |   2 +-
 .../NewGroup/mgr/View_GroupPersonStat.xml     |   6 +-
 .../main_majiang/ui/Main_Majiang_fui.bytes    | Bin 252275 -> 252297 bytes
 .../main_zipai/ui/Main_RunBeard_fui.bytes     | Bin 183908 -> 183908 bytes
 .../ui/Main_RunBeardMaJiang_fui.bytes         | Bin 156564 -> 156564 bytes
 .../ART/base/newgroup/ui/NewGroup_fui.bytes   | Bin 271363 -> 271386 bytes
 27 files changed, 232 insertions(+), 186 deletions(-)

diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
index a413198c..49ef7a03 100644
--- a/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
+++ b/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
@@ -173,7 +173,7 @@ local function __fillRoomItem(self, index, item, room)
     room_item:SetPlay(play)
 	-- local str="(人数:".. room.maxPlayers
 	-- if room.limitInRoom then
-	-- 	str=str.." 限制积分:"..room.limitInRoom/1000 ..")"
+	-- 	str=str.." 限制积分:"..d2ad(room.limitInRoom) ..")"
 	-- else
 	-- 	str=str..")"
 	-- end
@@ -181,7 +181,7 @@ local function __fillRoomItem(self, index, item, room)
 	
     local str = ""
     if room.limitInRoom then
-        str = str..room.limitInRoom/1000
+        str = d2ad(str..room.limitInRoom)
     end
 
 	if room.round==nil then
@@ -522,7 +522,7 @@ local function __fillRoomData(self)
 					end
 					local totalNum=1
 					if hp.tex_times_room then
-						totalNum=hp.tex_times_room/1000
+						totalNum=d2ad(hp.tex_times_room)
 					end
 					
 					for i=1,totalNum do
@@ -583,7 +583,7 @@ local function __fillRoomData(self)
 					
 					local totalNum=1
 					if hp and  hp.tex_times_room then
-						totalNum=hp.tex_times_room/1000
+						totalNum=d2ad(hp.tex_times_room)
 					end
 					for j=1,totalNum do
 						self.curRooms[#self.curRooms + 1] = self.curGroup.default_rooms[i]
diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
index 1b3e12d4..b29fd2f0 100644
--- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
+++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
@@ -228,7 +228,7 @@ function M:FillFagData()
 	local tex_times_room = panel_play_set:GetChild("tex_times_room")
 
 	if hpData and hpData.tex_times_room then
-		tex_times_room.text = hpData.tex_times_room/1000
+		tex_times_room.text = d2ad(hpData.tex_times_room)
 	else
 		tex_times_room.text = 1
 	end
@@ -493,7 +493,7 @@ function M:FillFagData()
                     play.config = json.encode(_data)
                     play.hp_times = self.hpData.times
                     play.maxPlayers = _data.maxPlayers
-					play.roomNum=self.hpData.tex_times_room/1000
+					play.roomNum=d2ad(self.hpData.tex_times_room)
 					play.maxRound=res.Data.maxRound
                     ViewUtil.ShowBannerOnScreenCenter("添加玩法成功")
                     self.callback(play)
@@ -533,7 +533,7 @@ function M:FillFagData()
                     play.config = json.encode(_data)
                     play.hp_times = self.hpData.times
                     play.maxPlayers = _data.maxPlayers
-					play.roomNum=self.hpData.tex_times_room/1000
+					play.roomNum=d2ad(self.hpData.tex_times_room)
                     play.maxRound=res.Data.maxRound
                     self.callback(play)
                     self:Destroy()
diff --git a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXGameInfo.lua
index e41c80ac..6ca17db7 100644
--- a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXGameInfo.lua
@@ -51,8 +51,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=value/d2ad
+							self.xipaiValue=value/d2ad
 						
 						end, 3, nil)
 						gniv:Show()
@@ -81,8 +81,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.anchouValueText.text=value/1000
-							self.anchouValue=value/1000
+							self.anchouValueText.text=value/d2ad
+							self.anchouValue=value/d2ad
 						
 						end, 3, nil)
 						gniv:Show()
@@ -256,8 +256,8 @@ function M:SelectedConfigData()
 		an_chou_score=self.anchouValue
 	end
 	
-	_data['xi_pai_score'] = xi_pai_score*1000
-	_data['an_chou_score'] = an_chou_score*1000
+	_data['xi_pai_score'] = ad2d(xi_pai_score)
+	_data['an_chou_score'] = ad2d(an_chou_score)
 	
 	if oldGameVersion==2 then
 		_data['niaofen_opt'] = niaofen_opt
@@ -334,11 +334,11 @@ function M:LoadConfigData(data)
 	end
 	
 	if oldGameVersion==2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValueText.text=data.xi_pai_score/d2ad(1000)
+		self.xipaiValue=data.xi_pai_score/d2ad(1000)
 
-		self.anchouValueText.text=data.an_chou_score/1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValueText.text=data.an_chou_score/d2ad(1000)
+		self.anchouValue=data.an_chou_score/d2ad(1000)
 	end
 	
 	if oldGameVersion==2 then
diff --git a/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXGameInfo.lua
index ffea1e1c..45f1c934 100644
--- a/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXGameInfo.lua
@@ -46,8 +46,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=ad2d(value)
+							self.xipaiValue=ad2d(value)
 						
 						end, 3, nil)
 						gniv:Show()
@@ -76,8 +76,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.anchouValueText.text=value/1000
-							self.anchouValue=value/1000
+							self.anchouValueText.text=d2ad(value)
+							self.anchouValue=d2ad(value)
 						
 						end, 3, nil)
 						gniv:Show()
@@ -152,8 +152,8 @@ function M:SelectedConfigData()
 		an_chou_score=self.anchouValue
 	end
 
-	_data['xi_pai_score'] = xi_pai_score*1000
-	_data['an_chou_score'] = an_chou_score*1000
+	_data['xi_pai_score'] = ad2d(xi_pai_score)
+	_data['an_chou_score'] = ad2d(an_chou_score)
 
 
     return _data
@@ -183,11 +183,11 @@ function M:LoadConfigData(data)
 	end
 
 	if oldGameVersion==2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValueText.text=d2ad(data.xi_pai_score)
+		self.xipaiValue=d2ad(data.xi_pai_score)
 
-		self.anchouValueText.text=data.an_chou_score/1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValueText.text=d2ad(data.an_chou_score)
+		self.anchouValue=d2ad(data.an_chou_score)
 	end
 	
  end 
diff --git a/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXPlayBackView.lua b/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXPlayBackView.lua
index 03bc01df..7e9d7e1e 100644
--- a/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXPlayBackView.lua
+++ b/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXPlayBackView.lua
@@ -52,9 +52,19 @@ function M:FillRoomData(data)
     local round = data.info.round
     self:UpdateRound(round)
     
- 	local roominfo_panel = self._view:GetChild("roominfo_panel1")
- 	roominfo_panel:GetChild("tex_roomid").text = room.room_id
- 	roominfo_panel:GetChild("tex_gametype").text = room.room_config:GetGameName()
+	local roominfo_panel = self._view:GetChild("roominfo_panel")
+	if roominfo_panel then
+		local tex_roomid = roominfo_panel:GetChild("tex_roomid")
+		local tex_gametype = roominfo_panel:GetChild("tex_gametype")
+		
+		if tex_roomid then
+			tex_roomid.text = room.room_id
+		end
+		
+		if tex_gametype then
+			tex_gametype.text = room.room_config:GetGameName()
+		end
+	end
 
     for i = 1, #room.player_list do
     	local p = room.player_list[i]
diff --git a/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXGameInfo.lua
index b487f7ad..1c2255cd 100644
--- a/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXGameInfo.lua
@@ -50,8 +50,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=d2ad(value)
+							self.xipaiValue=d2ad(value)
 						
 						end, 3, nil)
 						gniv:Show()
@@ -80,8 +80,8 @@ function M:FillData()
 						ViewUtil.ErrorTip(1,"输入数据异常！")
 					end
 					
-					self.anchouValueText.text=value/1000
-					self.anchouValue=value/1000
+					self.anchouValueText.text=d2ad(value)
+					self.anchouValue=d2ad(value)
 				
 				end, 3, nil)
 				gniv:Show()
@@ -217,8 +217,8 @@ function M:SelectedConfigData()
 		an_chou_score=self.anchouValue
 	end
 	
-	_data['xi_pai_score'] = xi_pai_score*1000
-	_data['an_chou_score'] = an_chou_score*1000
+	_data['xi_pai_score'] = ad2d(xi_pai_score)
+	_data['an_chou_score'] = ad2d(an_chou_score)
 	--_data["fengding_score"] = fengding_score
 
     return _data
@@ -274,11 +274,11 @@ function M:LoadConfigData(data)
 	-- end
 	
 	if oldGameVersion==2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
-	    self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValueText.text=d2ad(data.xi_pai_score)
+	    self.xipaiValue=d2ad(data.xi_pai_score)
 
-		self.anchouValueText.text=data.an_chou_score/1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValueText.text=d2ad(data.an_chou_score)
+		self.anchouValue=d2ad(data.an_chou_score)
 	end
 	
 	-- if _config:GetController("fengding")  then
diff --git a/fk101/lua_probject/extend_project/extend/poker/chuntian/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/poker/chuntian/EXGameInfo.lua
index aecc0c4e..386c1925 100644
--- a/fk101/lua_probject/extend_project/extend/poker/chuntian/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/poker/chuntian/EXGameInfo.lua
@@ -53,8 +53,8 @@ function M:FillData(view, index)
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=d2ad(value)
+							self.xipaiValue=d2ad(value)
 						
 						end, 0, nil)
 						gniv:Show()
@@ -81,8 +81,8 @@ function M:FillData(view, index)
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.anchouValueText.text=value/1000
-							self.anchouValue=value/1000
+							self.anchouValueText.text=d2ad(value)
+							self.anchouValue=d2ad(value)
 						
 						end, 3, nil)
 						gniv:Show()
@@ -139,11 +139,11 @@ function M:LoadConfigData(data)
 	
 	
 	if oldGameVersion==2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValueText.text=d2ad(data.xi_pai_score)
+		self.xipaiValue=d2ad(data.xi_pai_score)
 
-		self.anchouValueText.text=data.an_chou_score/1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValueText.text=d2ad(data.an_chou_score)
+		self.anchouValue=d2ad(data.an_chou_score)
 	end
 	
 end
@@ -195,8 +195,8 @@ function M:SelectedConfigData()
 		an_chou_score=self.anchouValue
 	end
 	
-	_data['xi_pai_score'] = xi_pai_score*1000
-	_data['an_chou_score'] = an_chou_score*1000
+	_data['xi_pai_score'] = ad2d(xi_pai_score)
+	_data['an_chou_score'] = ad2d(an_chou_score)
 	
     return _data
 end
diff --git a/fk101/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua
index 7e133f25..8987857a 100644
--- a/fk101/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua
@@ -55,8 +55,8 @@ function M:FillData(view, index)
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=d2ad(value)
+							self.xipaiValue=d2ad(value)
 						
 						end, 0, nil)
 						gniv:Show()
@@ -85,8 +85,8 @@ function M:FillData(view, index)
 						ViewUtil.ErrorTip(1,"输入数据异常！")
 					end
 					
-					self.anchouValueText.text=value/1000
-					self.anchouValue=value/1000
+					self.anchouValueText.text=d2ad(value)
+					self.anchouValue=d2ad(value)
 				
 				end, 3, nil)
 				gniv:Show()
@@ -208,11 +208,11 @@ function M:LoadConfigData(data)
 	
 	
 	if oldGameVersion==2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValueText.text=d2ad(data.xi_pai_score)
+		self.xipaiValue=d2ad(data.xi_pai_score)
 
-		self.anchouValueText.text=data.an_chou_score/1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValueText.text=d2ad(data.an_chou_score)
+		self.anchouValue=d2ad(data.an_chou_score)
         
 	end
 	
@@ -308,8 +308,8 @@ function M:SelectedConfigData()
         an_chou_score=self.anchouValue
 	end
 	
-	_data['xi_pai_score'] = xi_pai_score*1000
-    _data['an_chou_score'] = an_chou_score*1000
+	_data['xi_pai_score'] = ad2d(xi_pai_score)
+    _data['an_chou_score'] = ad2d(an_chou_score)
 	
     return _data
 end
diff --git a/fk101/lua_probject/extend_project/extend/poker/sanqianfen/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/poker/sanqianfen/EXGameInfo.lua
index 3478f206..0ab817e9 100644
--- a/fk101/lua_probject/extend_project/extend/poker/sanqianfen/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/poker/sanqianfen/EXGameInfo.lua
@@ -50,8 +50,8 @@ function M:FillData(view, index)
 	-- 							ViewUtil.ErrorTip(1,"输入数据异常！")
 	-- 						end
 							
-	-- 						self.xipaiValueText.text=value/1000
-	-- 						self.xipaiValue=value/1000
+	-- 						self.xipaiValueText.text=d2ad(value)
+	-- 						self.xipaiValue=d2ad(value)
 						
 	-- 					end, 0, nil)
 	-- 					gniv:Show()
diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXGameInfo.lua
index f9256127..207f2abc 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXGameInfo.lua
@@ -49,8 +49,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=d2ad(value)
+							self.xipaiValue=d2ad(value)
 						
 						end, 3, nil)
 						gniv:Show()
@@ -77,8 +77,8 @@ function M:FillData()
                                 ViewUtil.ErrorTip(1,"输入数据异常！")
                             end
                             
-                            self.anchouValueText.text=value/1000
-                            self.anchouValue=value/1000
+                            self.anchouValueText.text=d2ad(value)
+                            self.anchouValue=d2ad(value)
                         
                         end, 3, nil)
                         gniv:Show()
@@ -284,8 +284,8 @@ function M:SelectedConfigData()
 		an_chou_score=self.anchouValue
 	end
 	
-	_data['xi_pai_score'] = xi_pai_score*1000
-    _data['an_chou_score'] = an_chou_score*1000
+	_data['xi_pai_score'] = ad2d(xi_pai_score)
+    _data['an_chou_score'] = ad2d(an_chou_score)
 
 	_data['xi_pai'] = xi_pai
     return _data
@@ -332,11 +332,11 @@ function M:LoadConfigData(data)
 	
 
     if oldGameVersion==2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValueText.text=d2ad(data.xi_pai_score)
+		self.xipaiValue=d2ad(data.xi_pai_score)
 
-		self.anchouValueText.text=data.an_chou_score/1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValueText.text=d2ad(data.an_chou_score)
+		self.anchouValue=d2ad(data.an_chou_score)
 	end
 	
 end
diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXPlayBackView.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXPlayBackView.lua
index 4ec205fc..be8a9390 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXPlayBackView.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXPlayBackView.lua
@@ -114,9 +114,21 @@ function M:FillRoomData(data)
     self._currentStep = 0
     local room = DataManager.CurrenRoom
     local _player_card_info = self._player_card_info
-    local roominfo_panel = self._view:GetChild('roominfo_panel1')
-    roominfo_panel:GetChild('tex_roomid').text = room.room_id
-    roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName()
+ -- 在 d:\Gitlj\robot_client\fk101\lua_probject\extend_project\extend\zipai\yueyangwaihuzi\EXPlayBackView.lua 中
+
+local roominfo_panel = self._view:GetChild("roominfo_panel")
+if roominfo_panel then
+    local tex_roomid = roominfo_panel:GetChild("tex_roomid")
+    local tex_gametype = roominfo_panel:GetChild("tex_gametype") -- 如果有的话
+    
+    if tex_roomid then
+        tex_roomid.text = room.room_id
+    end
+    
+    if tex_gametype then
+        tex_gametype.text = room.room_config:GetGameName()
+    end
+end
     for i = 1, #room.player_list do
         local p = room.player_list[i]
         local card_info = _player_card_info[self:GetPos(p.seat)]
diff --git a/fk101/lua_probject/extend_project/extend/zipai/fulushou/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/zipai/fulushou/EXGameInfo.lua
index 8a7e3e96..dd1332a9 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/fulushou/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/fulushou/EXGameInfo.lua
@@ -49,8 +49,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=d2ad(value)
+							self.xipaiValue=d2ad(value)
 						
 						end, 3, nil)
 						gniv:Show()
@@ -79,8 +79,8 @@ function M:FillData()
 						ViewUtil.ErrorTip(1,"输入数据异常！")
 					end
 					
-					self.anchouValueText.text=value/1000
-					self.anchouValue=value/1000
+					self.anchouValueText.text=d2ad(value)
+					self.anchouValue=d2ad(value)
 				
 				end, 3, nil)
 				gniv:Show()
@@ -178,8 +178,8 @@ function M:SelectedConfigData()
 		an_chou_score=self.anchouValue
 	end
 	
-	_data['xi_pai_score'] = xi_pai_score*1000
-    _data['an_chou_score'] = an_chou_score*1000
+	_data['xi_pai_score'] = ad2d(xi_pai_score)
+    _data['an_chou_score'] = ad2d(an_chou_score)
 	
 	
     return _data
@@ -220,11 +220,11 @@ function M:LoadConfigData(data)
 	end
 	
 	if oldGameVersion==2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValueText.text=d2ad(data.xi_pai_score)
+		self.xipaiValue=d2ad(data.xi_pai_score)
 
-		self.anchouValueText.text=data.an_chou_score/1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValueText.text=d2ad(data.an_chou_score)
+		self.anchouValue=d2ad(data.an_chou_score)
 	end
 	
 end
diff --git a/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/EXGameInfo.lua
index c8b19643..12e73401 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/EXGameInfo.lua
@@ -155,8 +155,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=d2ad(value)
+							self.xipaiValue=d2ad(value)
 						
 						end, 3, nil)
 						gniv:Show()
diff --git a/fk101/lua_probject/extend_project/extend/zipai/runbeard/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/zipai/runbeard/EXGameInfo.lua
index a6aee365..581c49a2 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/runbeard/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/runbeard/EXGameInfo.lua
@@ -50,8 +50,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=d2ad(value)
+							self.xipaiValue=d2ad(value)
 						
 						end, 3, nil)
 						gniv:Show()
@@ -79,8 +79,8 @@ function M:FillData()
                                 ViewUtil.ErrorTip(1,"输入数据异常！")
                             end
                             
-                            self.anchouValueText.text=value/1000
-                            self.anchouValue=value/1000
+                            self.anchouValueText.text=d2ad(value)
+                            self.anchouValue=d2ad(value)
                         
                         end, 3, nil)
                         gniv:Show()
@@ -311,8 +311,8 @@ function M:SelectedConfigData()
         an_chou_score=self.anchouValue
 	end
 	
-    _data['xi_pai_score'] = xi_pai_score*1000
-    _data['an_chou_score'] = an_chou_score*1000
+    _data['xi_pai_score'] = ad2d(xi_pai_score)
+    _data['an_chou_score'] = ad2d(an_chou_score)
     
     return _data
 end
@@ -373,11 +373,11 @@ function M:LoadConfigData(data)
 	
 
     if oldGameVersion==2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValueText.text=d2ad(data.xi_pai_score)
+		self.xipaiValue=d2ad(data.xi_pai_score)
 
-		self.anchouValueText.text=data.an_chou_score/1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValueText.text=d2ad(data.an_chou_score)
+		self.anchouValue=d2ad(data.an_chou_score)
 	end
 
 end
diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXGameInfo.lua
index 2e5ef647..b19e1cb6 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXGameInfo.lua
@@ -49,8 +49,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=d2ad(value)
+							self.xipaiValue=d2ad(value)
 						
 						end, 3, nil)
 						gniv:Show()
@@ -79,8 +79,8 @@ function M:FillData()
 						ViewUtil.ErrorTip(1,"输入数据异常！")
 					end
 					
-					self.anchouValueText.text=value/1000
-					self.anchouValue=value/1000
+					self.anchouValueText.text=d2ad(value)
+					self.anchouValue=d2ad(value)
 				
 				end, 3, nil)
 				gniv:Show()
@@ -156,8 +156,8 @@ function M:SelectedConfigData()
 		an_chou_score=self.anchouValue
 	end
 	
-	_data['xi_pai_score'] = xi_pai_score*1000
-    _data['an_chou_score'] = an_chou_score*1000
+	_data['xi_pai_score'] = ad2d(xi_pai_score)
+    _data['an_chou_score'] = ad2d(an_chou_score)
 	
     return _data
 end
@@ -181,11 +181,11 @@ function M:LoadConfigData(data)
 	end
 	
 	if oldGameVersion==2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValueText.text=d2ad(data.xi_pai_score)
+		self.xipaiValue=d2ad(data.xi_pai_score)
 
-		self.anchouValueText.text=data.an_chou_score/1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValueText.text=d2ad(data.an_chou_score)
+		self.anchouValue=d2ad(data.an_chou_score)
 	end
 	
 end
diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXPlayBackView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXPlayBackView.lua
index 4371e666..2c7dd20f 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXPlayBackView.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXPlayBackView.lua
@@ -114,9 +114,20 @@ function M:FillRoomData(data)
     self._currentStep = 0
     local room = DataManager.CurrenRoom
     local _player_card_info = self._player_card_info
-    local roominfo_panel = self._view:GetChild('roominfo_panel1')
-    roominfo_panel:GetChild('tex_roomid').text = room.room_id
-    roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName()
+
+local roominfo_panel = self._view:GetChild("roominfo_panel")
+if roominfo_panel then
+    local tex_roomid = roominfo_panel:GetChild("tex_roomid")
+    local tex_gametype = roominfo_panel:GetChild("tex_gametype") -- 如果有的话
+    
+    if tex_roomid then
+        tex_roomid.text = room.room_id
+    end
+    
+    if tex_gametype then
+        tex_gametype.text = room.room_config:GetGameName()
+    end
+end
     for i = 1, #room.player_list do
         local p = room.player_list[i]
         local card_info = _player_card_info[self:GetPos(p.seat)]
diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/EXGameInfo.lua
index 6e1b0011..74ba68ea 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/EXGameInfo.lua
@@ -44,8 +44,8 @@ function M:FillData()
 								ViewUtil.ErrorTip(1,"输入数据异常！")
 							end
 							
-							self.xipaiValueText.text=value/1000
-							self.xipaiValue=value/1000
+							self.xipaiValueText.text=d2ad(value)
+							self.xipaiValue=d2ad(value)
 						
 						end, 3, nil)
 						gniv:Show()
diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json
index e6f9aa5b..7b21dd3e 100644
--- a/fk101/wb_new_ui/.objs/workspace.json
+++ b/fk101/wb_new_ui/.objs/workspace.json
@@ -5,7 +5,46 @@
     "ui://m7iejg46jgh8hwv",
     "ui://1hl55dqmc4r115",
     "ui://yzaioi79f55qwa",
+    "ui://m7iejg46l679hws",
+    "ui://27vd145beeqmch0",
+    "ui://m7iejg46kwi0hmc",
+    "ui://yzaioi79f55qw5",
+    "ui://27vd145bdjzo18",
+    "ui://yzaioi79f55qvw",
+    "ui://c7j2rnvqtpf08x",
+    "ui://fnuxqeflkllg1x",
     "ui://5cdldr01qaqf9c",
+    "ui://5cdldr01qaqf7o",
+    "ui://5cdldr01qaqfa2",
+    "ui://442j0uepdafga8",
+    "ui://ypulwxjhl9mn37",
+    "ui://k15boclkl9mn37",
+    "ui://4skil1l6r6qo1kc",
+    "ui://5cdldr01qaqfa4",
+    "ui://5cdldr01qaqfaw",
+    "ui://3z9lj55vjokmft",
+    "ui://2zlli80mw9te0",
+    "ui://2zlli80mr6cyce9",
+    "ui://2d9xdj6zfn7fao",
+    "ui://2d9xdj6zlumrgj",
+    "ui://27vd145bofsx1e",
+    "ui://m7iejg46mpllhuq",
+    "ui://m7iejg46mpllhut",
+    "ui://m7iejg4610snh5j",
+    "ui://m7iejg46jvvohyf",
+    "ui://3z9lj55vjokmwr",
+    "ui://3z9lj55vjokm7l",
+    "ui://4skil1l6ms5spy",
+    "ui://2d9xdj6znlwcgk",
+    "ui://2d9xdj6zlwcl5m",
+    "ui://27vd145beeqmcgp",
+    "ui://0khx14are0py2",
+    "ui://3z9lj55vjokmet",
+    "ui://3z9lj55vjokmey",
+    "ui://3z9lj55vjokmfu",
+    "ui://3z9lj55vjokmdt",
+    "ui://3z9lj55vjokmdr",
+    "ui://3z9lj55vjokme2",
     "ui://5cdldr01qaqf6x",
     "ui://5cdldr01qaqf7q",
     "ui://yzaioi79f55qw4",
@@ -21,47 +60,21 @@
   "test.device": "Xiaomi 9",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://5cdldr01qaqf9c",
+  "doc.activeDoc": "ui://yzaioi79f55qw5",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "27vd145b",
-    "/",
-    "27vd145b",
-    "/buttons/",
-    "27vd145b",
-    "/conMui/",
-    "egnzysm7",
-    "/",
-    "egnzysm7",
-    "/component/",
-    "egnzysm7",
-    "/component/create_room/",
-    "3n2top74",
-    "/",
-    "5cdldr01",
-    "/",
-    "5cdldr01",
-    "/component/",
-    "5cdldr01",
-    "/component/Main/",
-    "5cdldr01",
-    "/component/Main/images/",
-    "5cdldr01",
-    "/component/Main/new_ui/",
-    "5cdldr01",
-    "/component/game/",
-    "yzaioi79",
-    "/",
-    "yzaioi79",
-    "/component/",
-    "yzaioi79",
-    "/component/Main/",
-    "yzaioi79",
-    "/component/Main/component/",
     "m7iejg46",
     "/",
     "m7iejg46",
-    "/mgr/"
+    "/component/",
+    "m7iejg46",
+    "/component/Lst_room/",
+    "m7iejg46",
+    "/component/mail/",
+    "m7iejg46",
+    "/mgr/",
+    "m7iejg46",
+    "/mgr/Mui/"
   ],
   "auxline1": true,
   "snapToGrid": true,
diff --git a/fk101/wb_new_ui/assets/Main_Majiang/Main_2.xml b/fk101/wb_new_ui/assets/Main_Majiang/Main_2.xml
index b1131046..fb766469 100644
--- a/fk101/wb_new_ui/assets/Main_Majiang/Main_2.xml
+++ b/fk101/wb_new_ui/assets/Main_Majiang/Main_2.xml
@@ -1,98 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" designImage="ui://3z9lj55vjokm7i">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="1"/>
+<component size="2532,1172" designImage="ui://3z9lj55vjokm7i">
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="3"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <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="100,39" group="n60_v38k" fontSize="28" color="#cccccc" align="center" text="第1/8局" bold="true">
+    <text id="n76_pady" name="tex_round" xy="1342,489" pivot="0.5,0" anchor="true" size="136,39" group="n60_v38k" fontSize="28" color="#cccccc" align="center" autoSize="none" bold="true" 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="92,39" group="n60_v38k" fontSize="28" color="#cccccc" text="剩余72" bold="true">
+    <text id="n77_pady" name="remaining_card" xy="1002,491" size="158,39" group="n60_v38k" fontSize="28" color="#cccccc" autoSize="none" bold="true" 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="剩         张" bold="true">
+    <text id="n78_pady" name="txt_remain" xy="1134,661" size="174,47" group="n60_v38k" fontSize="40" color="#ffffff" autoSize="shrink" bold="true" 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="50,54" group="n60_v38k" font="Microsoft YaHei" fontSize="40" color="#ffffff" align="center" vAlign="middle" text="80" bold="true">
+    <text id="n79_pady" name="txt_remaincount" xy="1221,685" pivot="0.5,0.5" anchor="true" size="54,54" group="n60_v38k" font="Microsoft YaHei" fontSize="40" color="#ffffff" align="center" vAlign="middle" bold="true" text="80">
       <gearDisplay controller="state" pages="1"/>
     </text>
-    <component id="n80_pady" name="cardbox" src="jokm5z" fileName="component/turn/Gcm_box_4.xml" xy="643,311" group="n60_v38k">
+    <component id="n80_pady" name="cardbox" src="jokm5z" fileName="component/turn/Gcm_box_4.xml" xy="1160,538" group="n60_v38k">
       <gearDisplay controller="state" pages="1,3"/>
     </component>
-    <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"/>
+    <group id="n60_v38k" name="n60" xy="1002,489" size="408,223" advanced="true">
+      <gearXY controller="3d" pages="0,1" values="1002,489|1063,239"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n12" name="btn_wxyqhy" src="jokma5" fileName="buttons/Btn_wxyq.xml" xy="448,258" group="n13">
+    <component id="n12" name="btn_wxyqhy" src="jokma5" fileName="buttons/Btn_wxyq.xml" xy="1047,469" group="n13">
       <gearDisplay controller="sdk" pages="0"/>
       <relation target="" sidePair="middle-middle"/>
     </component>
-    <group id="n13" name="n13" xy="448,258" size="438,147" visible="false" advanced="true">
+    <group id="n13" name="n13" xy="1047,469" size="438,147" visible="false" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n37_kba2" name="roominfo_panel1" src="jokmws" fileName="RoomInfoPanel1.xml" xy="12,110" size="400,67" touchable="false">
+    <component id="n37_kba2" name="roominfo_panel1" src="jokmws" fileName="RoomInfoPanel1.xml" xy="68,153" size="400,67" touchable="false">
       <gearDisplay controller="state" pages="3"/>
       <relation target="n33_hp0b" sidePair="top-bottom"/>
     </component>
-    <component id="n41_ppzk" name="player_card_info2" src="jokmlu" fileName="component/Player_card_info_3(1).xml" xy="0,86" size="1334,99">
+    <component id="n41_ppzk" name="player_card_info2" src="jokmlu" fileName="component/Player_card_info_3(1).xml" xy="613,170" size="1334,99">
       <gearDisplay controller="state" pages="1,3"/>
     </component>
-    <component id="n39_ppzk" name="player_card_info1" src="jokmlt" fileName="component/Player_card_info_1(1).xml" xy="-1,535">
+    <component id="n39_ppzk" name="player_card_info1" src="jokmlt" fileName="component/Player_card_info_1(1).xml" xy="193,919">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n17" name="player_info2" src="jokmls" fileName="component/PlayerHead_3.xml" xy="1007,7">
+    <component id="n17" name="player_info2" src="jokmls" fileName="component/PlayerHead_3.xml" xy="1950,37" scale="1.5,1.5">
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n7" name="player_info1" src="jokmlo" fileName="component/PlayerHead_1.xml" xy="17,468">
-      <gearXY controller="state" pages="1,3" values="17,468|17,468" default="530,516"/>
+    <component id="n7" name="player_info1" src="jokmlo" fileName="component/PlayerHead_1.xml" xy="32,798" scale="1.5,1.5">
+      <gearXY controller="state" pages="1,3" values="17,890|32,798" default="530,938"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
     <component id="n31_h1uu" name="roominfo_panel" src="jokmwt" fileName="RoomInfoPanel.xml" xy="0,0">
       <gearDisplay controller="state" pages="0,1,2"/>
     </component>
-    <component id="n24" name="right_panel" src="jokmwu" fileName="RightPanel_new.xml" xy="969,-1" controller="style,0">
+    <component id="n24" name="right_panel" src="jokmwu" fileName="RightPanel_new.xml" xy="2167,-1" controller="style,0">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n46_u4l2" name="btn_rule" src="jokmae" fileName="buttons/Btn_Introduce.xml" xy="1269,114">
+    <component id="n46_u4l2" name="btn_rule" src="jokmae" fileName="buttons/Btn_Introduce.xml" xy="2467,114">
       <gearDisplay controller="state" pages="3"/>
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n34_k3io" name="btn_ready" src="jokm6s" fileName="component/btn_ready.xml" xy="516,639" group="n36_k3io" visible="false">
+    <component id="n34_k3io" name="btn_ready" src="jokm6s" fileName="component/btn_ready.xml" xy="1115,1061" group="n36_k3io" visible="false">
       <gearDisplay controller="action" pages="0"/>
       <Button icon="ui://3z9lj55vjokm6u"/>
     </component>
-    <component id="n35_k3io" name="btn_start" src="jokm6v" fileName="buttons/Btn_Yellow.xml" xy="534,639" group="n36_k3io">
+    <component id="n35_k3io" name="btn_start" src="jokm6v" fileName="buttons/Btn_Yellow.xml" xy="1133,1061" group="n36_k3io">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://3z9lj55vjokm6w"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="516,639" size="266,100" advanced="true">
+    <group id="n36_k3io" name="n36" xy="1115,1061" size="266,100" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
-    <component id="n32_h1uu" name="gcm_chat" src="jokm77" fileName="Gcm_chat.xml" xy="1246,379" group="n52_cnxs">
+    <component id="n32_h1uu" name="gcm_chat" src="jokm77" fileName="Gcm_chat.xml" xy="2444,801" group="n52_cnxs">
       <gearDisplay controller="state" pages="0,1,2"/>
     </component>
-    <component id="n50_cnxs" name="btn_getRoomNum" src="jokmag" fileName="buttons/Btn_blue_long.xml" xy="924,659" group="n52_cnxs">
+    <component id="n50_cnxs" name="btn_getRoomNum" src="jokmag" fileName="buttons/Btn_blue_long.xml" xy="2122,1081" group="n52_cnxs">
       <gearDisplay controller="state" pages="0"/>
       <Button icon="ui://3z9lj55vjokmm8"/>
     </component>
-    <group id="n52_cnxs" name="n52" xy="924,379" size="406,345" advanced="true">
+    <group id="n52_cnxs" name="n52" xy="2122,801" size="406,345" advanced="true">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </group>
-    <component id="n57_rayb" name="panel_record" src="jokm6x" fileName="component/record/Record.xml" xy="379,435" group="n59_v38k" alpha="0.5">
+    <component id="n57_rayb" name="panel_record" src="jokm6x" fileName="component/record/Record.xml" xy="978,721" group="n59_v38k" alpha="0.5">
       <gearDisplay controller="state" pages="3"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n56_cnxs" name="mask_tips" src="jokm6c" fileName="component/Component1.xml" xy="662,480" group="n59_v38k">
+    <component id="n56_cnxs" name="mask_tips" src="jokm6c" fileName="component/Component1.xml" xy="1261,766" group="n59_v38k">
       <relation target="" sidePair="center-center"/>
     </component>
-    <group id="n59_v38k" name="n59" xy="379,435" size="575,165"/>
-    <component id="n33_hp0b" name="btn_back_lobby" src="jokmai" fileName="buttons/Btn_back_lobby.xml" xy="0,-1">
+    <group id="n59_v38k" name="n59" xy="978,721" size="575,165"/>
+    <component id="n33_hp0b" name="btn_back_lobby" src="jokmai" fileName="buttons/Btn_back_lobby.xml" xy="68,33">
       <gearDisplay controller="state" pages="3"/>
     </component>
   </displayList>
diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
index 3b593883..eceb7d05 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1172" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="3"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
-  <controller name="action" pages="2,空,0,准备,1,开始" selected="2"/>
+  <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="jushu" pages="0,,1," selected="0"/>
   <controller name="bg_state" pages="0,,1,,2," selected="0"/>
   <displayList>
@@ -48,7 +48,7 @@
       <relation target="" sidePair="rightext-left,topext-top,bottomext-top,leftext-left"/>
     </component>
     <component id="n194_syh3" name="gcm_chat" src="qaqfa4" fileName="component/Main/Main_2_chat.xml" xy="2388,376" visible="false"/>
-    <component id="n7" name="player_info1" src="qaqf6x" fileName="component/Main/component/PlayerHead_1.xml" xy="49,707" size="200,336">
+    <component id="n7" name="player_info1" src="qaqf6x" fileName="component/Main/component/PlayerHead_1.xml" xy="48,570" size="200,336">
       <gearXY controller="state" pages="0,1,2,3" values="69,602|49,707|54,675|48,570"/>
       <relation target="" sidePair="rightext-left,topext-bottom%,bottomext-bottom,leftext-left"/>
     </component>
@@ -94,7 +94,7 @@
     <loader id="n153_8th3" name="cardAnima" xy="625,86" size="50,30" visible="false" touchable="false" url="ui://3bfrwj0h8th37l" autoSize="true">
       <gearDisplay controller="state" pages="1"/>
     </loader>
-    <component id="n57_rayb" name="panel_record" src="qaqfaj" fileName="component/record/Record.xml" xy="836,425" scale="1.2,1.2" alpha="0.5">
+    <component id="n57_rayb" name="panel_record" src="qaqfaj" fileName="component/record/Record.xml" xy="981,613" scale="1.2,1.2" alpha="0.5">
       <gearDisplay controller="state" pages="3"/>
       <relation target="" sidePair="center-center"/>
     </component>
diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
index a9d1021c..5d3c1dac 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
@@ -5,7 +5,7 @@
     <list id="n48_lr5d" name="windcard_list" xy="1,350" size="535,530" touchable="false" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw"/>
     <component id="n50_n1ry" name="mask_liangpai" src="qaqf60" fileName="component/Component1.xml" xy="200,83" size="5,5"/>
     <component id="n25" name="area_outcard_list" src="qaqf60" fileName="component/Component1.xml" xy="289,-46" size="100,100"/>
-    <component id="n51_n7o4" name="area_handcard_list" src="qaqf60" fileName="component/Component1.xml" xy="6,680" size="717,533" touchable="false"/>
+    <component id="n51_n7o4" name="area_handcard_list" src="qaqf60" fileName="component/Component1.xml" xy="6,349" size="717,533" touchable="false"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="XY" target="n25" tween="true" startValue="-63,105" endValue="121.45,295" duration="4"/>
diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml
index a7b8dbff..b7899040 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" opaque="false" initName="player_card_info">
   <displayList>
-    <component id="n52_oske" name="area_handcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="6,680" size="717,533" touchable="false"/>
+    <component id="n52_oske" name="area_handcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="6,349" size="717,533" touchable="false"/>
     <list id="n47_lr5d" name="area_fz_list" xy="196,31" size="713,268" layout="row" scroll="horizontal" colGap="20" defaultItem="ui://v6yvqp7wlr5d30" vAlign="middle"/>
     <list id="n48_lr5d" name="windcard_list" xy="0,350" size="535,530" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://yzaioi79f55qvw" autoClearItems="true">
       <item/>
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPersonStat.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPersonStat.xml
index db01e3eb..09c7b059 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPersonStat.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPersonStat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1866,930">
   <controller name="record" pages="0,,1," selected="1"/>
-  <controller name="type" pages="0,,1,,2," selected="0"/>
+  <controller name="type" pages="0,,1,,2," selected="2"/>
   <displayList>
     <list id="n115_l679" name="lst_mgr_index" xy="8,-114" size="830,112" group="n83_kwi0" layout="row" overflow="hidden" colGap="1" defaultItem="ui://27vd145beeqmch0" selectionController="type">
       <item url="ui://27vd145bjoap7i6d" title="今天"/>
@@ -29,7 +29,7 @@
       <item/>
     </list>
     <group id="n121_l679" name="record0" xy="21,18" size="1833,612"/>
-    <component id="n111_kwi0" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="919,494" size="23,50" group="n112_kwi0">
+    <component id="n111_kwi0" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="816,685" size="126,96" group="n112_kwi0">
       <relation target="" sidePair="center-center%"/>
       <Button controller="record" page="0"/>
     </component>
@@ -42,7 +42,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n112_kwi0" name="record1" xy="30,27" size="1812,610" advanced="true">
+    <group id="n112_kwi0" name="record1" xy="30,27" size="1812,754" advanced="true">
       <gearDisplay controller="record" pages="1"/>
     </group>
     <image id="n122_j120" name="n122" pkg="m7iejg46" src="j1207i2s" fileName="个人战绩统计_PxCook.png" xy="-545,-210" visible="false" alpha="0.5"/>
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 08698ec778545f61f0d62fe948c7b1f2c90f0ce0..365fe611f0132e6cc175700b31ba3e4db300c9d8 100644
GIT binary patch
delta 678
zcmX|7T}V@L6hHUeySsb0a+@$EbLwunMSg@)MpR>4g48G&^b%rkJ(zQDb1)SmXN(ji
zs+*qKgILi+QZGjMU|&A;R*^vu_2P>w`t+e5>Y=Uk-?Bd(IOq5Kosa+T$D(8Mf#XV8
ze*)skUC*+STts>p!JmEMfUFg?4^psHlmPT~0OdMsY&$d|H8}Qg++k!ZM-_)x5S3Sv
zQ}!I*uv-EE(kGq)6Xfg1Zn`&uZW`~$M!Wo(sV{<>qo=2E8y$+_7J5B~)#mUqH~nIb
zs>A_snmjQ~*p=s;-xvB$%EvIRDiaLUk!u{=DL8=jj`BpYOv<xr&2;(e%+V2>tAfKW
z{)L~34KQ8bYi2HEy{go*_^r8ezLquyu=8I{EphC%bg^`n)-Lk&<v99PJj=iWef3H0
zR5OT%uwsRMBTDYWo#f1+!-!fXaKaG?!BL1n6r#HJu2i%HE!P07bKKBOu3^bA6R5Pw
zV1-hNF@VhfwmwKg1~R(#vQ&f)i!i;3cQlALFZ~`wr&}I{{hKiV6|0$FpoRoqKrKU8
zr?Jr-vsr1rP15OA0(YzWZI-9ZtYJ`75?fTIhmB~aXcEt;%7Dnr2E0gO_a^6QmBQ4M
zVu$o89`7|n@3&Jvg&nGPoEr{uZP4-r9(IUY_6pBuI8M_|Ki}Cq#B1d@eB3H!Tcs1K
z@{RK%g>vYjKSSs*o9h)PU5cb}DUy~?1{_s|$-C>1XAkTxJevPFIkj|aQC{`^1(Rl`
AEC2ui

delta 455
zcmXw!Pe_w-7{{OA_igshH*%Xv*j%B9jUv=m84|>dpkN^cU4$-ym*uv1)-E|=Z!1|s
zsQFUgf}lDCb*Wf{fkZ(k>kxsL#6ySd5Ht^Z=;G|zp&xwU_wafCPQPi}sI|?V4!)G;
zv(CJ}k)BGMw`pu<lD(F_X8$s&?S>Hv42YnvIj!w>Gqp$QQ=W+gx0HsOFugMFaO(>8
zJNP7Gy0lP686U%0PI~BIWef)#bpKbE_~9Ztc`}P#{NW+Nzv^3%QD0*$i-LoX`v2T)
zljMUeii}opjHw*DxLUz(v*d>p`}~RP4j)$#@!RWr7@EN#*K-(Pc?MCY@;JxeH*u7U
zd7V(7#W4F_*xbB@VdwjHBajNr>*?#f8#gh3&IGvV!U?-OjfCX549aE6h$}9?PT>%P
z1%x`xvI>!~?zXJEA)@SHZvka?&f^v1RYaH{#|3|OBgWNnJ^xP?8B_9yR-$}<6-QdE
zM_S`++`})oG1OYpKIXnM!lwz-&D=E|Ryu4v?kyt5C--o^>J_oz6|IA(g7(_<i=Xcw
No=7gdt6AUT{{Zuig&P0>

diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
index 2172ab4a4018f76c08740dfb93b354b3a91d2f31..a9ca387918076ee1b1024fae01c49380fa35c9cb 100644
GIT binary patch
delta 44
zcmaDdhx^GK?hRR2m>6R>=UmyK#cII7z+|;q@xL=G>s25#wLO!CaeF2U)9;f2fyocv

delta 44
zcmV+{0Mq~EoD1Zf3$SX`0s^SBY}BwS1u*~s0>iT*|3d`@L;wH*sfTF<0k>%c0{h94
C*AQj^

diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes
index 0415de9a44a29507f2190108a22ad96d8735f667..27bacc5989feaabc449f925929f4ccfc04e19320 100644
GIT binary patch
delta 21
dcmbPooO8-?&JAL{OpLM36203cdKqi30RUYN2vYz6

delta 21
dcmbPooO8-?&JAL{OiU}9C3?3@^fK050{~zL2%i7|

diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index b701776884893ee5376243038f1019e6b15fffb1..bfe26975eec6ba6182b55039a6cc2406c6a67382 100644
GIT binary patch
delta 7105
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

delta 6971
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