新增两个协议同步

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -22,7 +22,8 @@ GroupMgrEvent = {
     OnFamilyReflash = "OnFamilyReflash",
     OnFamilyRoomReflash = "OnFamilyRoomReflash",
     OnFamilyMemberOut = "OnFamilyMemberOut",
-    OnRefNumberBan = "OnRefNumberBan"
+    OnRefNumberBan = "OnRefNumberBan",
+    OnRefShowStartRoom = "OnRefShowStartRoom"
 }
 
 GroupMgrController = {
@@ -68,6 +69,8 @@ function GroupMgrController.new()
     self._eventmap[Protocol.WEB_FG_MEMBER_ONLINE] = self.OnMemberOnline
     self._eventmap[Protocol.WEB_FG_MEMBER_GAME_STATE] = self.OnMemberGameState
     self._eventmap[Protocol.FGMGR_EVT_Ref_NumberBan] = self.OnRefNumberBan
+    self._eventmap[Protocol.FGMGR_EVT_SHOWSTART] = self.OnRefShowStartRoom
+
     -- self:connect(callback)
     return self
 end
@@ -372,6 +375,16 @@ function M:FG_CLOSE_ISOPEN_CHATROOM(groupId, callback)
     end)
 end
 
+-- 设置成员是否显示开始房间
+function M:FG_SetShowStartRoom(groupId, isOpen, callback)
+    local _data = {}
+    _data.groupId = groupId
+    _data.isOpen = isOpen
+    self._mgr_client:send(Protocol.FGMGR_SET_SHOWSTART, _data, function(res)
+        callback(res)
+    end)
+end
+
 -- 拉取聊天室数据
 function M:FG_ENTER_CHATROOM(groupId, getData, callback)
     local _data = {}
@@ -653,6 +666,12 @@ function M:OnRefNumberBan(evt_data)
     DispatchEvent(self._dispatcher, GroupMgrEvent.OnRefNumberBan, evt_data)
 end
 
+function M:OnRefShowStartRoom(evt_data)
+    local group = DataManager.groups:get(self.groupId)
+    group.isOpenStartRoom = evt_data.isOpen
+    DispatchEvent(self._dispatcher, GroupMgrEvent.OnRefNumberBan, evt_data)
+end
+
 function M:PopEvent()
     local _cacheEvent = self._cacheEvent
     if (_cacheEvent:Count() > 0) then

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -43,6 +43,7 @@ function M:FG_GroupList(callback)
                 group.show_num = tem.show_num
                 group.isShow = tem.isShow
                 group.isOpenChatRoom = tem.isOpenChatRoom
+                group.isOpenStartRoom = tem.isShowBeginRoom or 0 --	--是否显示开始房间 0显示 1隐藏
                 group.isWatch = tem.isWatch
                 group.wechatId = tem.wechatId
                 group.groupDiamo = tem.groupDiamo

lua_probject/base_project/Game/Data/GroupData.lua

@@ -1,4 +1,4 @@
-local M = class("GroupData") 
+local M = class("GroupData")
 
 function M:ctor()
 	self.id = 0
@@ -45,7 +45,6 @@ function M:ctor()
 	self.hide_action = 0
 	--是否开启全民推广
 	self.promote = false
-
 end
 
 -- 添加成员
@@ -53,8 +52,8 @@ function M:addMember(member)
 	local _tem = self.memberMap[member.uid]
 	if _tem then
 		for k, v in pairs(member) do
-	        _tem[k] = v
-	    end
+			_tem[k] = v
+		end
 	else
 		self.memberMap[member.uid] = member
 		self.members[#self.members + 1] = member
@@ -67,10 +66,10 @@ function M:delMember(id)
 	local _tem = self.memberMap[id]
 	if _tem then
 		self.memberMap[id] = nil
-		for i=1,#self.members do
+		for i = 1, #self.members do
 			local member = self.members[i]
 			if member.uid == id then
-				table.remove(self.members,i)
+				table.remove(self.members, i)
 				break
 			end
 		end
@@ -93,7 +92,7 @@ function M:addRoom(room)
 	local pid = room.pid
 	local play = self:getPlay(pid)
 	if not play then return end
-	for i=1,#self.rooms do
+	for i = 1, #self.rooms do
 		local tem = self.rooms[i]
 		if room.id == tem.id then
 			self.rooms[i] = room
@@ -106,7 +105,7 @@ function M:addRoom(room)
 			return
 		end
 	end
-	self.rooms[#self.rooms+1] = room
+	self.rooms[#self.rooms + 1] = room
 	-- 把房间加入对应的玩法下的列表
 	play.rooms[#play.rooms + 1] = room
 end
@@ -114,11 +113,11 @@ end
 -- 删除房间
 function M:delRoom(id)
 	local pid = 0
-	for i=1,#self.rooms do
+	for i = 1, #self.rooms do
 		local room = self.rooms[i]
 		if room.id == id then
 			pid = room.pid
-			table.remove(self.rooms,i)
+			table.remove(self.rooms, i)
 			break
 		end
 	end
@@ -138,16 +137,16 @@ end
 function M:addPlay(play)
 	--printlog("添加玩法addPlay===>>>")
 	--pt(play)
-	local maxRound=0
+	local maxRound = 0
 	if play.maxRound then
-		maxRound=play.maxRound
+		maxRound = play.maxRound
 	else
 		local hpdata = json.decode(play.hpData)
-		maxRound=hpdata.maxRound
+		maxRound = hpdata.maxRound
 	end
-	
+
 	local pnum = play.maxPlayers
-	local room = {maxPlayers = pnum, status = -1, default = true, pid = play.id,times=maxRound}
+	local room = { maxPlayers = pnum, status = -1, default = true, pid = play.id, times = maxRound }
 
 	play.rooms = {}
 	local index = self:getPlayIndex(play.id)
@@ -162,59 +161,52 @@ function M:addPlay(play)
 	--self.playList=self:SortPlay(self.playList)
 	--pt(self.playList)
 	--self.default_rooms=self:SortDefaultPlay(self.default_rooms)
-	
 end
 
-
 function M:SortPlay(list)
-	local singlePlayList={}
-	local otherPlayList={}
-	
-	for i=1,#list do
-		local hpdata=json.decode(list[i].hpData)
-		if hpdata.maxRound and hpdata.maxRound==1 then
-			table.insert(singlePlayList,list[i])
+	local singlePlayList = {}
+	local otherPlayList = {}
+
+	for i = 1, #list do
+		local hpdata = json.decode(list[i].hpData)
+		if hpdata.maxRound and hpdata.maxRound == 1 then
+			table.insert(singlePlayList, list[i])
 		else
-			table.insert(otherPlayList,list[i])
+			table.insert(otherPlayList, list[i])
 		end
-		
 	end
-	
-	for i=1,#otherPlayList do
-		table.insert(singlePlayList,otherPlayList[i])
+
+	for i = 1, #otherPlayList do
+		table.insert(singlePlayList, otherPlayList[i])
 	end
-	
+
 	return singlePlayList
-	
 end
 
-
 function M:SortDefaultPlay(list)
-	local singlePlayList={}
-	local otherPlayList={}
-	
-	for i=1,#list do
-		if list[i].times and list[i].times==1 then
-			table.insert(singlePlayList,list[i])
+	local singlePlayList = {}
+	local otherPlayList = {}
+
+	for i = 1, #list do
+		if list[i].times and list[i].times == 1 then
+			table.insert(singlePlayList, list[i])
 		else
-			table.insert(otherPlayList,list[i])
+			table.insert(otherPlayList, list[i])
 		end
-		
 	end
-	
-	for i=1,#otherPlayList do
-		table.insert(singlePlayList,otherPlayList[i])
+
+	for i = 1, #otherPlayList do
+		table.insert(singlePlayList, otherPlayList[i])
 	end
-	
+
 	return singlePlayList
-	
 end
 
 -- 删除玩法
 function M:delPlay(pid)
 	local index = self:getPlayIndex(pid)
 	if index ~= -1 then
-		table.remove(self.playList,index)
+		table.remove(self.playList, index)
 		table.remove(self.default_rooms, index)
 		return true
 	end
@@ -254,7 +246,7 @@ function M:getPlayName(pid)
 end
 
 function M:getPlayIndex(pid)
-	for i=1,#self.playList do
+	for i = 1, #self.playList do
 		local tem = self.playList[i]
 		if tem.id == pid then
 			return i
@@ -266,7 +258,7 @@ end
 function M:clearPlay()
 	self.playList = {}
 	self.rooms = {}
-	self.default_rooms={}
+	self.default_rooms = {}
 	for i = 1, #self.playList do
 		self.playList[i].rooms = {}
 	end
@@ -280,4 +272,4 @@ function M:clear()
 	self.default_rooms = {}
 end
 
-return M
+return M

lua_probject/base_project/Game/Protocol.lua

@@ -441,6 +441,10 @@ Protocol = {
     FGMGR_EVT_Push_Assistant        = "push_assistant",
     -- 刷新成员列表
     FGMGR_EVT_Ref_NumberBan         = "13010",
+    --显示/隐藏一开始房间
+    FGMGR_SET_SHOWSTART             = "13012",
+    --显示/隐藏一开始房间接收事件
+    FGMGR_EVT_SHOWSTART             = "13013",
 
     --end::::::::::::::牌友圈协议::::::::::::::::::::
 

lua_probject/base_project/Game/View/Family/FamilyEventView.lua

@@ -34,6 +34,7 @@ function M:AddListener()
     mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyReflash, handler(self, self._evtOnFamilyReflash))
     mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash))
     mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut))
+    mgr_ctr:AddEventListener(GroupMgrEvent.OnRefShowStartRoom, handler(self, self._evtOnRefShowStartRoom))
     print("家族添加监听")
 end
 
@@ -58,6 +59,8 @@ function M:RemoveAll()
     mgr_ctr:RemoveEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState))
     mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash))
     mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut))
+    mgr_ctr:RemoveEventListener(GroupMgrEvent.OnRefShowStartRoom, handler(self, self._evtOnRefShowStartRoom))
+
     print("家族去除监听")
 end
 
@@ -390,4 +393,20 @@ function M:_evtOnFamilyMemberOut(...)
     win:Show()
 end
 
+function M:_evtOnRefShowStartRoom(...)
+    local arg = { ... }
+
+    -- local groupId = arg[1]
+
+    -- local view = ViewManager.GetCurrenView()
+    -- if view.class ~= "FamilyMainView" then
+    --     return
+    -- end
+
+    -- if view._group == nil or groupId ~= view._group.id then
+    --     return
+    -- end
+    self:UpdateFamilyRoom(nil, self._group.id)
+end
+
 return M

lua_probject/base_project/Game/View/FamilyView.lua

@@ -240,6 +240,18 @@ function M:init(url)
     end
 
     self.familyType.selectedIndex = 1
+
+    self._view:GetChild('btn_showALlStartRoom').onClick:Set(function()
+        local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+        self:UpdateFamilyRoom(nil, self._group.id)
+        mgr_ctr:FG_SetShowStartRoom(self._group.id, 1 - self._group.isOpenStartRoom, function(res)
+            --因为没有回调，这边先把值设置好
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode)
+                return
+            end
+        end)
+    end)
 end
 
 function M:Reflash()
@@ -601,6 +613,11 @@ function M:UpdateFamilyRoom(fgCtr, id)
         table.insert(v.status == 0 and readyRoom or startRoom, v)
     end
     local all_num = #playList + #roomList
+    local show_num = all_num
+    if self._group.isOpenStartRoom == 1 then
+        self._view:GetChild('btn_showALlStartRoom'):GetController('isOpen').selectedIndex = self._group.isOpenStartRoom
+        show_num = #playList + #readyRoom
+    end
     list_room.itemRenderer = function(index, obj)
         if index < #readyRoom then
             local newIndex = index + 1
@@ -721,10 +738,11 @@ function M:UpdateFamilyRoom(fgCtr, id)
     pt(roomList)
     --list_room.numItems = all_num
 
-    if list_room.numItems == all_num then
+
+    if list_room.numItems == show_num then
         list_room:RefreshVirtualList()
     else
-        list_room.numItems = all_num
+        list_room.numItems = show_num
     end
     --如果在编辑玩法页面则此处调用刷新
     if self._view_PlayEditView then

lua_probject/base_project/Game/View/Lobby/LobbyPlayerInfoView.lua

@@ -31,7 +31,8 @@ function M:init(url)
     view:GetChild('phone').text = user.phone
     view:GetChild('id').text = user.account_id
     view:GetChild('diamo').text = user.diamo
-    view:GetChild('sex').text = user.sex and "男" or "女"
+    view:GetChild('sex').text = user.sex == 1 and "男" or "女"
+    view:GetController('ctr_sex').selectedIndex = user.sex - 1
     ImageLoad.Load(DataManager.SelfUser.head_url, view:GetChild("btn_PlayerHead")._iconObject)
 
     --change
@@ -86,6 +87,23 @@ function M:init(url)
             type.selectedIndex = 0
         end
     end)
+
+    view:GetController('ctr_sex').onChanged:Set(function(context)
+        user.sex = context.sender.selectedIndex + 1
+        ViewUtil.ShowModalWait2(self._root_view)
+        local loddyctr = ControllerManager.GetController(LoddyController)
+        local _data = {}
+        _data.sex = context.sender.selectedIndex + 1
+        _data.type = 7
+
+        loddyctr:UpdateUserInfo(_data, function(res)
+            ViewUtil.CloseModalWait2()
+            if (res.ReturnCode == 0) then
+            else
+                ViewUtil.ErrorTip(res.ReturnCode, "切换性别失败")
+            end
+        end)
+    end)
 end
 
 return M

wb_new_ui/assets/Family/Main.xml

@@ -39,14 +39,14 @@
       <gearDisplay controller="lev" pages="0,1"/>
       <relation target="" sidePair="left-left"/>
     </component>
-    <component id="n6_in3i" name="btn_myfamily" src="in3i7cue" fileName="Main/Component/btn_myfamily.xml" xy="2132,29" group="n34_86ct" scale="1.2,1.2">
+    <component id="n6_in3i" name="btn_myfamily" src="in3i7cue" fileName="Main/Component/btn_myfamily.xml" xy="2132,17" group="n34_86ct" scale="1.2,1.2">
       <relation target="" sidePair="right-right"/>
     </component>
     <component id="n397_ukzq" name="btn_person_record" src="ukzq7d5m" fileName="Main/Component/btn_person_record.xml" xy="400,14" group="n34_86ct">
       <gearDisplay controller="lev" pages="2"/>
       <relation target="" sidePair="left-left"/>
     </component>
-    <component id="n8_in3i" name="btn_showALlStartRoom" src="in3i7cuc" fileName="Main/Component/btn_showALlStartRoom.xml" xy="1750,29" group="n34_86ct" scale="1.2,1.2">
+    <component id="n8_in3i" name="btn_showALlStartRoom" src="in3i7cuc" fileName="Main/Component/btn_showALlStartRoom.xml" xy="1750,17" group="n34_86ct" scale="1.2,1.2">
       <gearDisplay controller="lev" pages="0,1"/>
       <relation target="" sidePair="right-right"/>
     </component>

wb_new_ui/assets/Family/Main/Component/btn_showALlStartRoom.xml

@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="282,78" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="isOpen" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n4_jrro" name="n4" src="jrro7cy9" fileName="Main/Image/btn_hideRoom.png" xy="0,0"/>
+    <image id="n5_n9qr" name="n5" src="n9qr7d72" fileName="Main/Image/showStartRoom.png" xy="0,0" size="282,78">
+      <gearDisplay controller="isOpen" pages="1"/>
+    </image>
+    <image id="n6_n9qr" name="n6" src="n9qr7d71" fileName="Main/Image/hideStartRoom.png" xy="0,0" size="282,78">
+      <gearDisplay controller="isOpen" pages="0"/>
+    </image>
+    <text id="n7_n9qr" name="n7" xy="-15,65" size="312,39" font="Arial" fontSize="28" text="当前为隐藏了开始的房间">
+      <gearText controller="isOpen" pages="1" values="当前为隐藏了开始的房间" default="当前为显示了开始的房间"/>
+      <relation target="" sidePair="center-center"/>
+    </text>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.2"/>
 </component>

wb_new_ui/assets/Family/package.xml

@@ -419,6 +419,8 @@
     <component id="66fw7d6y" name="com_FamilyMsgRecord.xml" path="/FamilyMsgRecord/" exported="true"/>
     <component id="66fw7d6z" name="item_msg_diamond.xml" path="/FamilyMsgRecord/Component/" exported="true"/>
     <image id="kyrh7d70" name="矩形 1.png" path="/NumberRecord/Image/" scale="9grid" scale9grid="10,10,20,20"/>
+    <image id="n9qr7d71" name="hideStartRoom.png" path="/Main/Image/"/>
+    <image id="n9qr7d72" name="showStartRoom.png" path="/Main/Image/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Lobby/NumberRecord/Component/Multiple_choose.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="66,66" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <displayList>
-    <graph id="n4_kxhm" name="n4" xy="0,0" size="66,66" type="rect" lineSize="0"/>
-    <image id="n3_kxhm" name="n3" src="jrro7cyr" fileName="component/CreatePlay/Image/gou.png" xy="0,0" size="66,66">
-      <gearDisplay controller="button" pages="1"/>
-    </image>
-  </displayList>
-  <Button mode="Check"/>
-</component>

wb_new_ui/assets/Lobby/NumberRecord/Component/btn_lookRecord.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="180,66" pivot="0.5,0.5" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n5_66fw" name="n5" src="66fw7d6p" fileName="component/Record/Image/Record14.png" xy="0,0" size="180,66">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-  </displayList>
-  <Button downEffect="scale" downEffectValue="1.2"/>
-</component>

wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="2395,203">
-  <controller name="seleted" pages="0,,1," selected="0"/>
-  <controller name="win" pages="0,,1," selected="0"/>
-  <displayList>
-    <image id="n14_66fw" name="n14" src="66fw7d6v" fileName="component/Record/Image/Recharge_2.png" xy="0,0" size="2395,203">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n16_66fw" name="n16" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="277,18" size="4,166">
-      <relation target="" sidePair="left-left%"/>
-    </image>
-    <image id="n17_66fw" name="n17" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="497,18" size="4,166">
-      <relation target="" sidePair="left-left%"/>
-    </image>
-    <image id="n18_66fw" name="n18" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="1888,18" size="4,166">
-      <relation target="" sidePair="left-left%"/>
-    </image>
-    <image id="n19_66fw" name="n19" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="951,18" size="4,166">
-      <relation target="" sidePair="left-left%"/>
-    </image>
-    <image id="n20_66fw" name="n20" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="719,18" size="4,166">
-      <relation target="" sidePair="left-left%"/>
-    </image>
-    <image id="n21_66fw" name="n21" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="2179,18" size="4,166">
-      <relation target="" sidePair="left-left%"/>
-    </image>
-    <text id="n2_jrro" name="text_gameName" xy="7,71" size="270,56" font="Arial" fontSize="42" color="#ff6f06" align="center" letterSpacing="5" autoSize="none" autoClearText="true" text="黎川麻将">
-      <relation target="" sidePair="width-width%,left-left%"/>
-    </text>
-    <text id="n6_jrro" name="text_roomID" xy="724,67" size="228,64" font="Arial" fontSize="48" color="#6d2f00" align="center" letterSpacing="3" autoSize="none" autoClearText="true" text="804850">
-      <relation target="" sidePair="width-width%,left-left%"/>
-    </text>
-    <text id="n25_66fw" name="text_score" xy="502,65" size="217,72" font="Arial" fontSize="54" color="#0908fd" align="center" vAlign="middle" letterSpacing="5" autoSize="none" autoClearText="true" text="+4">
-      <gearColor controller="win" pages="0" values="#0908fd,#000000" default="#ff0000,#000000"/>
-      <relation target="" sidePair="width-width%,left-left%"/>
-    </text>
-    <text id="n24_66fw" name="text_time1" xy="1892,53" size="287,93" font="Arial" fontSize="40" color="#6d2f00" align="center" vAlign="middle" leading="-10" autoSize="none" autoClearText="true" text="2025-09-08&#xA;14:34:22">
-      <relation target="" sidePair="width-width%,left-left%"/>
-    </text>
-    <component id="n12_jrro" name="btn_lookRecord" src="jrro7cys" fileName="NumberRecord/Component/btn_lookRecord.xml" xy="2239,69" size="92,65">
-      <relation target="" sidePair="left-left%"/>
-    </component>
-    <list id="n13_jrro" name="list" xy="957,9" size="931,182" layout="flow_hz" lineGap="32" colGap="3" defaultItem="ui://2d9xdj6zjrro7cyt" align="center" vAlign="middle" autoClearItems="true">
-      <relation target="" sidePair="width-width%,left-left%"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <image id="n22_66fw" name="n22" src="66fw7d6o" fileName="component/Record/Image/Record13.png" xy="298,42" size="175,120">
-      <gearDisplay controller="win" pages="1"/>
-      <relation target="" sidePair="left-left%"/>
-    </image>
-    <image id="n23_66fw" name="n23" src="66fw7d6n" fileName="component/Record/Image/Record12.png" xy="298,42" size="175,120">
-      <gearDisplay controller="win" pages="0"/>
-      <relation target="" sidePair="left-left%"/>
-    </image>
-  </displayList>
-</component>

wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChildTitle.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="2233,120">
-  <displayList>
-    <graph id="n1_jrro" name="n1" xy="144,8" size="2,100" type="rect"/>
-    <text id="n2_jrro" name="n2" xy="232,37" size="64,42" fontSize="30" text="游戏">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </text>
-    <graph id="n3_jrro" name="n3" xy="382,8" size="2,100" type="rect"/>
-    <text id="n4_jrro" name="n4" xy="429,40" size="56,36" fontSize="26" text="时间">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </text>
-    <graph id="n5_jrro" name="n5" xy="530,8" size="2,100" type="rect"/>
-    <text id="n6_jrro" name="n6" xy="586,37" size="64,42" fontSize="30" text="房号">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </text>
-    <graph id="n7_jrro" name="n7" xy="704,8" size="2,100" type="rect"/>
-    <text id="n8_jrro" name="n8" xy="719,37" size="64,42" fontSize="30" text="房卡">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </text>
-    <graph id="n9_jrro" name="n9" xy="797,8" size="2,100" type="rect"/>
-    <graph id="n11_jrro" name="n11" xy="2019,10" size="2,100" type="rect"/>
-    <text id="n14_jrro" name="n14" xy="40,39" size="64,42" fontSize="30" text="选择">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </text>
-    <text id="n15_jrro" name="n15" xy="1377,39" size="64,42" fontSize="30" text="结算">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </text>
-    <text id="n16_jrro" name="n16" xy="2100,39" size="64,42" fontSize="30" text="回放">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </text>
-  </displayList>
-</component>

wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailResultChild.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="457,47">
-  <controller name="colour" pages="0,,1," selected="0"/>
-  <displayList>
-    <graph id="n3_66fw" name="n3" xy="0,0" size="457,47" type="rect" lineSize="0" fillColor="#0d000000"/>
-    <text id="n1_jrro" name="text_score" xy="272,-1" size="185,49" font="Arial" fontSize="36" color="#0908fd" autoSize="none" text="+1234567890">
-      <gearColor controller="colour" pages="0,1" values="#0908fd,#000000|#ff0000,#000000"/>
-      <relation target="" sidePair="width-width%,height-height%,right-right"/>
-    </text>
-    <text id="n2_jrro" name="text_name" xy="-1,-3" size="257,54" font="Arial" fontSize="36" color="#6d2f00" align="right" autoSize="none" text="超级长的名字张曼">
-      <relation target="" sidePair="width-width%,height-height%,left-left"/>
-    </text>
-  </displayList>
-</component>

wb_new_ui/assets/Lobby/PlayerInfo.xml

@@ -3,6 +3,7 @@
   <controller name="type" pages="0,show,1,change" selected="0"/>
   <controller name="group_sex" pages="0,women,1,men" selected="0"/>
   <controller name="bind" pages="0,no,1,yes" selected="0"/>
+  <controller name="ctr_sex" pages="0,男,1,女" selected="0"/>
   <displayList>
     <image id="n52_66fw" name="n52" src="66fw7d6b" fileName="component/PlayerInfo/Image/bg.png" xy="0,0" size="1350,660" group="n8_in3i"/>
     <group id="n8_in3i" name="bg" xy="0,0" size="1350,660"/>
@@ -18,40 +19,42 @@
     </image>
     <group id="n14_in3i" name="head" xy="105,170" size="375,315"/>
     <text id="n17_in3i" name="name" xy="608,168" size="106,64" group="n27_in3i" font="FZCuYuan-M03" fontSize="48" color="#61270f" letterSpacing="6" text="你好">
-      <relation target="" sidePair="left-left,top-top"/>
+      <relation target="" sidePair="left-left,top-top%"/>
     </text>
-    <text id="n18_in3i" name="n18" xy="607,381" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="性别:">
-      <relation target="n22_in3i" sidePair="top-bottom%"/>
-      <relation target="" sidePair="left-left"/>
+    <text id="n18_in3i" name="n18" xy="608,448" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="性别:">
+      <relation target="" sidePair="left-left,top-top%"/>
     </text>
-    <text id="n19_in3i" name="sex" xy="769,382" size="52,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="男">
-      <relation target="n18_in3i" sidePair="left-right,top-top"/>
+    <text id="n19_in3i" name="sex" xy="770,532" size="52,64" group="n27_in3i" visible="false" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="男"/>
+    <text id="n24_in3i" name="n24" xy="608,375" size="140,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="8" text="手机:">
+      <relation target="" sidePair="left-left,top-top%"/>
     </text>
-    <text id="n24_in3i" name="n24" xy="606,452" size="140,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="8" text="手机:">
-      <relation target="" sidePair="left-left"/>
-      <relation target="n18_in3i" sidePair="top-bottom%"/>
-    </text>
-    <text id="n25_in3i" name="phone" xy="770,458" size="116,59" group="n27_in3i" font="SimHei" fontSize="44" color="#61270f" align="center" letterSpacing="8" text="1314">
+    <text id="n25_in3i" name="phone" xy="769,378" size="116,59" group="n27_in3i" font="SimHei" fontSize="44" color="#61270f" align="center" letterSpacing="8" text="1314">
       <relation target="n24_in3i" sidePair="left-right,top-top"/>
     </text>
     <component id="n26_in3i" name="btn_changeInfo" src="in3i7ctf" fileName="component/PlayerInfo/Component/btn_changeInfo.xml" xy="108,498" size="360,114" group="n27_in3i">
       <relation target="n53_66fw" sidePair="center-center,top-bottom"/>
     </component>
-    <text id="n20_in3i" name="n20" xy="607,239" size="136,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="6" text="编号:">
-      <relation target="" sidePair="left-left"/>
-      <relation target="n17_in3i" sidePair="top-bottom%"/>
+    <text id="n20_in3i" name="n20" xy="608,306" size="136,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="6" text="编号:">
+      <relation target="" sidePair="left-left,top-top%"/>
     </text>
-    <text id="n21_in3i" name="id" xy="768,239" size="88,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" align="center" letterSpacing="6" text="137">
+    <text id="n21_in3i" name="id" xy="769,306" size="88,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" align="center" letterSpacing="6" text="137">
       <relation target="n20_in3i" sidePair="left-right,top-top"/>
     </text>
-    <text id="n22_in3i" name="n22" xy="608,310" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="房卡:">
-      <relation target="" sidePair="left-left"/>
-      <relation target="n20_in3i" sidePair="top-bottom%"/>
+    <text id="n22_in3i" name="n22" xy="608,237" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="房卡:">
+      <relation target="" sidePair="left-left,top-top%"/>
     </text>
-    <text id="n23_in3i" name="diamo" xy="768,310" size="55,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" align="center" letterSpacing="3" text="20">
+    <text id="n23_in3i" name="diamo" xy="768,237" size="55,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" align="center" letterSpacing="3" text="20">
       <relation target="n22_in3i" sidePair="left-right,top-top"/>
     </text>
-    <group id="n27_in3i" name="show" xy="108,168" size="778,444" advanced="true">
+    <component id="n58_n9qr" name="btn_oneday" src="n9qr7d9f" fileName="component/PlayerInfo/Component/btn_chooseTime.xml" xy="765,450" size="178,60" group="n27_in3i">
+      <relation target="n18_in3i" sidePair="middle-middle,left-right"/>
+      <Button checked="true" title="男" controller="ctr_sex" page="0"/>
+    </component>
+    <component id="n59_n9qr" name="btn_twoday" src="n9qr7d9f" fileName="component/PlayerInfo/Component/btn_chooseTime.xml" xy="966,451" size="118,60" group="n27_in3i">
+      <relation target="n58_n9qr" sidePair="middle-middle,left-right"/>
+      <Button title="女" controller="ctr_sex" page="1"/>
+    </component>
+    <group id="n27_in3i" name="show" xy="108,168" size="976,444" advanced="true">
       <gearDisplay controller="type" pages="0"/>
     </group>
     <component id="n55_66fw" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1241,-33" size="135,124"/>

wb_new_ui/assets/Lobby/component/PlayerInfo/Component/btn_chooseTime.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="442,60" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <text id="n3_jrro" name="title" xy="65,2" size="256,56" font="Alibaba PuHuiTi 3.0" fontSize="42" color="#333333" text="分数限制一天">
+      <gearColor controller="button" pages="0,1" values="#333333,#000000|#0000ed,#000000"/>
+    </text>
+    <image id="n7_lgoh" name="n7" src="n9qr7d9g" fileName="component/PlayerInfo/Image/createRoom_6.png" xy="0,0" size="60,60" aspect="true"/>
+    <image id="n6_lgoh" name="n6" src="n9qr7d9h" fileName="component/PlayerInfo/Image/Ellipse 38.png" xy="16,16" size="28,28" aspect="true">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Lobby/package.xml

@@ -526,12 +526,6 @@
     <component id="jrro7cyl" name="btn_lookRecord.xml" path="/component/Record/Component/"/>
     <component id="jrro7cym" name="comp_numberRecordDetailResultChild.xml" path="/component/Record/Component/"/>
     <component id="jrro7cyn" name="btn_head.xml" path="/component/Record/Component/"/>
-    <component id="jrro7cyo" name="comp_numberRecordDetailChildTitle.xml" path="/NumberRecord/Component/"/>
-    <component id="jrro7cyp" name="comp_numberRecordDetailChild.xml" path="/NumberRecord/Component/"/>
-    <component id="jrro7cyq" name="Multiple_choose.xml" path="/NumberRecord/Component/"/>
-    <image id="jrro7cyr" name="gou.png" path="/NumberRecord/Component/"/>
-    <component id="jrro7cys" name="btn_lookRecord.xml" path="/NumberRecord/Component/"/>
-    <component id="jrro7cyt" name="comp_numberRecordDetailResultChild.xml" path="/NumberRecord/Component/"/>
     <component id="jrro7cyu" name="btn_head.xml" path="/Main/Component/"/>
     <image id="p8hp7cyv" name="bg_main1.png" path="/component/CreatePlay/Image/" atlas="alone"/>
     <image id="p8hp7cyw" name="CreateRoom10a.png" path="/component/CreatePlay/Image/"/>
@@ -693,6 +687,9 @@
     <image id="n9qr7d99" name="jinxiDetaill.png" path="/GamePlay/image/" atlas="alone"/>
     <component id="n9qr7d9a" name="Btn_noImage.xml" path="/mgr/"/>
     <component id="n9qr7d9b" name="Btn_noImage.xml" path="/component/CreatePlay/Component/"/>
+    <component id="n9qr7d9f" name="btn_chooseTime.xml" path="/component/PlayerInfo/Component/"/>
+    <image id="n9qr7d9g" name="createRoom_6.png" path="/component/PlayerInfo/Image/"/>
+    <image id="n9qr7d9h" name="Ellipse 38.png" path="/component/PlayerInfo/Image/"/>
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_unity_pro/Assets/ART/base/common/sound/woman/chat_4.mp3.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: base/common/843a324d4f0104d51b55c771ef546b04
+  assetBundleName: 
   assetBundleVariant: