替换玩法选择ui

lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua

@@ -42,7 +42,7 @@ function GroupInfoView.new(curGroup, fg_info)
     return self
 end
 
--- 获取玩法名
+-- 获取具体玩法名
 local function __getLayerName(self, pid)
     if pid == 0 then
         return '全  部'
@@ -52,8 +52,18 @@ local function __getLayerName(self, pid)
     --end
     local p_data = self.curGroup:getPlay(pid)
     return p_data and p_data.name or '已删除'
+end 
+-- 获取玩法名
+local function __getLayerName1(self, pid)
+    if pid == 0 then
+        return '全  部'
+    end
+    --if not self._get_data then
+    --    return self.playNames[pid] or '已删除'
+    --end
+    local p_data = self.curGroup:getPlay(pid)
+    return p_data and p_data.game_name or '已删除'
 end
-
 -- 加载背景图
 local bg_pref = 'base/newgroup/bg/bg0'
 local function __setBG(url)
@@ -161,6 +171,8 @@ local function __fillRoomItem(self, index, item, room)
     local curGroup = self.curGroup
     local roomid = room.id
     local plist = room.plist
+    -- printlog("-------------------------------ssssssss------------------------------")
+    -- pt(plist)
     local state = room.status
     local str = nil
     local room_item = self.roomItems[item]
@@ -229,6 +241,7 @@ local function __fillRoomItem(self, index, item, room)
             else
                 p_item.visible = true
                 local p = plist[i]
+
                 if isHidden == 0 then
                     p_head.tex_name.text = ViewUtil.stringEllipsis(p.nick)
                     p_head.tex_id.text = "ID:"..p.aid
@@ -651,7 +664,7 @@ end
 function M:InitRoomInfoView()
     local room = self.roominfo.room
     if not room.default then
-        printlog("wwwwwwwwwww22222222222222222   ",room.round,"              ",room.times)
+        --printlog("wwwwwwwwwww22222222222222222   ",room.round,"              ",room.times)
         self.roominfo.view:GetChild('tex_round').text = string.format('(%s/%s)', room.round, room.times)
         local lst_player = self.roominfo.view:GetChild('lst_player')
         lst_player:RemoveChildrenToPool()
@@ -690,10 +703,15 @@ end
 -- 玩法名字显示
 local function __fillPlayItem(self, index, item)
     local tex_game = item:GetChild('tex_game')
+    local tex_jutifenleiName = item:GetChild('tex_jutifenleiName')
     local pipeijoin = item:GetChild('pipeijoin')
+    local tex_paiming = item:GetChild('tex_paiming')
+    
 
     if (index == 0) then
         tex_game.text = __getLayerName(self, 0)
+        tex_jutifenleiName.text = __getLayerName1(self,0)
+        tex_paiming.text = "1"
     else
     
         pipeijoin.onClick:Add(
@@ -722,6 +740,9 @@ local function __fillPlayItem(self, index, item)
             end
         )
         tex_game.text = __getLayerName(self, self.playIdList[index])
+        tex_jutifenleiName.text = __getLayerName1(self,self.playIdList[index])
+         tex_paiming.text = index
+        
     end
 end
 
@@ -797,6 +818,7 @@ local function __fillGameItem(self, index, item)
         item.icon = 'ui://NewGroup/quyxtb'
 		gameName=GetGameName(0)
 		item:GetChild("n11").text=gameName
+        item:GetChild("n22").text=gameName
 		if self.currentGameItemName==nil then
 			item.icon = 'ui://NewGroup/quyxtb-1'
 		end
@@ -808,13 +830,15 @@ local function __fillGameItem(self, index, item)
         item.icon = iconName
 		gameName=GetGameName(gameId)
 		item:GetChild("n11").text=gameName
+        item:GetChild("n22").text=gameName
     end
 	
 	if item.icon==self.currentGameItemName then
 		item.icon=self.currentGameItemName.."-1"
 		item:GetChild("n11").text=gameName
+        item:GetChild("n22").text=gameName
 	end
-    item:GetChild("n22").text=index+1
+    
    
 end
 
@@ -985,7 +1009,10 @@ function M:InitView(url)
 
     self._view:GetChild('tex_id').text = "ID:"..self.curGroup.id
 
-    self._view:GetChild('tex_name').text = self.curGroup.name
+    self._view:GetChild('tex_name1').text = self.curGroup.name
+    
+printlog("-----------------------sss--------------------")
+pt(self.curGroup)
 
     -- self._view:GetChild('tex_p_name').text = ViewUtil.stringEllipsis(DataManager.SelfUser.nick_name)
 
@@ -1132,9 +1159,11 @@ function M:InitView(url)
             self:__startGame("",currentPlayID, false)
         end
     )
-
+    self.tex_SelectRoom = self._view:GetChild('tex_SelectRoom')
     -- 选择玩法按钮
     local btn_choose = self._view:GetChild('btn_choose')
+    local tex_Selec_yd = self._view:GetController('tex_Selec_yd')
+    tex_Selec_yd.selectedIndex = 1
     btn_choose.onClick:Set(
         function ()
             --  self.lstgameVisible = not self.lstgameVisible
@@ -1144,23 +1173,30 @@ function M:InitView(url)
             --      self.lst_game:TweenMove(Vector2.New(3,1232), 0.3)
             --  end
 
-            self.lstgameVisible = not self.lstgameVisible
+            -- self.lstgameVisible = not self.lstgameVisible
              
-            -- 获取 btn_choose 的当前 Y 坐标
-            local targetY = btn_choose.y
+            -- -- 获取 btn_choose 的当前 Y 坐标
+            -- local targetY = btn_choose.y
             
-            local lst_game_height = self.lst_game.height 
-            local offset = 5 -- 间距
+            -- local lst_game_height = self.tex_SelectRoom.height 
+            -- local offset = 5 -- 间距
 
-            if (self.lstgameVisible) then 
-                -- 显示：移动到 btn_choose 上方
-                self.lst_game:TweenMove(Vector2.New(btn_choose.x, targetY - lst_game_height - offset), 0.3)
+            -- if (self.lstgameVisible) then 
+            --     -- 显示：移动到 btn_choose 上方
+            --     self.tex_SelectRoom:TweenMove(Vector2.New(btn_choose.x, targetY - lst_game_height - offset), 0.3)
+            -- else
+            --     -- 隐藏：移出屏幕可视区域
+            --     self.tex_SelectRoom:TweenMove(Vector2.New(btn_choose.x, targetY + lst_game_height + 100), 0.3)
+            -- end
+            if tex_Selec_yd.selectedIndex == 1 then
+               tex_Selec_yd.selectedIndex = 0
             else
-                -- 隐藏：移出屏幕可视区域
-                self.lst_game:TweenMove(Vector2.New(btn_choose.x, targetY + lst_game_height + 100), 0.3)
+                tex_Selec_yd.selectedIndex = 1
             end
+
+            
              
-         end
+        end
         --  function()
         --      local sgv =
         --          GroupSetDefaultGameView.new(

wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info

@@ -1,42 +1,39 @@
 {
   "objectStatus": {
-    "n122_g8kk": {
+    "n113_ker3": {
       "hidden": true
     },
-    "n120_g8kk": {
-      "hidden": true
-    },
-    "n89_goju": {
-      "hidden": true
-    },
-    "n130_naup": {
-      "locked": true
-    },
-    "n142_syg7": {
-      "hidden": true
-    },
-    "n111_ker3": {
-      "locked": true
-    },
-    "n50_lwcl": {
+    "n52_lwcl": {
       "hidden": true
     },
     "n138_csp4": {
       "hidden": true
     },
-    "n113_ker3": {
+    "n130_naup": {
+      "locked": true
+    },
+    "n51_lwcl": {
       "hidden": true
     },
-    "n100_lumr": {
+    "n122_g8kk": {
+      "hidden": true
+    },
+    "n142_syg7": {
+      "hidden": true
+    },
+    "n120_g8kk": {
       "hidden": true
     },
     "n139_csp4": {
       "hidden": true
     },
-    "n119_g8kk": {
+    "n111_ker3": {
+      "locked": true
+    },
+    "n100_lumr": {
       "hidden": true
     },
-    "n51_lwcl": {
+    "n119_g8kk": {
       "hidden": true
     }
   },

wb_new_ui/.objs/metas/m7iejg46/10snh5j.info

@@ -1,46 +1,19 @@
 {
   "objectStatus": {
-    "n154_cioe": {
+    "n130_w111": {
+      "collapsed": true
+    },
+    "n233_o6b1": {
+      "hidden": true
+    },
+    "n191_xsk4": {
       "hidden": true
     },
     "n238_dg1v": {
       "hidden": true
     },
-    "n235_o6b1": {
-      "hidden": true
-    },
-    "n204_jvvo": {
-      "hidden": true
-    },
-    "n88_kxzv": {
-      "hidden": true
-    },
-    "n175_mn85": {
-      "hidden": true
-    },
-    "n200_isix": {
-      "hidden": true
-    },
-    "n153_cioe": {
-      "hidden": true
-    },
-    "n233_o6b1": {
-      "hidden": true
-    },
-    "n216_ovii": {
-      "hidden": true
-    },
-    "n171_mpll": {
-      "hidden": true
-    },
     "n78_i7lq": {
       "hidden": true
-    },
-    "n234_o6b1": {
-      "hidden": true
-    },
-    "n160_qlxi": {
-      "hidden": true
     }
   },
   "fitScreen": "FitSize"

wb_new_ui/.objs/metas/m7iejg46/jiu8hef.info

@@ -1,6 +1,9 @@
 {
   "objectStatus": {
-    "n18_pw15": {
+    "n28_wqg2": {
+      "hidden": true
+    },
+    "n27_wqg2": {
       "hidden": true
     }
   }

wb_new_ui/.objs/metas/m7iejg46/oviii0w.info

@@ -1,7 +1 @@
-{
-  "objectStatus": {
-    "n2_ovii": {
-      "hidden": true
-    }
-  }
-}
+{}

wb_new_ui/.objs/metas/m7iejg46/p0pdhvp.info

@@ -0,0 +1 @@
+{}

wb_new_ui/.objs/metas/m7iejg46/pw157i8w.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n4_pw15": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/workspace.json

@@ -5,12 +5,11 @@
     "ui://2d9xdj6zfn7fao",
     "ui://2zlli80mw9te0",
     "ui://m7iejg4610snh5j",
-    "ui://m7iejg46jvvohyf",
-    "ui://m7iejg46ep9w7iah",
-    "ui://m7iejg46ep9w7iai",
-    "ui://m7iejg46ul317ia3",
-    "ui://m7iejg46ul317ia4",
-    "ui://m7iejg46ul317ia5"
+    "ui://m7iejg46p0pdhvp",
+    "ui://m7iejg46jiu8hef",
+    "ui://m7iejg4694qg7icy",
+    "ui://m7iejg46pw157i8w",
+    "ui://m7iejg46csp47i3z"
   ],
   "test.device": "Xiaomi 9",
   "canvasColor": 10066329,
@@ -18,38 +17,44 @@
   "doc.activeDoc": "ui://m7iejg4610snh5j",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "27vd145b",
+    "1hl55dqm",
     "/",
-    "27vd145b",
-    "/buttons/",
-    "27vd145b",
-    "/font/",
-    "27vd145b",
-    "/font/images/",
-    "27vd145b",
-    "/font/images/win/",
-    "egnzysm7",
+    "du0ovweo",
     "/",
-    "0khx14ar",
+    "iwpp66na",
     "/",
-    "0khx14ar",
-    "/images/",
-    "2d9xdj6z",
+    "70k0xjl0",
     "/",
-    "2d9xdj6z",
-    "/component/",
-    "2d9xdj6z",
-    "/component/index/",
-    "2d9xdj6z",
-    "/images/",
-    "2d9xdj6z",
-    "/images/LobbyMui/",
-    "2zlli80m",
+    "v09du5dj",
+    "/",
+    "d1qrzqpr",
+    "/",
+    "lv2le67t",
+    "/",
+    "fm39zduw",
+    "/",
+    "qubt49z8",
+    "/",
+    "eyxz924g",
+    "/",
+    "v2emygzo",
+    "/",
+    "4wmd3o8g",
+    "/",
+    "dbnd189a",
+    "/",
+    "z3z0ysur",
+    "/",
+    "96mvx2ml",
+    "/",
+    "ac1fkfb1",
+    "/",
+    "jnrucnxa",
+    "/",
+    "okksar3v",
+    "/",
+    "boq0ohep",
     "/",
-    "2zlli80m",
-    "/images/",
-    "2zlli80m",
-    "/images/LoginMui/",
     "m7iejg46",
     "/",
     "m7iejg46",
@@ -57,8 +62,6 @@
     "m7iejg46",
     "/component/Lst_info/",
     "m7iejg46",
-    "/component/Lst_room/",
-    "m7iejg46",
     "/images/",
     "m7iejg46",
     "/images/NGXiangTangMui/",

wb_new_ui/assets/Info_MJ_ChangSha/package.xml

@@ -5,13 +5,15 @@
     <component id="q9sx1" name="Com_help.xml" path="/" exported="true"/>
     <component id="c4r115" name="Cgm_create_room_yueyang.xml" path="/" exported="true"/>
     <image id="udgc19" name="icon.png" path="/" exported="true"/>
-    <image id="udgc1a" name="icon1-1.png" path="/" exported="true"/>
-    <image id="udgc1b" name="icon1.png" path="/" exported="true"/>
+    <image id="udgc1a" name="icon1-1_1.png" path="/"/>
+    <image id="udgc1b" name="icon1_1.png" path="/"/>
     <image id="udgc1c" name="icon_1.png" path="/" exported="true"/>
     <component id="p6vl1d" name="Cgm_create_room_yueyang(1).xml" path="/"/>
     <image id="ddck1e" name="Rectangle 5545.png" path="/"/>
     <image id="ddck1f" name="image 623@2x.png" path="/"/>
     <image id="ddck1g" name="Rectangle 2887@2x.png" path="/"/>
+    <image id="94qg1h" name="icon1.png" path="/" exported="true"/>
+    <image id="94qg1i" name="icon1-1.png" path="/" exported="true"/>
   </resources>
   <publish name="Info_MJ_ChangSha" path="..\wb_unity_pro\Assets\ART\extend\majiang\changsha\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Info_MJ_HongZhong/package.xml

@@ -5,13 +5,15 @@
     <component id="6cpq10" name="Com_help.xml" path="/" exported="true"/>
     <component id="c4r116" name="Cgm_create_room_yueyang.xml" path="/" exported="true"/>
     <image id="udgcc1d" name="icon.png" path="/" exported="true"/>
-    <image id="udgcc1e" name="icon1-1.png" path="/" exported="true"/>
-    <image id="udgcc1f" name="icon1.png" path="/" exported="true"/>
+    <image id="udgcc1e" name="icon1-1_1.png" path="/"/>
+    <image id="udgcc1f" name="icon1_1.png" path="/"/>
     <image id="udgcc1g" name="icon_1.png" path="/" exported="true"/>
     <image id="ddckc1h" name="Rectangle 5546.png" path="/"/>
     <image id="ddckc1i" name="Frame 1221.png" path="/"/>
     <image id="ddckc1j" name="image 623.png" path="/"/>
     <image id="ddckc1k" name="Rectangle 2887.png" path="/"/>
+    <image id="94qgc1l" name="icon1-1.png" path="/" exported="true"/>
+    <image id="94qgc1m" name="icon1.png" path="/" exported="true"/>
   </resources>
   <publish name="Info_MJ_HongZhong" path="..\wb_unity_pro\Assets\ART\extend\majiang\hongzhong\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Info_MJ_ZhuanZhuan/package.xml

@@ -4,14 +4,16 @@
     <component id="6cpq10" name="Com_help.xml" path="/" exported="true"/>
     <component id="c4r116" name="Cgm_create_room_yueyang.xml" path="/" exported="true"/>
     <image id="udgcc1d" name="icon.png" path="/" exported="true"/>
-    <image id="udgcc1e" name="icon1-1.png" path="/" exported="true"/>
-    <image id="udgcc1f" name="icon1.png" path="/" exported="true"/>
+    <image id="udgcc1e" name="icon1-1_1.png" path="/"/>
+    <image id="udgcc1f" name="icon1_1.png" path="/"/>
     <image id="udgcc1g" name="icon_1.png" path="/" exported="true"/>
     <component id="mpncc1i" name="Cgm_create_room.xml" path="/" exported="true"/>
     <image id="pye8c1j" name="Frame 1221.png" path="/"/>
     <image id="pye8c1k" name="image 623.png" path="/"/>
     <image id="pye8c1l" name="Rectangle 2887.png" path="/"/>
     <image id="pye8c1m" name="Rectangle 5545.png" path="/"/>
+    <image id="94qgc1n" name="icon1-1.png" path="/" exported="true"/>
+    <image id="94qgc1o" name="icon1.png" path="/" exported="true"/>
   </resources>
   <publish name="Info_MJ_ZhuanZhuan" path="..\wb_unity_pro\Assets\ART\extend\majiang\zhuanzhuan\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Info_Poker_ChangdeWHZ/package.xml

@@ -115,9 +115,11 @@
     <component id="ffp35t" name="btn_quanmingtang.xml" path="/"/>
     <image id="ffp35u" name="chuangjian_icon_01.png" path="/"/>
     <image id="ffp35v" name="icon.png" path="/" exported="true"/>
-    <image id="ffp35w" name="icon1.png" path="/" exported="true"/>
-    <image id="ffp35x" name="icon1-1.png" path="/" exported="true"/>
+    <image id="ffp35w" name="icon1_1.png" path="/"/>
+    <image id="ffp35x" name="icon1-1_1.png" path="/"/>
     <image id="ffp35y" name="icon_1.png" path="/"/>
+    <image id="94qg5z" name="icon1-1.png" path="/" exported="true"/>
+    <image id="94qg60" name="icon1.png" path="/" exported="true"/>
   </resources>
   <publish name="Info_Poker_ChangdeWHZ" path="..\wb_unity_pro\Assets\ART\extend\zipai\changdepaohuzi\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Info_Poker_FuLuShou/package.xml

@@ -4,8 +4,8 @@
     <component id="otx0h" name="Cgm_create_room.xml" path="/" exported="true"/>
     <component id="otx0i" name="Com_help.xml" path="/" exported="true"/>
     <image id="udgccw" name="icon.png" path="/" exported="true"/>
-    <image id="udgccx" name="icon1-1.png" path="/" exported="true"/>
-    <image id="udgccy" name="icon1.png" path="/" exported="true"/>
+    <image id="udgccx" name="icon1-1_1.png" path="/"/>
+    <image id="udgccy" name="icon1_1.png" path="/"/>
     <image id="udgccz" name="icon_1.png" path="/" exported="true"/>
     <component id="mo9id0" name="Button2.xml" path="/component/create_room/"/>
     <component id="mo9id1" name="Button3.xml" path="/component/create_room/"/>
@@ -26,6 +26,8 @@
     <image id="pye8dg" name="Frame 1221.png" path="/"/>
     <image id="pye8dh" name="image 623.png" path="/"/>
     <image id="pye8di" name="Rectangle 2887.png" path="/"/>
+    <image id="94qgdj" name="icon1-1.png" path="/" exported="true"/>
+    <image id="94qgdk" name="icon1.png" path="/" exported="true"/>
   </resources>
   <publish name="Info_Poker_FuLuShou" path="..\wb_unity_pro\Assets\ART\extend\zipai\fulushou\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Info_Poker_HSRunBeard/package.xml

@@ -15,9 +15,11 @@
     <component id="otx0h" name="Cgm_create_room.xml" path="/" exported="true"/>
     <component id="otx0i" name="Com_help.xml" path="/" exported="true"/>
     <image id="udgcct" name="icon.png" path="/" exported="true"/>
-    <image id="udgccu" name="icon1-1.png" path="/" exported="true"/>
-    <image id="udgccv" name="icon1.png" path="/" exported="true"/>
+    <image id="udgccu" name="icon1-1_1.png" path="/"/>
+    <image id="udgccv" name="icon1_1.png" path="/"/>
     <image id="udgccw" name="icon_1.png" path="/" exported="true"/>
+    <image id="94qgcx" name="icon1-1.png" path="/" exported="true"/>
+    <image id="94qgcy" name="icon1.png" path="/" exported="true"/>
   </resources>
   <publish name="Info_Poker_HSRunBeard" path="..\wb_unity_pro\Assets\ART\extend\zipai\hsrunbeard\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Info_Poker_RunBeard/package.xml

@@ -21,8 +21,8 @@
     <component id="ey1o54" name="btn_duohongduofan.xml" path="/component/create_room/"/>
     <component id="5xx56v" name="Com_help.xml" path="/" exported="true"/>
     <image id="ryri6w" name="icon.png" path="/" exported="true"/>
-    <image id="l6486x" name="icon1.png" path="/" exported="true"/>
-    <image id="ajif6y" name="icon1-1.png" path="/" exported="true"/>
+    <image id="l6486x" name="icon1_1.png" path="/"/>
+    <image id="ajif6y" name="icon1-1_1.png" path="/"/>
     <component id="ajif6z" name="Main_3.xml" path="/"/>
     <component id="ajif70" name="RoomInfoPanel.xml" path="/"/>
     <component id="ajif71" name="RoomInfoPanel1.xml" path="/"/>
@@ -54,6 +54,8 @@
     <image id="vlhj7r" name="bjwf.png" path="/mgr/imgs/game/" exported="true"/>
     <component id="vlhj7s" name="di01.xml" path="/component/create_room/" exported="true"/>
     <font id="vlhj7t" name="SIYUAN.TTF" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
+    <image id="94qg7u" name="icon1-1.png" path="/" exported="true"/>
+    <image id="94qg7v" name="icon1.png" path="/" exported="true"/>
   </resources>
   <publish name="Info_Poker_RunBeard" path="..\wb_unity_pro\Assets\ART\extend\zipai\runbeard\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Info_Poker_RunFastNew/package.xml

@@ -16,9 +16,9 @@
     <component id="f9vpsc" name="btn_sub.xml" path="/"/>
     <component id="ocbrsh" name="Creat_RunFast.xml" path="/" exported="true"/>
     <image id="udgccso" name="icon.png" path="/" exported="true"/>
-    <image id="udgccsp" name="icon1-1.png" path="/" exported="true"/>
-    <image id="udgccsq" name="icon1.png" path="/" exported="true"/>
-    <image id="udgccsr" name="icon_1.png" path="/" exported="true"/>
+    <image id="udgccsp" name="icon1-1_1.png" path="/"/>
+    <image id="udgccsq" name="icon1_1.png" path="/"/>
+    <image id="udgccsr" name="icon_1_1.png" path="/"/>
     <component id="vlhjcss" name="Btn_Common_Info.xml" path="/component/create_room/" exported="true"/>
     <image id="vlhjcst" name="bjwf.png" path="/mgr/imgs/game/" exported="true"/>
     <component id="vlhjcsu" name="di01.xml" path="/component/create_room/" exported="true"/>
@@ -27,6 +27,8 @@
     <image id="pye8csx" name="Frame 1221.png" path="/"/>
     <image id="pye8csy" name="image 623.png" path="/"/>
     <image id="pye8csz" name="Rectangle 2887.png" path="/"/>
+    <image id="94qgct0" name="icon1.png" path="/" exported="true"/>
+    <image id="94qgct1" name="icon1-1.png" path="/" exported="true"/>
   </resources>
   <publish name="Info_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Info_Poker_YueYangWHZ/package.xml

@@ -15,8 +15,8 @@
     <component id="otx0h" name="Cgm_create_room.xml" path="/" exported="true"/>
     <component id="otx0i" name="Com_help.xml" path="/" exported="true"/>
     <image id="udgcct" name="icon.png" path="/" exported="true"/>
-    <image id="udgccu" name="icon1-1.png" path="/" exported="true"/>
-    <image id="udgccv" name="icon1.png" path="/" exported="true"/>
+    <image id="udgccu" name="icon1-1_1.png" path="/"/>
+    <image id="udgccv" name="icon1_1.png" path="/"/>
     <image id="udgccw" name="icon_1.png" path="/" exported="true"/>
     <component id="vlhjcx" name="Btn_Common_Info.xml" path="/component/create_room/" exported="true"/>
     <image id="vlhjcy" name="bjwf.png" path="/mgr/imgs/game/" exported="true"/>
@@ -26,6 +26,8 @@
     <image id="pye8d2" name="Rectangle 2887.png" path="/"/>
     <image id="pye8d3" name="Frame 1221.png" path="/"/>
     <image id="pye8d4" name="Rectangle 5545.png" path="/"/>
+    <image id="94qgd5" name="icon1-1.png" path="/" exported="true"/>
+    <image id="94qgd6" name="icon1.png" path="/" exported="true"/>
   </resources>
   <publish name="Info_Poker_YueYangWHZ" path="..\wb_unity_pro\Assets\ART\extend\zipai\yueyangwaihuzi\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Lobby/Main.xml

@@ -33,22 +33,18 @@
       <relation target="n82_m0ei" sidePair="middle-middle"/>
       <Button icon="ui://2d9xdj6zlrbs7co4"/>
     </component>
-    <component id="n50_lwcl" name="btn_video" src="lwcl5i" fileName="component/index/Btn_menu.xml" xy="940,1079" size="96,122" group="n104_xsk4" visible="false">
+    <component id="n50_lwcl" name="btn_video" src="lwcl5i" fileName="component/index/Btn_menu.xml" xy="79,1036" size="96,122" group="n104_xsk4" visible="false">
       <Button icon="ui://2d9xdj6zlwcl5e"/>
     </component>
-    <component id="n52_lwcl" name="btn_record" src="lwcl5i" fileName="component/index/Btn_menu.xml" xy="70,1029" size="90,131" group="n104_xsk4" touchable="false">
+    <component id="n52_lwcl" name="btn_record" src="lwcl5i" fileName="component/index/Btn_menu.xml" xy="70,1029" size="90,131" group="n104_xsk4" visible="false" touchable="false">
       <relation target="n82_m0ei" sidePair="middle-middle"/>
       <Button icon="ui://2d9xdj6zlrbs7co3"/>
     </component>
-    <component id="n89_goju" name="btn_service" src="lwcl5i" fileName="component/index/Btn_menu.xml" xy="1210,1087" size="96,122" group="n104_xsk4" visible="false" touchable="false">
+    <component id="n89_goju" name="btn_service" src="lwcl5i" fileName="component/index/Btn_menu.xml" xy="293,1042" size="96,122" group="n104_xsk4" visible="false" touchable="false">
       <Button icon="ui://2d9xdj6zgojufp"/>
     </component>
-    <component id="n144_lrbs" name="btn_playingMethod" src="lwcl5i" fileName="component/index/Btn_menu.xml" xy="326,1042" size="110,119" group="n104_xsk4" touchable="false">
-      <relation target="n82_m0ei" sidePair="middle-middle"/>
-      <Button icon="ui://2d9xdj6zlrbs7co2"/>
-    </component>
-    <group id="n104_xsk4" name="n104" xy="-160,606" size="1466,603" group="n7" advanced="true"/>
-    <group id="n7" name="menu_panel" xy="-160,606" size="1647,603" advanced="true"/>
+    <group id="n104_xsk4" name="n104" xy="-160,606" size="1386,558" group="n7" advanced="true"/>
+    <group id="n7" name="menu_panel" xy="-160,606" size="1647,566" advanced="true"/>
     <component id="n108_ker3" name="btn_exit" src="ker3j6" fileName="component/index/Btn_menu_top.xml" xy="-123,1404" group="n111_ker3">
       <relation target="" sidePair="right-right"/>
     </component>

wb_new_ui/assets/NewGroup/Main_GroupInfo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageOffsetX="-208" bgColor="#000000">
-  <controller name="manager" pages="0,普通玩家,1,圈主,2,副圈主,3,合伙人" selected="2"/>
+  <controller name="manager" pages="0,普通玩家,1,圈主,2,副圈主,3,合伙人" selected="1"/>
   <controller name="null" pages="0,,1," selected="0"/>
   <controller name="fag" pages="0,,1," selected="0"/>
   <controller name="floors" pages="0,,1,,2,,3,,4,,5," selected="0"/>
@@ -13,27 +13,33 @@
     <action type="change_page" fromPage="" toPage="1" objectId="n172_mpll" controller="tip" targetPage="1"/>
   </controller>
   <controller name="show_search" pages="0,,1," selected="0"/>
+  <controller name="tex_Selec_yd" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n231_csp4" name="n231" src="csp47cn9" fileName="images/bj.png" pkg="2d9xdj6z" xy="2,0" size="2532,1170" color="#e1e1e1">
+    <image id="n231_csp4" name="n231" src="ztde7icn" fileName="images/NGXiangTangMui/Frame 676.png" xy="0,0" size="2532,1170" color="#e1e1e1">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <component id="n121_goju" name="bg_anchor" src="gojuhh5" fileName="component/anchor.xml" xy="0,0"/>
+    <image id="n241_ztde" name="n241" src="ztde7icl" fileName="images/NGXiangTangMui/Rectangle 661.png" xy="6,4" size="503,196" group="n236_o6b1"/>
     <component id="n233_o6b1" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="17,16" group="n236_o6b1" aspect="true" visible="false"/>
-    <text id="n234_o6b1" name="tex_name" xy="133,13" size="233,34" group="n236_o6b1" visible="false" font="Microsoft YaHei" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="老司机带带我"/>
-    <text id="n235_o6b1" name="tex_id" xy="133,42" size="233,34" group="n236_o6b1" visible="false" font="Microsoft YaHei" fontSize="22" color="#ffffff" autoSize="none" text="ID:123456"/>
-    <group id="n236_o6b1" name="player_info_panel" xy="17,13" size="349,80" visible="false" advanced="true">
+    <component id="n203_jvvo" name="btn_close" src="t1hqhy9" fileName="component/nav/Btn_.xml" xy="30,44" size="100,90" group="n236_o6b1">
+      <relation target="" sidePair=""/>
+      <Button icon="ui://m7iejg46ztde7icm"/>
+    </component>
+    <text id="n234_o6b1" name="tex_name1" xy="156,39" size="279,54" group="n236_o6b1" font="ui://27vd145bpxed7ik2" fontSize="40" color="#ffeb7c" vAlign="middle" autoSize="shrink" text="老司机带带我"/>
+    <text id="n235_o6b1" name="tex_id" xy="156,87" size="278,49" group="n236_o6b1" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" autoSize="shrink" text="ID:123456"/>
+    <group id="n236_o6b1" name="player_info_panel" xy="6,4" size="503,196" advanced="true">
       <relation target="" sidePair="left-left,top-top"/>
     </group>
-    <component id="n160_qlxi" name="btn_fginfo" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1262,17" size="58,70" visible="false">
+    <component id="n160_qlxi" name="btn_fginfo" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="598,1578" size="58,70" visible="false">
       <gearDisplay controller="manager" pages="0"/>
       <relation target="" sidePair=""/>
       <Button icon="ui://m7iejg46qlxihsk"/>
     </component>
-    <component id="n139_cioe" name="btn_stat" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="2243,20" size="129,138">
+    <component id="n139_cioe" name="btn_stat" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1579,1581" size="129,138">
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://m7iejg46cioeho6"/>
     </component>
-    <component id="n138_cioe" name="btn_partner" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1945,20" size="129,137">
+    <component id="n138_cioe" name="btn_partner" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1281,1581" size="129,137">
       <gearDisplay controller="manager" pages="1,2,3"/>
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://m7iejg46cioeho7"/>
@@ -41,34 +47,31 @@
     <image id="n200_isix" name="member_tips" src="cioehom" fileName="images/info/right_panel/tips.png" xy="919,12" size="24,24" visible="false">
       <gearDisplay controller="manager" pages="1,2,3"/>
     </image>
-    <component id="n189_tqi8" name="btn_play" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1796,20" size="129,138">
+    <component id="n189_tqi8" name="btn_play" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1132,1581" size="129,138">
       <gearDisplay controller="manager" pages="1,2"/>
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://m7iejg46tqi8hw6"/>
     </component>
-    <component id="n94_g8wf" name="btn_manager" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1647,20" size="129,138">
+    <component id="n94_g8wf" name="btn_manager" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="983,1581" size="129,138">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://m7iejg46lf2qhjs"/>
     </component>
-    <component id="n172_mpll" name="btn_mail" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="2392,20" size="129,137" controller="tip,0">
+    <component id="n172_mpll" name="btn_mail" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="1728,1581" size="129,137" controller="tip,0">
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://m7iejg46rpazhvt"/>
     </component>
-    <component id="n190_nk4v" name="btn_bxx" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="2094,20" size="129,137" controller="tip,0">
+    <component id="n190_nk4v" name="btn_bxx" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="1430,1581" size="129,137" controller="tip,0">
       <gearDisplay controller="manager" pages="1,2,3"/>
-      <gearXY controller="manager" pages="0,1,2,3" values="2231,12|2094,20|2094,20|2094,20"/>
+      <gearXY controller="manager" pages="0,1,2,3" values="2231,12|1430,1581|2094,20|2094,20"/>
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://m7iejg46nk4vhwi"/>
     </component>
-    <component id="n239_ghnx" name="btn_rebot" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1498,20" size="129,138">
+    <component id="n239_ghnx" name="btn_rebot" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="834,1581" size="129,138">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://m7iejg46ghnx7i9p"/>
     </component>
-    <component id="n203_jvvo" name="btn_close" src="t1hqhy9" fileName="component/nav/Btn_.xml" xy="31,22">
-      <relation target="" sidePair=""/>
-    </component>
     <component id="n153_cioe" name="btn_invite" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="1991,7" size="123,0" group="n191_xsk4" visible="false" controller="tip,0">
       <gearDisplay controller="manager" pages="1,2,3"/>
       <Button icon="ui://m7iejg46cioehok"/>
@@ -85,24 +88,24 @@
       <Button icon="ui://m7iejg46cioehoj"/>
     </component>
     <group id="n175_mn85" name="n175" xy="843,5" size="54,55"/>
-    <image id="n210_ixiu" name="n210" src="ixiuhyk" fileName="images/index/cards_bg.png" xy="139,8" size="205,36" group="n78_i7lq"/>
-    <text id="n76_i7lq" name="tex_name" xy="140,5" size="204,42" group="n78_i7lq" fontSize="28" color="#ffffff" align="center" autoSize="shrink" text="圈子名字"/>
-    <image id="n209_ixiu" name="n209" src="ixiuhyk" fileName="images/index/cards_bg.png" xy="140,47" size="205,36" group="n78_i7lq"/>
-    <text id="n77_i7lq" name="tex_id" xy="142,47" size="203,37" group="n78_i7lq" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="ID:1234567"/>
-    <group id="n78_i7lq" name="title" xy="139,5" size="206,79" group="n176_mn85" visible="false" advanced="true"/>
-    <graph id="n228_csp4" name="n228" xy="306,48" size="363,65" group="n206_jvvo" type="rect" lineSize="2" lineColor="#ffffffff" fillColor="#66000000" corner="65"/>
-    <image id="n229_csp4" name="n229" src="csp47i3u" fileName="images/room/jifen.png" xy="282,36" group="n206_jvvo"/>
-    <text id="n216_ovii" name="n216" xy="129,9" size="94,42" group="n206_jvvo" visible="false" font="FZDaBiaoSong-B06S" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
+    <image id="n210_ixiu" name="n210" src="ixiuhyk" fileName="images/index/cards_bg.png" xy="457,-433" size="205,36" group="n78_i7lq"/>
+    <text id="n76_i7lq" name="tex_name" xy="458,-436" size="204,42" group="n78_i7lq" fontSize="28" color="#ffffff" align="center" autoSize="shrink" text="圈子名字"/>
+    <image id="n209_ixiu" name="n209" src="ixiuhyk" fileName="images/index/cards_bg.png" xy="458,-394" size="205,36" group="n78_i7lq"/>
+    <text id="n77_i7lq" name="tex_id" xy="460,-394" size="203,37" group="n78_i7lq" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="ID:1234567"/>
+    <group id="n78_i7lq" name="title" xy="457,-436" size="206,79" group="n176_mn85" visible="false" advanced="true"/>
+    <graph id="n228_csp4" name="n228" xy="650,-302" size="363,65" group="n206_jvvo" type="rect" lineSize="2" lineColor="#ffffffff" fillColor="#66000000" corner="65"/>
+    <image id="n229_csp4" name="n229" src="csp47i3u" fileName="images/room/jifen.png" xy="626,-314" group="n206_jvvo"/>
+    <text id="n216_ovii" name="n216" xy="473,-341" size="94,42" group="n206_jvvo" visible="false" font="FZDaBiaoSong-B06S" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
-    <text id="n205_jvvo" name="tex_fag" xy="364,57" size="295,46" group="n206_jvvo" font="ui://27vd145bpxed7ik2" fontSize="34" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="0">
+    <text id="n205_jvvo" name="tex_fag" xy="708,-293" size="295,46" group="n206_jvvo" font="ui://27vd145bpxed7ik2" fontSize="34" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="0">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
-    <loader id="n204_jvvo" name="icon" xy="306,242" size="0,47" group="n206_jvvo" visible="false" url="ui://m7iejg46uybihvj" vAlign="middle">
+    <loader id="n204_jvvo" name="icon" xy="650,-108" size="0,47" group="n206_jvvo" visible="false" url="ui://m7iejg46uybihvj" vAlign="middle">
       <relation target="" sidePair="left-left,middle-middle"/>
     </loader>
-    <group id="n206_jvvo" name="n206" xy="129,9" size="540,280" group="n176_mn85"/>
-    <group id="n176_mn85" name="top" xy="129,5" size="540,284" advanced="true"/>
+    <group id="n206_jvvo" name="n206" xy="473,-341" size="540,280" group="n176_mn85"/>
+    <group id="n176_mn85" name="top" xy="457,-436" size="556,375" advanced="true"/>
     <list id="n45_l0s4" name="lst_room" xy="257,233" size="2117,778" layout="flow_vt" selectionMode="none" overflow="scroll" scroll="horizontal" scrollBarFlags="2" margin="-23,0,0,0" lineGap="-14" colGap="125" lineItemCount="2" defaultItem="ui://m7iejg46jvvohyf" autoClearItems="true">
       <gearDisplay controller="null" pages="0"/>
       <relation target="" sidePair="width-width,middle-middle"/>
@@ -122,45 +125,53 @@
     <graph id="n240_k5ep" name="n240" xy="0,1019" size="2532,151" type="rect" lineSize="0" fillColor="#4cffffff">
       <relation target="" sidePair="bottom-bottom"/>
     </graph>
-    <list id="n186_p0pd" name="game_list" xy="3,1170" size="426,780" overflow="scroll" scrollBarFlags="2" defaultItem="ui://m7iejg46p0pdhvp" vAlign="bottom" autoClearItems="true">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <list id="n122_gg9f" name="lst_layer" xy="414,1036" size="1701,115" layout="row" overflow="scroll" scroll="horizontal" lineGap="1" defaultItem="ui://m7iejg46jiu8hef" autoClearItems="true">
-      <gearDisplay controller="search" pages="0"/>
-      <relation target="" sidePair="width-width,bottom-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n171_mpll" name="btn_select_play" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="2263,696" size="58,81" group="n74_i7lq" visible="false">
+    <component id="n171_mpll" name="btn_select_play" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1814,1311" size="58,81" group="n74_i7lq" visible="false">
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://m7iejg46mpllhv8"/>
     </component>
-    <component id="n230_csp4" name="btn_start2" src="csp47i3z" fileName="component/Lst_info/Btn_start.xml" xy="2122,1021" group="n74_i7lq">
+    <component id="n230_csp4" name="btn_start2" src="csp47i3z" fileName="component/Lst_info/Btn_start.xml" xy="2043,1012" size="529,165" group="n74_i7lq">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n88_kxzv" name="btn_start" src="csp47i3z" fileName="component/Lst_info/Btn_start.xml" xy="1185,655" size="137,80" group="n130_w111" visible="false"/>
-    <group id="n130_w111" name="PlayGameBtns" xy="1185,655" size="137,80" group="n74_i7lq" advanced="true">
+    <component id="n88_kxzv" name="btn_start" src="csp47i3z" fileName="component/Lst_info/Btn_start.xml" xy="1182,651" size="137,80" group="n130_w111" visible="false"/>
+    <group id="n130_w111" name="PlayGameBtns" xy="1182,651" size="137,80" group="n74_i7lq" advanced="true">
       <gearDisplay controller="all" pages="1"/>
       <relation target="" sidePair=""/>
     </group>
-    <component id="n214_ovii" name="btn_choose" src="oviii0w" fileName="component/Lst_info/Btn_choose.xml" xy="6,1021" group="n74_i7lq">
+    <component id="n214_ovii" name="btn_choose" src="oviii0w" fileName="component/Lst_info/Btn_choose.xml" xy="2183,21" group="n74_i7lq">
       <relation target="" sidePair="left-left,top-bottom"/>
     </component>
-    <component id="n238_dg1v" name="btn_quanbu" src="dg1v7i92" fileName="component/Lst_info/btn_quanbu.xml" xy="298,1183" size="110,80" group="n74_i7lq" visible="false" touchable="false">
+    <component id="n238_dg1v" name="btn_quanbu" src="dg1v7i92" fileName="component/Lst_info/btn_quanbu.xml" xy="2183,21" size="328,132" group="n74_i7lq" visible="false">
       <relation target="" sidePair="left-left,top-bottom"/>
     </component>
-    <group id="n74_i7lq" name="bottom" xy="6,655" size="2521,608" advanced="true"/>
-    <component id="n159_lnha" name="com_notice" src="lnhahsf" fileName="component/notice/Cgm_message.xml" xy="557,146">
+    <image id="n242_wqg2" name="n242" src="wqg27ict" fileName="images/NGXiangTangMui/Rectangle 674.png" xy="3115,123" size="1105,1007" group="n243_wqg2">
+      <relation target="n214_ovii" sidePair="bottom-bottom"/>
+      <relation target="" sidePair="right-right"/>
+    </image>
+    <list id="n186_p0pd" name="game_list" xy="3170,199" pivot="0.5,0.5" size="1021,93" group="n243_wqg2" layout="row" overflow="scroll" scroll="horizontal" colGap="14" defaultItem="ui://m7iejg46p0pdhvp" vAlign="bottom" autoClearItems="true">
+      <relation target="n242_wqg2" sidePair="center-center,top-top"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n122_gg9f" name="lst_layer" xy="3174,317" size="1010,766" group="n243_wqg2" overflow="scroll" lineGap="15" defaultItem="ui://m7iejg46jiu8hef" align="center" autoClearItems="true">
+      <gearDisplay controller="search" pages="0"/>
+      <relation target="n242_wqg2" sidePair="right-left,bottom-top"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n243_wqg2" name="tex_SelectRoom" xy="3115,123" size="1105,1007" group="n74_i7lq" advanced="true">
+      <gearXY controller="tex_Selec_yd" pages="0,1" values="1427,123|3115,123" tween="true" ease="Quad.InOut"/>
+      <relation target="n231_csp4" sidePair="right-right"/>
+    </group>
+    <group id="n74_i7lq" name="bottom" xy="1182,21" size="3038,1371" advanced="true"/>
+    <component id="n159_lnha" name="com_notice" src="lnhahsf" fileName="component/notice/Cgm_message.xml" xy="193,-195">
       <gearDisplay controller="show_search" pages="0"/>
       <relation target="" sidePair="center-center"/>
       <relation target="n45_l0s4" sidePair="top-top"/>

wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Game_Type.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="430,156" extention="Button">
+<component size="218,94" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n0_p0pd" name="icon" xy="0,0" size="430,156" url="ui://m7iejg46p0pdhvq" fill="scaleFree" autoSize="true" clearOnPublish="true"/>
-    <text id="n1_y6xi" name="n11" xy="106,37" size="320,79" font="ui://27vd145bpxed7ik2" fontSize="60" color="#ffffff" align="center" vAlign="middle" leading="2" letterSpacing="2" autoSize="shrink" text="汉寿跑胡子">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <loader id="n0_p0pd" name="icon" xy="0,0" size="218,94" url="ui://m7iejg46wqg27icr" fill="scaleFree" clearOnPublish="true"/>
+    <text id="n1_y6xi" name="n11" xy="9,5" size="200,81" font="ui://27vd145bpxed7ik2" fontSize="37" color="#ffffff" align="center" vAlign="middle" leading="2" letterSpacing="2" autoSize="shrink" singleLine="true" text="湘潭跑胡子">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="n0_p0pd" sidePair="center-center,bottom-top"/>
     </text>
-    <text id="n2_csp4" name="n22" xy="29,37" size="68,74" font="ui://27vd145bpxed7ik2" fontSize="48" color="#ffffff" align="center" vAlign="middle" leading="2" letterSpacing="2" autoSize="shrink" text="1">
-      <relation target="" sidePair="left-left,top-top"/>
+    <text id="n2_csp4" name="n22" xy="9,5" size="200,81" font="ui://27vd145bpxed7ik2" fontSize="37" color="#ffffff" align="center" vAlign="middle" leading="2" letterSpacing="2" autoSize="shrink" strokeColor="#9c0000" singleLine="true" text="湘潭跑胡子">
+      <gearDisplay controller="button" pages="1"/>
+      <relation target="n0_p0pd" sidePair="center-center,bottom-top"/>
     </text>
   </displayList>
   <Button mode="Radio"/>
-  <relation target="n0_p0pd" sidePair="width-width,height-height"/>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_info/Btn_choose.xml

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="405,149" extention="Button">
+<component size="328,132" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="null" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_ovii" name="n0" src="oviii0v" fileName="images/info/button_11.png" xy="0,0" size="405,149">
+    <image id="n0_ovii" name="n0" src="ztde7ico" fileName="images/NGXiangTangMui/Frame 384.png" xy="0,0" size="328,132">
       <gearDisplay controller="button" pages="0,2"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_ovii" name="n1" src="oviii0v" fileName="images/info/button_11.png" xy="0,0" size="405,149">
+    <image id="n1_ovii" name="n1" src="ztde7ico" fileName="images/NGXiangTangMui/Frame 384.png" xy="0,0" size="328,132">
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n2_ovii" name="tex_gamename" xy="1,0" size="403,144" visible="false" font="FZCuYuan-M03" fontSize="32" color="#6a1500" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="玩法选择">
+    <text id="n2_ovii" name="tex_gamename" xy="0,-3" size="328,132" font="ui://27vd145bpxed7ik2" fontSize="48" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" strokeColor="#6c4d21" strokeSize="2" singleLine="true" text="玩法选择">
       <gearText controller="null" pages="0,1" values="玩法选择|大厅玩法"/>
       <relation target="" sidePair="width-width,height-height"/>
+      <relation target="n0_ovii" sidePair="center-center,top-top"/>
     </text>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.8"/>
+  <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="405,149" extention="Button">
+<component size="529,165" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_csp4" name="n0" src="csp47i3y" fileName="images/index/ann_kuaisukaishi.png" xy="0,0">
+    <image id="n0_csp4" name="n0" src="ztde7icj" fileName="images/NGXiangTangMui/Frame 383.png" xy="0,0" size="529,165">
       <gearDisplay controller="button" pages="0,2"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_csp4" name="n1" src="csp47i3y" fileName="images/index/ann_kuaisukaishi.png" xy="-4,0">
+    <image id="n1_csp4" name="n1" src="ztde7icj" fileName="images/NGXiangTangMui/Frame 383.png" xy="0,0" size="529,165">
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.8"/>
+  <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_item.xml

@@ -1,17 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="380,115" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+<component size="987,178" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="del" pages="0,,1," selected="0"/>
   <controller name="fag" pages="0,,1," selected="0"/>
+  <controller name="isZhiDing" pages="0,,1,,3," selected="2"/>
+  <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <image id="n12_oryt" name="n12" src="oryt7i3a" fileName="images/info/button_01.png" xy="0,0" alpha="0.986">
-      <gearDisplay controller="button" pages="1"/>
+    <image id="n24_dg1v" name="n13" src="wqg27icx" fileName="images/NGXiangTangMui/Rectangle 675.png" xy="0,0" size="987,178">
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <component id="n18_pw15" name="pipeijoin" src="pw157i8w" fileName="component/Lst_info/pipeijoin2.xml" xy="3,-79" size="208,50" visible="false" touchable="false"/>
-    <image id="n24_dg1v" name="n13" src="dg1v7i91" fileName="images/info/button-02.png" xy="0,0">
-      <gearDisplay controller="button" pages="0"/>
+    <component id="n18_pw15" name="pipeijoin" src="pw157i8w" fileName="component/Lst_info/pipeijoin2.xml" xy="713,25" size="255,127">
+      <relation target="n24_dg1v" sidePair="middle-middle,right-right"/>
+    </component>
+    <text id="n10_yetw" name="tex_game" xy="308,33" size="395,54" font="ui://27vd145bpxed7ik2" fontSize="40" color="#423a34" vAlign="middle" autoSize="none" autoClearText="true" text="单局二园红中板鸟">
+      <relation target="n25_wqg2" sidePair="right-right"/>
+    </text>
+    <text id="n30_wqg2" name="tex_jutifenleiName" xy="308,88" size="395,44" font="ui://27vd145bpxed7ik2" fontSize="32" color="#ff0c00" autoSize="none" autoClearText="true" text="红中麻将">
+      <relation target="n25_wqg2" sidePair="right-right"/>
+    </text>
+    <image id="n25_wqg2" name="n25" src="wqg27icw" fileName="images/NGXiangTangMui/Rectangle 677.png" xy="143,23">
+      <relation target="n26_wqg2" sidePair="right-right"/>
     </image>
-    <text id="n10_yetw" name="tex_game" xy="0,-8" size="380,132" font="ui://27vd145bpxed7ik2" fontSize="48" color="#0d1725" align="center" vAlign="middle" autoSize="none" text="按钮"/>
+    <text id="n29_wqg2" name="tex_paiming" xy="144,47" pivot="0.5,0.5" size="129,84" font="ui://27vd145bpxed7ik2" fontSize="64" align="center" vAlign="middle" autoSize="shrink" text="1">
+      <relation target="n25_wqg2" sidePair="center-center,middle-middle"/>
+    </text>
+    <component id="n26_wqg2" name="n26" src="94qg7icy" fileName="component/Lst_info/btn_layer_topM.xml" xy="0,0" size="124,178" touchable="false">
+      <relation target="n24_dg1v" sidePair="height-height,left-left"/>
+      <Button title="sss"/>
+    </component>
+    <text id="n27_wqg2" name="n27" xy="11,26" size="100,126" visible="false" font="ui://27vd145bpxed7ik2" fontSize="48" color="#ffffff" strokeColor="#770707" text="取消&#xD;&#xA;置顶">
+      <gearDisplay controller="isZhiDing" pages="0"/>
+      <relation target="n26_wqg2" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n28_wqg2" name="n28" xy="28,6" size="68,166" visible="false" font="ui://27vd145bpxed7ik2" fontSize="64" color="#ffffff" strokeColor="#770707" text="置&#xD;&#xA;顶">
+      <gearDisplay controller="isZhiDing" pages="1"/>
+      <relation target="n26_wqg2" sidePair="center-center,middle-middle"/>
+    </text>
   </displayList>
   <Button mode="Radio"/>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_topM.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="124,178" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n26_wqg2" name="n26" src="wqg27icv" fileName="images/NGXiangTangMui/Rectangle 676.png" xy="0,0" size="124,178">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Check"/>
+</component>

wb_new_ui/assets/NewGroup/component/Lst_info/btn_quanbu.xml

@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="110,80" extention="Button">
+<component size="328,132" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n4_dg1v" name="n4" src="dg1v7i93" fileName="component/Lst_info/quanbu.png" xy="0,0" size="110,80">
+    <image id="n4_dg1v" name="n4" src="ztde7ico" fileName="images/NGXiangTangMui/Frame 384.png" xy="0,0" size="328,132">
       <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n5_dg1v" name="n5" src="dg1v7i93" fileName="component/Lst_info/quanbu.png" xy="0,0" size="110,80">
+    <image id="n5_dg1v" name="n5" src="ztde7ico" fileName="images/NGXiangTangMui/Frame 384.png" xy="0,0" size="328,132">
       <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
+    <text id="n6_ztde" name="n6" xy="0,-3" size="328,132" font="ui://27vd145bpxed7ik2" fontSize="48" color="#ffffff" align="center" vAlign="middle" autoSize="none" strokeColor="#6c4d21" strokeSize="2" text="全部玩法">
+      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="n4_dg1v" sidePair="center-center,top-top"/>
+    </text>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_info/pipeijoin2.xml

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="208,50" extention="Button">
+<component size="255,127" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n3_pw15" name="n3" src="oryt7i3a" fileName="images/info/button_01.png" xy="0,0" size="208,50">
-      <gearDisplay controller="button" pages="1"/>
-    </image>
-    <image id="n6_dg1v" name="n6" src="dg1v7i91" fileName="images/info/button-02.png" xy="0,0">
-      <gearDisplay controller="button" pages="0"/>
-    </image>
-    <text id="n4_pw15" name="n4" xy="40,1" size="134,42" fontSize="26" color="#ffd499" align="center" vAlign="middle" autoSize="none" text="匹配加入"/>
+    <image id="n6_dg1v" name="n6" src="wqg27icu" fileName="images/NGXiangTangMui/Frame 403.png" xy="0,0" size="255,127"/>
+    <text id="n4_pw15" name="n4" xy="40,1" size="134,42" visible="false" fontSize="26" color="#ffd499" align="center" vAlign="middle" autoSize="none" text="匹配加入"/>
   </displayList>
   <Button/>
 </component>

wb_new_ui/assets/NewGroup/component/nav/Btn_.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="99,119" extention="Button">
+<component size="100,90" extention="Button">
   <displayList>
-    <image id="n0_t1hq" name="n0" src="t1hqhy8" fileName="component/nav/match_back.png" xy="0,0"/>
+    <image id="n0_t1hq" name="n0" src="ztde7icm" fileName="images/NGXiangTangMui/Vector.png" xy="0,0" size="100,90">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.8"/>
+  <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/NewGroup/package.xml

@@ -471,7 +471,7 @@
     <image id="uybihvk" name="chongzhi.png" path="/images/room/"/>
     <image id="p0pdhvo" name="zcd.png" path="/images/"/>
     <component id="p0pdhvp" name="Btn_Game_Type.xml" path="/component/Lst_info/" exported="true"/>
-    <image id="p0pdhvq" name="quyxtb.png" path="/images/" exported="true"/>
+    <image id="p0pdhvq" name="quyxtb_1.png" path="/images/"/>
     <image id="rpazhvr" name="zrbtz.png" path="/images/"/>
     <image id="rpazhvt" name="yj1.png" path="/component/mail/"/>
     <image id="rpazhvu" name="zjphmcd.png" path="/images/info/"/>
@@ -630,7 +630,7 @@
     <image id="j046i0k" name="anniu_tpwj@2x.png" path="/mgr/imgs/member/"/>
     <image id="j046i0l" name="down_type_bg@2x.png" path="/images/main/"/>
     <image id="myu9i0m" name="play_ttile@2x.png" path="/mgr/imgs/game/"/>
-    <image id="ij0fi0n" name="quyxtb-1.png" path="/images/" exported="true"/>
+    <image id="ij0fi0n" name="quyxtb-1_1.png" path="/images/"/>
     <image id="xihai0p" name="xzwfq1.png" path="/images/info/"/>
     <image id="xihai0q" name="xzwfq111.png" path="/images/info/"/>
     <component id="i2dji0r" name="Item_room5.xml" path="/component/Lst_room/" exported="true"/>
@@ -928,6 +928,20 @@
     <image id="lrbs7icg" name="2-4.png" path="/images/NGXiangTangMui/"/>
     <image id="lrbs7ich" name="Rectangle 673.png" path="/images/NGXiangTangMui/"/>
     <image id="lrbs7ici" name="Frame 390.png" path="/images/NGXiangTangMui/"/>
+    <image id="ztde7icj" name="Frame 383.png" path="/images/NGXiangTangMui/"/>
+    <image id="ztde7ick" name="Frame 385.png" path="/images/NGXiangTangMui/"/>
+    <image id="ztde7icl" name="Rectangle 661.png" path="/images/NGXiangTangMui/"/>
+    <image id="ztde7icm" name="Vector.png" path="/images/NGXiangTangMui/"/>
+    <image id="ztde7icn" name="Frame 676.png" path="/images/NGXiangTangMui/" atlas="alone_npot"/>
+    <image id="ztde7ico" name="Frame 384.png" path="/images/NGXiangTangMui/"/>
+    <image id="wqg27icr" name="quyxtb-1.png" path="/images/" exported="true"/>
+    <image id="wqg27ics" name="quyxtb.png" path="/images/" exported="true"/>
+    <image id="wqg27ict" name="Rectangle 674.png" path="/images/NGXiangTangMui/"/>
+    <image id="wqg27icu" name="Frame 403.png" path="/images/NGXiangTangMui/"/>
+    <image id="wqg27icv" name="Rectangle 676.png" path="/images/NGXiangTangMui/"/>
+    <image id="wqg27icw" name="Rectangle 677.png" path="/images/NGXiangTangMui/"/>
+    <image id="wqg27icx" name="Rectangle 675.png" path="/images/NGXiangTangMui/"/>
+    <component id="94qg7icy" name="btn_layer_topM.xml" path="/component/Lst_info/"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: bd89b9fbec5804c40b0acc1e810794c9
+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: 

wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_ztde7icn.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: c668695da9c78c1459410e3447ed5488
+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: