旁观按钮

lua_probject/base_project/Game/Controller/RoomController.lua

@@ -216,6 +216,104 @@ function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
 	end)
 end
 
+local witness_room_frame = 0
+---comment 房间观战进入协议
+---@param cmd string 协议号
+---@param roomid number 房间号
+---@param group_id number 亲友圈id
+---@param callback function 回调函数
+function M:PublicWitnessRoom(cmd, roomid, group_id, callback)
+	printlog("公共观战房间接口=============PublicWitnessRoom")
+	-- 同一帧不重复调用
+	local last_frame = join_room_frame
+	join_room_frame = Time.frameCount
+	if join_room_frame == last_frame then
+		return
+	end
+	-- 防止游戏没有离开控制器
+	ControllerManager.ChangeController(RoomController)
+	local _data = {}
+	_data["room_id"] = roomid
+	_data["id"] = group_id
+	_data["platform"] = GetPlatform()
+	pt(_data)
+	local _client = ControllerManager.GroupClient
+	_client:send(cmd, _data, function(res)
+		printlog("++++++++++++111111111111111111111111111111111111")
+		pt(res)
+		if (res.ReturnCode == 0) then
+			local json = res.Data
+			local game_info = json["game_info"]
+			pt(game_info)
+			if ExtendHotupdate.CheckVersion(game_info) ~= ExtendHotupdate.VERSION_NORMAL then
+				ExtendHotupdate.UpdateGame(game_info, function()
+					res.ReturnCode = -2
+					callback(res)
+				end)
+				return
+			end
+			local game_id = game_info.game_id
+			local server_ip = json["server_ip"]
+			local server_port = json["server_port"]
+
+			local room = ExtendManager.GetExtendConfig(game_id):NewRoom()
+			room.lev = json["lev"] -- 自己在当前房间所在圈子的职位，1盟主，2管理员，3用户，非圈子房间就是3
+			room.room_id = json["room_id"]
+			room.game_id = game_id
+			room.status = json["status"]
+			room.server_host = string.concat(server_ip, ":", server_port)
+			room.session = _client:getSession()
+			-- 圈子信息，圈子id和玩法id
+			room.group_id = json["groupId"]
+			-- 圈子禁止文字聊天，禁止语音聊天
+			room.ban_chat1 = json["ban_chat1"]
+			room.ban_chat2 = json["ban_chat2"]
+			-- 玩法id
+			room.play_id = json["pid"]
+			-- 体力值开关
+			room.hpOnOff = json["hpOnOff"]
+			-- 体力值倍数
+			room.score_times = d2ad(json.hp_times) or 1
+			DataManager.CurrenRoom = room
+			local j_data = {}
+			if not DataManager.SelfUser.location then
+				DataManager.SelfUser.location = Location.new()
+			end
+			j_data["pos"] = DataManager.SelfUser.location:Location2String()
+			printlog("++++++++++++++++++++++++++++++++++++++++++")
+			__ConntectGameServer(Protocol.GAME_JOIN_ROOM, room, room.server_host, j_data, function(res1)
+				printlog("===============================-------------")
+				pt(res1)
+				ControllerManager.IsSendCard = false
+				if (res1.ReturnCode ~= 0) then
+					if (callback) then callback(res1) end
+				else
+					ControllerManager.enterPlayerData = res1.Data.tableInfo.playerData
+					local _s2croom = res1.Data
+					room.owner_id = _s2croom["owner"]
+					if _s2croom.createTime then
+						room.create_time = _s2croom["createTime"]
+					end
+					if _s2croom.manor then
+						room.banker_seat = _s2croom.manor
+					end
+					room.agent = _s2croom.agent == 1 and true or false
+					-- ControllerManager.SetGameNetClient(game_net)
+					local extend = ExtendManager.GetExtendConfig(room.game_id)
+					extend:FillRoomData(_s2croom)
+					ControllerManager.ChangeController(GameController)
+					local gamectr = ControllerManager.GetCurrenController()
+					gamectr.tmpRoomID = room.room_id
+					gamectr.tmpGroupID = room.group_id
+					if callback then callback(res1) end
+				end
+			end)
+		else
+			if callback then callback(res) end
+		end
+	end)
+end
+
 function M:JoinRoom(room_id, callback)
 	self:PublicJoinRoom(Protocol.WEB_JOIN_ROOM, room_id, false, callback, group_id, group_layer)
 end

lua_probject/base_project/Game/Protocol.lua

@@ -335,6 +335,9 @@ Protocol = {
     -- 圈子删除房间
     WEB_FG_DEL_ROOM                 = "group/room/del__room",
 
+    -- 圈子观战房间
+    WEB_FG_Witness_ROOM             = "group/room/3013",
+
     -------------- group-mgr --------------------
     -- 进入圈子
     FGMGR_ENTER_GROUP               = "11001",

lua_probject/base_project/Game/View/FamilyView.lua

@@ -208,6 +208,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
                 roomList[newIndex].id)
             obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 1
             obj:GetController('num').selectedIndex = roomList[newIndex].maxPlayers - 2
+            obj:GetController('type').selectedIndex = 1
             local plist = roomList[newIndex].plist
             local insertName = ""
             for i = 1, #plist do
@@ -219,7 +220,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
                 roomCtr:PublicJoinRoom(
                     Protocol.WEB_FG_JOIN_ROOM,
                     roomList[newIndex].id,
-                    false,
+                    id,
                     function(response)
                         if (response.ReturnCode == -1) then
                             ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1')
@@ -240,6 +241,29 @@ function M:UpdateFamilyRoom(fgCtr, id)
                     roomList[newIndex].pid
                 )
             end)
+            obj:GetChild('btn_watch').onClick:Set(function()
+                roomCtr:PublicWitnessRoom(
+                    Protocol.WEB_FG_Witness_ROOM,
+                    roomList[newIndex].id,
+                    id,
+                    function(response)
+                        if (response.ReturnCode == -1) then
+                            ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1')
+                            -- RestartGame()
+                            return
+                        end
+
+                        if response.ReturnCode ~= 0 then
+                            ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
+                            -- ViewManager.ChangeView(ViewManager.View_Lobby)
+                            return
+                        else
+                            ViewManager.ChangeView(ViewManager.View_Main, playGameInfoTable[roomList[newIndex].pid]
+                                .gameId)
+                        end
+                    end
+                )
+            end)
         else
             local newIndex = index - #roomList + 1
             local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId)

lua_probject/base_project/Game/View/MainView.lua

@@ -231,6 +231,21 @@ function M:InitView(url, isHideIpAdds)
         end)--]]
     end
 
+    local chatText = _view:GetChild('btn_sendText')
+    if chatText then
+        chatText.onClick:Add(function()
+            if self.chat_view == nil then
+                self.chat_view = ChatView.new(self)
+            end
+            if self._room.ban_chat1 then
+                if self.chat_view.HideInputField then
+                    self.chat_view:HideInputField()
+                end
+            end
+            self.chat_view:Show()
+        end)
+    end
+
     local btn_ready = _view:GetChild('btn_ready')
     if btn_ready ~= nil then
         btn_ready.onClick:Set(function()

lua_probject/base_project/Game/View/RoomInfoView.lua

@@ -9,72 +9,34 @@ function RoomInfoView.new(_room, auto_close)
     self._close_destroy = true
     self._close_zone = true
 
-    self._auto_close = auto_close
     self:init("ui://Common/GameRule", _room)
     return self
 end
+
 function M:init(url, _room)
     BaseWindow.init(self, url)
     self._close_time = 3
     local _mainView = self._view
 
-    self._view:GetChild("btn_close2").onClick:Add(function()
-        self:Destroy()
-    end)
     self:FillRoomConfig(self._view:GetChild("rule"), _room)
-	
-	self:FillGameConfig(self._view:GetChild("point"),_room)
-	--self:FillGameConfig(_room)
 end
 
 function M:FillRoomConfig(roominfo_panel, _room)
-    if _room.room_id and _room.room_id ~= "" then
+    local config = ExtendManager.GetExtendConfig(_room.game_id)
-        local tex_roomid = roominfo_panel:GetChild("tex_roomid")
+    local mode = config:GetGameInfo()
-        tex_roomid.text =  _room.room_id
+    local gamePlay = mode:LoadConfigToDetail(json.encode(_room.room_config.config))
-    else
-        roominfo_panel:GetController("hide_id").selectedIndex = 1
-    end
     local tex_gametype = roominfo_panel:GetChild("tex_gametype")
     tex_gametype.text = _room.room_config:GetGameName()
 
     local tex_roomconfig = roominfo_panel:GetChild("tex_roomconfig")
-    tex_roomconfig.text = _room.room_config:GetDes()
+    tex_roomconfig.text = gamePlay
 end
 
-function M:FillGameConfig(parentP,_room)
-    --local tex_roomconfig = roominfo_panel:GetChild("tex_roomconfig")
-    --tex_roomconfig.text = _room.room_config:GetGameJS()
-	--local tempX,tempY=_room.room_config:GetGameSMSize()
-	--if tempX and tempY then
-	--	tex_roomconfig:SetSize(tempX,tempY)
-	--end
-	
-	--[[local gameR=_room.room_config:GetGameJS()
-	if gameR then
-		parentP:AddChild(gameR)
-	end--]]
-end
-
-
 function M:Show()
     BaseWindow.Show(self)
     if self._run_close then
         coroutine.stop(self._run_close)
     end
-    if self._auto_close then
-        self._view:GetController("auto_close").selectedIndex = 1
-        self._run_close = coroutine.start(function()
-            while self._close_time > 0 do
-                local tex_time = self._view:GetChild("tex_time")
-                tex_time.text = "自动关闭剩余" .. self._close_time .. "s"
-                coroutine.wait(1)
-                self._close_time = self._close_time - 1
 end
-            self:Destroy()
-        end)
-    end
-end
-
-
 
 return M

lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua

@@ -217,9 +217,6 @@ function M:InitView(url)
     -- self._view:GetChild('Btn_GamePlay').onClick:Set(function()
     --     ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
     -- end)
-    self._view:GetChild('Btn_Check').onClick:Set(function()
-        ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
-    end)
     self._view:GetChild('Btn_Message').onClick:Set(function()
         ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
     end)

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -133,6 +133,14 @@ function M:InitView(url, use_custom_bg)
         self._ctr_action.selectedIndex = 0
     end
 
+    local changeTable = self._view:GetChild('btn_change')
+    if changeTable then
+        changeTable.onClick:Set(function()
+            default_bg = default_bg + 1 > #bg_config and 1 or default_bg + 1
+            TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
+        end)
+    end
+
     self:InitXiPai()
     self:InitXiPai1()
 end

lua_probject/main_project/main/poker/PKCheckG.lua

@@ -0,0 +1,42 @@
+-- local EXMainView = import(".EXMainView")
+
+local PKCheckG = {
+}
+local M = PKCheckG
+function PKCheckG.new()
+    setmetatable(M, { __index = BaseWindow })
+    -- setmetatable(M, { __index = BaseWindow })
+    local self = setmetatable({}, { __index = M })
+    self.class = 'PKCheckG'
+    self._currenIndex = 0
+    self._close_destroy = true
+    self:init('ui://Common/comp_checkG')
+
+    return self
+end
+
+function M:init(url)
+    BaseWindow.init(self, url)
+
+    self._view:GetChild('btn_ok').onClick:Set(function()
+        self:Destroy()
+    end)
+
+    self.valueTemp = 0
+    self.silder = self._view:GetChild('slider_check')
+    local showText = self._view:GetChild('n3')
+
+    self.coroutine = coroutine.start(function(...)
+        self.valueTemp = 0
+        while self.valueTemp < 100 do
+            self.valueTemp = self.valueTemp + math.random(4)
+            self.silder.value = self.valueTemp
+            coroutine.wait(0.1)
+        end
+        showText.text = "检测完成，没有外挂痕迹"
+        coroutine.wait(2)
+        self:Destroy()
+    end)
+end
+
+return M

lua_probject/main_project/main/poker/PKMainView.lua

@@ -1,5 +1,6 @@
 local TableBG = import('Game.Data.TableBG')
 local PKSettingView = import('.PKSettingView')
+local PKCheckG = import('.PKCheckG')
 local MainRightPanelView = import('Game.View.MainRightPanelView')
 
 ---
@@ -76,6 +77,14 @@ function M:InitView(url, isHideIpAdds, settingViewType, ex_defaultbg, ex_bgconfi
     end
     self:InitXiPai()
     self:InitXiPai1()
+
+    local checkG = self._view:GetChild('Btn_Check')
+    if checkG then
+        checkG.onClick:Set(function()
+            local checkG = PKCheckG.new()
+            checkG:Show()
+        end)
+    end
 end
 
 function M:InitXiPai()

wb_new_ui/assets/Chat/Main.xml

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1159,534" opaque="false">
+<component size="1500,876" opaque="false">
   <controller name="tab" pages="0,,1,,2," selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n58_h1uu" name="n58" src="eeqmcgu" fileName="Win_Frame_full.xml" pkg="27vd145b" xy="0,0" size="1159,534" controller="show_line,1,show_di,1,style,1">
+    <component id="n58_h1uu" name="n58" src="eeqmcgu" fileName="Win_Frame_full.xml" pkg="27vd145b" xy="0,0" size="1500,876" controller="show_line,1,show_di,1,style,1">
       <gearXY controller="sdk" pages="1" values="268,0" default="0,0"/>
-      <gearSize controller="sdk" pages="1" values="622,534,1,1" default="1159,534,1,1"/>
+      <gearSize controller="sdk" pages="0,1" values="1500,876,1,1|963,876,1,1"/>
       <relation target="" sidePair="width-width,height-height"/>
       <Button icon="ui://l0ds4ys6h1uu2"/>
     </component>
-    <image id="n72_hr0l" name="n72" src="hr0l7hzi" fileName="images/win/9bg_03.png" pkg="27vd145b" xy="-2,1" size="1159,541"/>
+    <image id="n72_hr0l" name="n72" src="o8k8am" fileName="images/jiangxi/Group 542.png" xy="0,0"/>
-    <image id="n73_hr0l" name="n73" src="hr0l7hzj" fileName="images/win/9bg_04.png" pkg="27vd145b" xy="20,84" size="538,413"/>
+    <image id="n74_o8k8" name="n74" src="o8k8ar" fileName="images/jiangxi/Frame 27.png" xy="30,30"/>
-    <list id="n52" name="lit_biaoqing1" xy="19,79" size="541,439" layout="flow_hz" lineGap="5" colGap="10" lineItemCount="6" defaultItem="ui://l0ds4ys6h1uu1v" renderOrder="descent">
+    <image id="n73_hr0l" name="n73" src="o8k8ao" fileName="images/jiangxi/Rectangle 232.png" xy="78,243" size="1344,579"/>
+    <list id="n52" name="lit_biaoqing1" xy="93,-584" size="541,439" layout="flow_hz" lineGap="5" colGap="10" lineItemCount="6" defaultItem="ui://l0ds4ys6h1uu1v" renderOrder="descent">
       <gearDisplay controller="tab" pages="0"/>
-      <gearXY controller="sdk" pages="1" values="302,58" default="19,79"/>
+      <gearXY controller="sdk" pages="0,1" values="93,-584|302,58"/>
       <item icon="ui://l0ds4ys6h1uu6" name="101"/>
       <item icon="ui://l0ds4ys6h1uu7" name="102"/>
       <item icon="ui://l0ds4ys6h1uu8" name="103"/>
@@ -45,7 +46,7 @@
       <item icon="ui://l0ds4ys6h1uuy" name="129"/>
       <item icon="ui://l0ds4ys6h1uuz" name="130"/>
     </list>
-    <list id="n53" name="lit_yuyin" xy="566,84" size="553,352" overflow="scroll" lineGap="10" defaultItem="ui://l0ds4ys6h1uu1t" autoItemSize="false">
+    <list id="n53" name="lit_yuyin" xy="762,-511" size="553,352" overflow="scroll" lineGap="10" defaultItem="ui://l0ds4ys6h1uu1t" autoItemSize="false">
       <gearDisplay controller="sdk" pages="0"/>
       <item/>
       <item/>
@@ -59,14 +60,16 @@
       <item/>
       <item/>
     </list>
-    <component id="n59_h1uu" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1078,8" controller="style,1">
+    <component id="n59_h1uu" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1443,-24" controller="style,1">
-      <gearXY controller="sdk" pages="1" values="815,5" default="1078,8"/>
+      <gearXY controller="sdk" pages="0,1" values="1443,-24|815,5"/>
       <Button icon="ui://27vd145bi2p67hzf"/>
     </component>
-    <image id="n68_zgd9" name="n68" src="kxwjac" fileName="images/szsrk.png" xy="572,446" size="436,50" group="n70_zgd9"/>
+    <image id="n68_zgd9" name="n68" src="o8k8an" fileName="images/jiangxi/Rectangle 230.png" xy="78,66" group="n70_zgd9"/>
-    <text id="n71_zgd9" name="tex_chat" xy="590,447" size="405,50" group="n70_zgd9" font="FZHei-B01S" fontSize="24" color="#cfd3de" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="发的发顺丰撒旦法" input="true" prompt="[color=#888888]输入内容[/color]" maxLength="20"/>
+    <text id="n71_zgd9" name="tex_chat" xy="78,66" size="1068,112" group="n70_zgd9" font="ui://27vd145bh35o7ilo" fontSize="54" color="#cfd3de" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="" input="true" prompt="[color=#888888]请输入聊天内容[/color]" maxLength="20"/>
-    <component id="n69_zgd9" name="btn_send" src="zgd92y" fileName="component/Button3.xml" xy="1020,439" group="n70_zgd9"/>
+    <component id="n69_zgd9" name="btn_send" src="o8k8as" fileName="component/btn_normol.xml" xy="1176,75" size="240,102" group="n70_zgd9">
-    <group id="n70_zgd9" name="n70" xy="572,439" size="550,58" advanced="true">
+      <Button icon="ui://l0ds4ys6o8k8ak"/>
+    </component>
+    <group id="n70_zgd9" name="n70" xy="78,66" size="1338,114" advanced="true">
       <gearDisplay controller="sdk" pages="0"/>
     </group>
   </displayList>

wb_new_ui/assets/Chat/component/btn_normol.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,20" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n3_o8k8" name="n3" xy="0,0" size="100,20" url="ui://l0ds4ys6o8k8ak" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Chat/images/jiangxi/btn_textMul.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="450,96" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n3_o8k8" name="n3" src="o8k8aq" fileName="images/jiangxi/Rectangle 234.png" xy="0,0">
+      <gearDisplay controller="button" pages="0,1"/>
+    </image>
+    <image id="n4_o8k8" name="n4" src="o8k8ap" fileName="images/jiangxi/Rectangle 233.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+  </displayList>
+  <Button mode="Check"/>
+</component>

wb_new_ui/assets/Chat/package.xml

@@ -200,6 +200,16 @@
     <image id="pj49aa" name="01(30).png" path="/images/face/"/>
     <image id="ltcuab" name="01(30).png" path="/images/face/image/"/>
     <image id="kxwjac" name="szsrk.png" path="/images/" scale="9grid" scale9grid="30,17,17,12"/>
+    <image id="o8k8ak" name="Group 286.png" path="/images/jiangxi/"/>
+    <image id="o8k8al" name="Group 287.png" path="/images/jiangxi/"/>
+    <image id="o8k8am" name="Group 542.png" path="/images/jiangxi/"/>
+    <image id="o8k8an" name="Rectangle 230.png" path="/images/jiangxi/"/>
+    <image id="o8k8ao" name="Rectangle 232.png" path="/images/jiangxi/"/>
+    <image id="o8k8ap" name="Rectangle 233.png" path="/images/jiangxi/"/>
+    <image id="o8k8aq" name="Rectangle 234.png" path="/images/jiangxi/"/>
+    <image id="o8k8ar" name="Frame 27.png" path="/images/jiangxi/"/>
+    <component id="o8k8as" name="btn_normol.xml" path="/component/"/>
+    <component id="o8k8at" name="btn_textMul.xml" path="/images/jiangxi/"/>
   </resources>
   <publish name="Chat" path="..\wb_unity_pro\Assets\ART\base\chat\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Common/buttons/Btn_close(1).xml

@@ -3,7 +3,9 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="style" exported="true" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_j046" name="icon" xy="0,0" size="63,63" url="ui://27vd145bi2p67hzf"/>
+    <loader id="n3_j046" name="icon" xy="0,0" size="63,63" url="ui://27vd145bi2p67hzf" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Common/buttons/Btn_close.xml

@@ -3,7 +3,9 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="style" exported="true" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_j046" name="icon" xy="2,3" size="77,79" url="ui://27vd145bm0eibv" autoSize="true"/>
+    <loader id="n3_j046" name="icon" xy="0,0" size="87,92" url="ui://27vd145bm0eibv" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Common/comp_checkG.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1500,876">
+  <displayList>
+    <image id="n0_o8k8" name="n0" src="o8k87imv" fileName="images/checkG/Group 536.png" xy="0,0"/>
+    <component id="n2_o8k8" name="slider_check" src="o8k87imz" fileName="images/checkG/slider_checkG.xml" xy="120,294">
+      <ProgressBar value="96" max="100"/>
+    </component>
+    <text id="n3_o8k8" name="n3" xy="444,474" size="621,102" font="ui://27vd145bh35o7ilo" fontSize="78" color="#5a2d0e" text="请稍后，检测中...">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <component id="n4_o8k8" name="btn_ok" src="n2h87imc" fileName="component/pop_oneChoose/btn_oneChoose.xml" xy="546,606"/>
+    <component id="n5_o8k8" name="btn_close" src="n2h87imc" fileName="component/pop_oneChoose/btn_oneChoose.xml" xy="558,370" visible="false"/>
+  </displayList>
+</component>

wb_new_ui/assets/Common/component/rule/Component4.xml

@@ -4,12 +4,13 @@
   <displayList>
     <text id="n0_l8gg" name="n0" xy="19,0" size="94,42" group="n6_l8gg" visible="false" fontSize="30" color="#5b2793" text="玩法："/>
     <text id="n1_l8gg" name="tex_gametype" xy="109,0" size="198,37" group="n6_l8gg" visible="false" fontSize="30" color="#5b2793" autoSize="none" text="红中麻将"/>
-    <text id="n4_l8gg" name="tex_roomconfig" xy="19,10" size="895,319" group="n6_l8gg" font="FZHei-B01S" fontSize="30" autoSize="none" text="房主设置介绍">
+    <text id="n4_l8gg" name="tex_roomconfig" xy="0,0" size="930,331" group="n6_l8gg" font="FZPangWa-M18" fontSize="54" color="#5a2d0e" align="center" vAlign="middle" autoSize="shrink" text="王发介绍">
-      <gearXY controller="hide_id" pages="0,1" values="19,10|19,65"/>
+      <gearXY controller="hide_id" pages="0,1" values="0,0|19,65"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </text>
     <text id="n3_l8gg" name="tex_roomid" xy="19,51" size="178,37" group="n6_l8gg" visible="false" fontSize="30" color="#5b2793" autoSize="none" text="32555555">
       <gearDisplay controller="hide_id" pages="0"/>
     </text>
-    <group id="n6_l8gg" name="n6" xy="19,0" size="895,329"/>
+    <group id="n6_l8gg" name="n6" xy="0,0" size="930,331"/>
   </displayList>
 </component>

wb_new_ui/assets/Common/component/rule/GameRule.xml

@@ -1,26 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750">
+<component size="1500,876">
   <controller name="auto_close" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n6_xyf8" name="btn_close2" src="j0h759" fileName="component/rule/Component2.xml" xy="0,0"/>
+    <image id="n20_o8k8" name="n20" src="o8k87in0" fileName="component/rule/Group 537.png" xy="0,0"/>
-    <image id="n13_i2p6" name="n13" src="i2p67hze" fileName="component/rule/9bg_04.png" xy="184,195" size="947,410"/>
+    <image id="n21_o8k8" name="n21" src="o8k87in1" fileName="component/rule/玩法介绍.png" xy="579,57"/>
-    <image id="n7_i2p6" name="n7" src="i2p67hzd" fileName="component/rule/9bg_03.png" xy="167,107" size="977,548"/>
+    <component id="n9_i2p6" name="btn_close" src="i2p67hzg" fileName="buttons/Btn_close(1).xml" xy="1413,-24" size="111,111"/>
-    <image id="n12_i2p6" name="n12" src="i2p67hze" fileName="component/rule/9bg_04.png" xy="181,194" size="494,410" visible="false"/>
+    <component id="n14_i2p6" name="rule" src="l8gg54" fileName="component/rule/Component4.xml" xy="33,186" size="1437,590" group="n3_xyf8"/>
-    <component id="n9_i2p6" name="btn_close" src="i2p67hzg" fileName="buttons/Btn_close(1).xml" xy="1071,111"/>
+    <group id="n3_xyf8" name="n3" xy="33,186" size="1437,590"/>
-    <text id="n10_i2p6" name="n10" xy="325,210" size="194,42" group="n3_xyf8" visible="false" font="FZHei-B01S" fontSize="30" color="#4297f9" align="center" vAlign="middle" autoSize="none" text="《玩法规则》"/>
-    <text id="n11_i2p6" name="n11" xy="527,211" size="194,42" group="n3_xyf8" font="FZHei-B01S" fontSize="30" color="#4297f9" align="center" vAlign="middle" autoSize="none" text="《房主设置》"/>
-    <component id="n0_l8gg" name="n0" src="eeqmcgu" fileName="Win_Frame_full.xml" xy="286,140" size="762,469" group="n3_xyf8" visible="false" controller="show_line,1,show_di,1,style,1">
-      <Button icon="ui://27vd145bxyf8b7"/>
-    </component>
-    <component id="n14_i2p6" name="rule" src="l8gg54" fileName="component/rule/Component4.xml" xy="196,274" size="930,332" group="n3_xyf8"/>
-    <image id="n4_xyf8" name="n4" src="e54q3x" fileName="images/head/head_name_bg.png" xy="560,605" size="213,30" group="n3_xyf8">
-      <gearDisplay controller="auto_close" pages="1"/>
-    </image>
-    <text id="n5_xyf8" name="tex_time" xy="560,607" size="212,29" group="n3_xyf8" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="自动关闭剩余3s">
-      <gearDisplay controller="auto_close" pages="1"/>
-      <relation target="n4_xyf8" sidePair="width-width,height-height"/>
-    </text>
-    <group id="n3_xyf8" name="n3" xy="196,140" size="930,496"/>
-    <component id="n19_bs5n" name="point" src="cjli6" fileName="UIPanel.xml" xy="185,256" size="484,345" visible="false"/>
   </displayList>
 </component>

wb_new_ui/assets/Common/images/checkG/slider_checkG.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1260,108" extention="ProgressBar">
+  <displayList>
+    <image id="n3_o8k8" name="n3" src="o8k87imw" fileName="images/checkG/Rectangle 238.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_o8k8" name="bar" src="o8k87imx" fileName="images/checkG/Rectangle 239.png" xy="25,18" size="1210,72" fillMethod="hz"/>
+    <text id="n4_o8k8" name="title" xy="557,22" size="146,64" font="ui://27vd145bh35o7ilo" fontSize="48" color="#ffffff" text="44.4%"/>
+  </displayList>
+  <ProgressBar/>
+</component>

wb_new_ui/assets/Common/package.xml

@@ -1199,6 +1199,13 @@
     <component id="qz7i7imo" name="pop_twoChoose.xml" path="/" exported="true"/>
     <component id="qz7i7imr" name="btn_leftChoose.xml" path="/component/pop_twoChooser/"/>
     <component id="qz7i7imt" name="btn_rightChoose.xml" path="/component/pop_twoChooser/"/>
+    <component id="o8k87imu" name="comp_checkG.xml" path="/" exported="true"/>
+    <image id="o8k87imv" name="Group 536.png" path="/images/checkG/"/>
+    <image id="o8k87imw" name="Rectangle 238.png" path="/images/checkG/"/>
+    <image id="o8k87imx" name="Rectangle 239.png" path="/images/checkG/" scale="9grid" scale9grid="55,11,453,45"/>
+    <component id="o8k87imz" name="slider_checkG.xml" path="/images/checkG/"/>
+    <image id="o8k87in0" name="Group 537.png" path="/component/rule/"/>
+    <image id="o8k87in1" name="玩法介绍.png" path="/component/rule/"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Family/Main.xml

@@ -88,7 +88,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n28_in3i" name="list_room" xy="867,367" size="1620,743" group="n34_86ct" overflow="scroll" lineGap="24" defaultItem="ui://htcn7v3rin3i7cuh" autoClearItems="true">
+    <list id="n28_in3i" name="list_room" xy="866,367" size="1620,743" group="n34_86ct" overflow="scroll" lineGap="24" defaultItem="ui://htcn7v3rin3i7cuh" autoClearItems="true">
       <relation target="" sidePair="height-height,left-left%"/>
       <item/>
       <item/>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="300,174" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="type" pages="0,进入玩法,1,进入房间,4,正在游戏" selected="0"/>
+  <controller name="type" pages="0,进入玩法,1,进入房间,4,正在游戏" selected="2"/>
   <displayList>
     <image id="n5_jrro" name="n5" src="jrro7cy7" fileName="Main/Image/btn_mainListJoin.png" xy="0,0">
       <gearDisplay controller="type" pages="1"/>

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

@@ -2,7 +2,9 @@
 <component size="108,174" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_ayfr" name="n3" src="ayfr7cwo" fileName="Main/Image/Group 191.png" xy="0,0"/>
+    <loader id="n5_o8k8" name="icon" xy="0,0" size="108,174">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1620,174">
-  <controller name="type" pages="0,玩法匹配,1,加入房间" selected="0"/>
+  <controller name="type" pages="0,玩法匹配,1,加入房间" selected="1"/>
   <controller name="num" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <component id="n19_kes2" name="btn_joinGame" src="kes27cuv" fileName="Main/Component/btn_joinGame.xml" xy="1320,0"/>
     <image id="n23_jrro" name="n23" src="jrro7cyg" fileName="Main/Image/bg_mainListChild.png" xy="0,0"/>
     <text id="n2_in3i" name="game_type" xy="198,12" size="292,64" font="ui://27vd145bh35o7ika" fontSize="48" color="#474747" leading="0" text="（抚州麻将）">
       <relation target="" sidePair="left-left"/>
@@ -12,9 +11,6 @@
     <text id="n5_in3i" name="n5" xy="209,115" size="124,49" font="ui://27vd145bh35o7im7" fontSize="36" color="#474747" leading="0" text="已加入:"/>
     <component id="n7_in3i" name="Label_gameRule" src="in3i7cuj" fileName="Main/Component/Label_gameRule.xml" xy="344,63" size="969,49"/>
     <component id="n8_in3i" name="Label_joinPlayers" src="in3i7cuk" fileName="Main/Component/Label_joinPlayers.xml" xy="337,115" size="952,49"/>
-    <component id="n22_ayfr" name="btn_watch" src="ayfr7cwq" fileName="Main/Component/btn_watch.xml" xy="1011,0">
-      <gearDisplay controller="type" pages="1"/>
-    </component>
     <image id="n24_jrro" name="n24" src="jrro7cy8" fileName="Main/Image/btn_mainGameNumberHead.png" xy="12,51">
       <gearDisplay controller="num" pages="0,1,2"/>
       <gearXY controller="num" pages="0,1" values="12,51|62,12" default="12,12"/>
@@ -44,5 +40,10 @@
     <component id="n18_in3i" name="player4" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="108,90" size="90,72">
       <gearDisplay controller="num" pages="1,2"/>
     </component>
+    <component id="n19_kes2" name="btn_joinGame" src="kes27cuv" fileName="Main/Component/btn_joinGame.xml" xy="1320,0"/>
+    <component id="n28_o8k8" name="btn_watch" src="ayfr7cwq" fileName="Main/Component/btn_watch.xml" xy="1164,-8" size="132,74">
+      <gearDisplay controller="type" pages="1,4"/>
+      <Button icon="ui://htcn7v3ro8k87cyt"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Family/package.xml

@@ -143,6 +143,7 @@
     <image id="jrro7cyq" name="image_inGame.png" path="/Main/Image/"/>
     <image id="jrro7cyr" name="image_levef.png" path="/Main/Image/"/>
     <image id="jrro7cys" name="image_online.png" path="/Main/Image/"/>
+    <image id="o8k87cyt" name="Group 76.png" path="/Main/Image/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
   <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"/>
   <controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
   <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
-  <controller name="more" pages="0,,1," selected="0"/>
+  <controller name="more" pages="0,,1," selected="1"/>
   <displayList>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="71,784" size="144,144">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,897" size="144,144">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="1" values="71,784" default="1188,897"/>
       <gearSize controller="state" default="144,144,1,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="71,784" size="144,144">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="737,916" size="144,144">
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="state" pages="1,3" values="71,784|71,784" default="737,916"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1867,27" size="144,144">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,274" size="144,144">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1188,274|1867,27|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1885,27" size="108,108">
+    <component id="n152_kxhm" name="player_info2_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="2031,519" size="108,108">
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="state" pages="0,1,3" values="2031,519|1885,27|1885,27" default="1337,909"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
@@ -117,9 +117,9 @@
     </group>
     <component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="550,33" size="64,90" visible="false" touchable="false"/>
     <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,36" group="n138_lu84"/>
-    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,60" pivot="0.5,0.5" size="72,72" group="n138_lu84">
+    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,60" pivot="0.5,0.5" size="72,72" group="n138_lu84" rotation="180">
       <gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
-      <Button icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
+      <Button checked="true" icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
     </component>
     <component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,33" pivot="0.5,0.5" size="102,119" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
@@ -143,7 +143,6 @@
       <ProgressBar value="50" max="100"/>
     </component>
     <component id="n175_gmbn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="61,146" pivot="0.5,0.5" size="189,69" group="n135_lu84">
-      <gearDisplay controller="more" pages="1"/>
       <Button checked="true" icon="ui://v0j9abjygmbn13u"/>
     </component>
     <text id="n136_lu84" name="text_roomId" xy="43,97" size="228,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="房间：123456"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="2"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
   <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"/>
   <controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
   <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
-  <controller name="more" pages="0,,1," selected="0"/>
+  <controller name="more" pages="0,,1," selected="1"/>
   <displayList>
     <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,897" size="144,144">
       <gearDisplay controller="state" pages="0,2"/>
@@ -33,7 +33,7 @@
       <gearXY controller="state" pages="0,1,2" values="1188,274|1867,27|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1337,909" size="108,108">
+    <component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="2031,519" size="108,108">
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="state" pages="0,1,3" values="2031,519|1885,27|1885,27" default="1337,909"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
@@ -43,7 +43,7 @@
       <gearXY controller="state" pages="0,1,2" values="500,513|53,551|500,513" default="1182,903"/>
       <relation target="" sidePair="middle-middle,right-left"/>
     </component>
-    <component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1192,973" size="108,108">
+    <component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="510,583" size="108,108">
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="state" pages="0,1,3" values="510,583|89,569|89,569" default="1192,973"/>
       <relation target="n156_gi99" sidePair="right-left,bottom-bottom"/>
@@ -135,28 +135,28 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="550,33" size="64,90" visible="false" touchable="false"/>
-    <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,36" group="n138_lu84"/>
+    <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,34" group="n138_lu84"/>
-    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,60" pivot="0.5,0.5" size="72,72" group="n138_lu84">
+    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,58" pivot="0.5,0.5" size="72,72" group="n138_lu84" rotation="180">
       <gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
-      <Button icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
+      <Button checked="true" icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
     </component>
-    <component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,33" pivot="0.5,0.5" size="102,119" group="n138_lu84">
+    <component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,31" pivot="0.5,0.5" size="102,119" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
       <Button checked="true" icon="ui://v0j9abjygmbn13p"/>
     </component>
-    <component id="n172_gmbn" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2094,198" pivot="0.5,0.5" size="150,78" group="n138_lu84">
+    <component id="n172_gmbn" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2094,196" pivot="0.5,0.5" size="150,78" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
       <Button icon="ui://v0j9abjygmbn13o"/>
     </component>
-    <component id="n173_gmbn" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,309" pivot="0.5,0.5" size="126,126" group="n138_lu84">
+    <component id="n173_gmbn" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,307" pivot="0.5,0.5" size="126,126" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
       <Button icon="ui://v0j9abjygmbn13q"/>
     </component>
-    <component id="n174_gmbn" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,360" pivot="0.5,0.5" size="126,126" group="n138_lu84">
+    <component id="n174_gmbn" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,358" pivot="0.5,0.5" size="126,126" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
       <Button icon="ui://v0j9abjygmbn13r"/>
     </component>
-    <group id="n138_lu84" name="top_right" xy="2031,33" size="468,453"/>
+    <group id="n138_lu84" name="top_right" xy="2031,31" size="468,453"/>
     <text id="n157_ckvb" name="remaining_card" xy="897,469" size="215,74" group="n161_ckvb" font="ui://27vd145bh35o7ik0" fontSize="56" color="#cccccc" align="center" vAlign="middle" bold="true" text="余999张">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n159_ckvb" sidePair="right-left"/>
@@ -177,7 +177,6 @@
       <ProgressBar value="50" max="100"/>
     </component>
     <component id="n175_gmbn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="61,146" pivot="0.5,0.5" size="189,69" group="n135_lu84">
-      <gearDisplay controller="more" pages="1"/>
       <Button checked="true" icon="ui://v0j9abjygmbn13u"/>
     </component>
     <text id="n136_lu84" name="text_roomId" xy="43,97" size="228,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="房间：123456"/>

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 995fab8376370944c8f6fd1bfd49c41e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: