解决冲突

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

@@ -0,0 +1,109 @@
+-- 能量包
+
+local GroupFastGamesView = {}
+
+local M = GroupFastGamesView
+
+function GroupFastGamesView.new(gid, blur_view, playIdList, uid)
+	setmetatable(M, { __index = BaseWindow })
+	local self = setmetatable({}, { __index = M })
+
+	self.class = "GroupFastGamesView"
+	self._close_destroy = true
+	self.group_id = gid
+	self.blur_view = blur_view
+	self.playIdList = playIdList
+	self.allplays_data = {}
+	self.uid = uid
+	self.showid = 0
+	self:init("ui://NewGroup/Win_SelectGames")
+	self:FillView()
+	return self
+end
+
+
+function M:FillView()
+	--lst_allplays
+	self.showid = Utils.LoadLocalFile("selectplay"..self.uid)
+	
+	self.lst_allplays = self._view:GetChild("lst_allplays")
+    self.lst_allplays:SetVirtual()
+    self.lst_allplays.itemRenderer = function(index, obj)
+    	self:OnRenderAllPlaysItem(index, obj, self.showid)
+    end
+	printlog(self.showid)
+	self:GetFlagPlaysData(self.showid)
+end
+
+-- 获取快速开始设置数据
+function M:GetFlagPlaysData(showid)
+  
+	local allplays = self.playIdList
+	self.allplays_data = allplays
+	local tmp = {}
+	for i=1,#allplays do
+		if  showid==allplays[i].id.."" then
+			tmp = self.allplays_data[1]
+			self.allplays_data[1] = self.allplays_data[i]
+			self.allplays_data[i] = tmp
+		end	
+	end
+	self.lst_allplays.numItems = #self.allplays_data
+     
+end
+
+function M:OnRenderAllPlaysItem(index, obj,showid)
+	
+	local data = self.allplays_data[index+1]
+	local exconfig = ExtendManager.GetExtendConfig(data.gameId)
+	local datajson = json.decode(data.config)
+	local r = {}
+    exconfig:FillRoomConfig(r, datajson)
+	local gameStr = ""
+    gameStr =  string.gsub(r.room_config:GetDes(), "\r", "")
+	obj:GetChild("tex_name").text = data.name
+	obj:GetChild("tex_display").text = gameStr
+	
+	if showid~=nil then
+		if data.id.."" == showid then
+			obj:GetChild("gxbtn").selected = true
+		else
+			obj:GetChild("gxbtn").selected = false
+		end
+	end
+	
+	obj:GetChild("gxbtn").onClick:Set(function()
+		self:SelectPlaysItem(data.id,index+1,data.name)
+	end)
+	--obj:GetChild("gxbtn").selected = 
+end
+
+function M:SelectPlaysItem(id,index,gamename)
+	self.lst_allplays = self._view:GetChild("lst_allplays")
+	Utils.SaveLocalFile("selectplay"..self.uid, id)
+	Utils.SaveLocalFile("selectplayname"..self.uid, gamename)
+	for key, value in pairs(self.playIdList) do
+		if key==index then
+			self.playIdList[index].show = true
+		else
+			self.playIdList[key].show = false
+		end
+	end
+	self:FillView()
+	
+end
+
+function M:SetCallback(callback)
+	self.callback = callback
+end
+
+-- 销毁窗口
+function M:Destroy(remove_map)
+	if self.callback then
+		self.callback()
+	end
+	BaseWindow.Destroy(self, remove_map)
+	ImageLoad.Clear(self.class)
+end
+
+return M

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

@@ -17,6 +17,7 @@ local GroupMngMenKangView = import(".MngView.GroupMngMenKangView")
 local GroupMngPiLaoZhi = import(".MngView.GroupMngPiLaoZhi")
 local GroupShowMemberInfoView = import(".MngView.GroupShowMemberInfoView")
 -- local GroupPartnerRewardsView = import(".GroupPartnerRewardsView")
+local GroupFastGamesView = import('.GroupFastGamesView')
 
 -- local HeadView = require('Game/View/LobbyHeadView')
 GroupNumberInputView_Game = import(".MngView.GroupNumberInputView")
@@ -652,7 +653,7 @@ local function __fillRoomData(self)
     list_offline = {}
 
     if self.curGroup.lev < 3 then
-        pt(self.curRooms)
+      --  pt(self.curRooms)
         self.lst_room.numItems = #self.curRooms
     else
         if self.curGroup.show_num > 0 and #self.curRooms > self.curGroup.show_num then
@@ -749,12 +750,14 @@ local function __fillPlayItem(self, index, item)
     if (index == 0) then
         -- tex_gameName.text = __getLayerName(self, 0)
         item:GetController('all').selectedIndex = 1
+        
     else
         item:GetController('all').selectedIndex = 0
         pipeijoin.onClick:Add(
             function()
                 local currentPlayID = self:GetSelectedPlayID()
                 if currentPlayID == 0 then
+                    
                     if self.lst_layer.selectedIndex == 0 and self.lst_game.selectedIndex > 0 then
                         local pid = self.fg_info[tostring(self.curGroup.id)]
                         if pid == 0 then
@@ -855,6 +858,7 @@ local function __fillGameItem(self, index, item)
         if self.currentGameItemName == nil then
             item.icon = 'ui://NewGroup/quyxtb-1'
         end
+        
     else
         local gameId = self.gameIdList[index]
         local config = ExtendManager.GetExtendConfig(gameId)
@@ -1100,6 +1104,7 @@ function M:InitView(url)
 
     self.lst_game.onClickItem:Add(
         function(pas)
+        
             if self.currentSelectItem == pas.data then return end
             local name = pas.data.icon
             self.currentSelectItem = pas.data
@@ -1130,6 +1135,7 @@ function M:InitView(url)
 
     self.lst_layer.onClickItem:Add(
         function(context)
+            
             self._view:GetChild('btn_start2').text = context.data.data
             self:__loadPlayData()
         end
@@ -1139,8 +1145,11 @@ function M:InitView(url)
     local btn_quanbu = self._view:GetChild('btn_quanbu')
     btn_quanbu.onClick:Set(
         function()
+            
             self.lst_layer.selectedIndex = 0
             self:__loadPlayData()
+        
+            
         end
     )
 
@@ -1173,13 +1182,29 @@ function M:InitView(url)
             local pid = self.fg_info[tostring(self.curGroup.id)]
 
             if pid == 0 then
-                ViewUtil.ErrorTip(nil, '没有选择玩法')
+                ViewUtil.ErrorTip(nil, '没有选择玩法!')
                 return
             end
             self:__startGame("", pid, false)
         end
     )
 
+    local goselectgames = self._view:GetChild('goselectgames')
+    goselectgames.onClick:Set(
+        function()
+            local gfg = GroupFastGamesView.new(self.curGroup.id, self._root_view, self.curGroup.playList,
+                            DataManager.SelfUser.account_id)
+                    
+                    gfg:SetCallback(
+                        function()
+                            local showid = Utils.LoadLocalFile("selectplay"..DataManager.SelfUser.account_id)
+                            local gamename = Utils.LoadLocalFile("selectplayname"..DataManager.SelfUser.account_id)
+                            self._view:GetChild('btn_start2').text = gamename
+                            self:__startGame("",tonumber(showid), false)
+                        end
+                    )
+                    gfg:Show()
+    end)
     -- 快速开始按钮
     local btn_start2 = self._view:GetChild('btn_start2')
     btn_start2.visible = true
@@ -1187,10 +1212,19 @@ function M:InitView(url)
         function()
             local currentPlayID = self:GetSelectedPlayID()
             if currentPlayID == 0 then
+                local showid2 = Utils.LoadLocalFile("selectplay"..DataManager.SelfUser.account_id)
+                
+                if showid2~=nil then
+                    local gamename = Utils.LoadLocalFile("selectplayname"..DataManager.SelfUser.account_id)
+                    self._view:GetChild('btn_start2').text = gamename
+                    self:__startGame("",tonumber(showid2), false)
+                    return
+                end
+
                 if self.lst_layer.selectedIndex == 0 and self.lst_game.selectedIndex > 0 then
                     local pid = self.fg_info[tostring(self.curGroup.id)]
                     if pid == 0 then
-                        ViewUtil.ErrorTip(nil, '没有选择玩法')
+                        ViewUtil.ErrorTip(nil, '没有选择玩法1')
                         return
                     end
                     local p_data = self.curGroup:getPlay(pid)
@@ -1200,7 +1234,21 @@ function M:InitView(url)
                     end
                 end
                 if currentPlayID == 0 then
-                    ViewUtil.ErrorTip(nil, '没有选择玩法')
+                
+                    local gfg = GroupFastGamesView.new(self.curGroup.id, self._root_view, self.curGroup.playList,
+                            DataManager.SelfUser.account_id)
+                    
+                    gfg:SetCallback(
+                        function()
+                            local showid = Utils.LoadLocalFile("selectplay"..DataManager.SelfUser.account_id)
+                          
+                            currentPlayID = showid
+                            self:__startGame("",tonumber(showid), false)
+                        end
+                    )
+                    gfg:Show()
+                    
+                   -- ViewUtil.ErrorTip(nil, '没有选择玩法2')
                     return
                 end
             end
@@ -1432,7 +1480,95 @@ function M:__onUpdate()
     end
 end
 
+<<<<<<< HEAD
 function M:__joinRoom(room_id, room)
+=======
+function M:__joinRoom2(room_id)
+    ViewUtil.ShowModalWait(self._root_view, '正在加入游戏...', 'join_room')
+    local roomCtr = ControllerManager.GetController(RoomController)
+    local _gameCtrl = ControllerManager.GetController(GameController)
+    local _currentCtrl = ControllerManager.GetCurrenController()
+    if _gameCtrl == _currentCtrl then
+        if _gameCtrl.tmpRoomID ~= room_id then
+            _gameCtrl:LevelRoom(
+                function(res)
+                    roomCtr:PublicJoinRoom(
+                        Protocol.WEB_FG_JOIN_ROOM,
+                        room_id,
+                        false,
+                        function(response)
+                            if (response.ReturnCode == -1) then
+                                ViewUtil.CloseModalWait('join_room')
+                                RestartGame()
+                                return
+                            end
+
+                            if response.ReturnCode == -2 then
+                                self:__joinRoom2(room_id)
+                                return
+                            elseif response.ReturnCode ~= 0 then
+                                ViewUtil.CloseModalWait('join_room')
+                                ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
+                                return
+                            end
+                            self.__join_room = true
+                            -- local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+                            -- mgr_ctr:disconnect()
+                            self._view.visible = false
+                            ImageLoad.Clear(self.class)
+                            ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
+                            ViewUtil.CloseModalWait('join_room')
+                            timer = 0
+                        end,
+                        self.curGroup.id
+                    )
+                end
+            )
+            return
+        end
+    end
+
+
+    roomCtr:PublicJoinRoom(
+        Protocol.WEB_FG_JOIN_ROOM,
+        room_id,
+        false,
+        function(response)
+            printlog("进入房间返回事件==========》》》")
+            pt(response)
+            if (response.ReturnCode == -1) then
+                ViewUtil.CloseModalWait('join_room')
+                RestartGame()
+                return
+            end
+            
+            
+                if response.ReturnCode == -2 then
+                    self:__joinRoom2(room_id)
+                    return
+                elseif response.ReturnCode ~= 0 then
+                    ViewUtil.CloseModalWait('join_room')
+                    ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
+                    return
+                end
+                self.__join_room = true
+                -- local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+                -- mgr_ctr:disconnect()
+                self._view.visible = false
+                ImageLoad.Clear(self.class)
+                ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
+                ViewUtil.CloseModalWait('join_room')
+                timer = 0
+                end,
+                self.curGroup.id
+    )
+    
+end
+
+function M:__joinRoom(room_id,room)
+   
+    
+>>>>>>> 58c1e25d109e1ea2bad4ecf33e2ab6d018043b3e
     if self.roominfo.view and not self.roominfo.view.isDisposed then
         self.roominfo.view:Dispose()
     end
@@ -1820,7 +1956,12 @@ function M:_evtInvited(...)
             self._root_view,
             self.curGroup.id,
             function(roomid)
+<<<<<<< HEAD
                 self:__joinRoom(roomid, self.roominfo.room)
+=======
+                printlog("Into game")
+                self:__joinRoom(roomid,self.roominfo.room)
+>>>>>>> 58c1e25d109e1ea2bad4ecf33e2ab6d018043b3e
             end
         )
     imv:FillData(data)
@@ -2183,10 +2324,12 @@ function M:__refreshPay()
 
     local ctr_all = self._view:GetController('all')
 
+
     local currentPlayID = self:GetSelectedPlayID()
     local currentGameID = self:GetSelectedGameID()
 
     if currentPlayID > 0 then
+       
         --self._view:GetChild("tex_name").text = __getLayerName(self,currentPlayID)
         ctr_all.selectedIndex = 0
     else
@@ -2258,7 +2401,11 @@ function M:Show()
     local roomid = user.room_id
 
     if user.group_id == self.curGroup.id and string.len(roomid) > 1 then
+<<<<<<< HEAD
         self:__joinRoom(roomid, self.roominfo.room)
+=======
+        self:__joinRoom2(roomid)
+>>>>>>> 58c1e25d109e1ea2bad4ecf33e2ab6d018043b3e
         user.group_id = 0
     end
 end
@@ -2274,8 +2421,6 @@ function M:SortPlayList(a, b)
             return a_play.gameId < b_play.gameId
         end
     else
-        pt(a_play)
-        pt(b_play)
         return a_play.gameType < b_play.gameType
     end
 end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua

@@ -352,7 +352,8 @@ function M:FillItem(obj, member, refresh, index)
     -- end
 
 
-    obj:GetChild('tex_zongchangci').text = member.total_round
+    obj:GetChild('tex_zongchangci').text = member.parentId
+  --  obj:GetChild('tex_pername').text = member.parentId_nick or ""
     obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time)
 
     --上级

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua

@@ -327,8 +327,9 @@ function M:FillItem(obj, member, refresh)
     end
     -- end
 
-
+    --上级id
-    obj:GetChild('tex_zongchangci').text = member.total_round
+    obj:GetChild('tex_zongchangci').text = member.parentId
+    obj:GetChild('tex_pername').text = member.parentId_nick or ""
     obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time)
 
     --上级

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua

@@ -367,7 +367,8 @@ function M:FillItem(obj, member, refresh, index)
     -- end
 
 
-    obj:GetChild('tex_zongchangci').text = member.total_round
+    obj:GetChild('tex_zongchangci').text = member.parentId
+    obj:GetChild('tex_pername').text = member.parentId_nick or ""
     obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time)
 
     --上级

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua

@@ -388,7 +388,8 @@ function M:FillItem(obj, member, refresh, index)
     -- end
 
 
-    obj:GetChild('tex_zongchangci').text = member.total_round
+    obj:GetChild('tex_zongchangci').text = member.parentId
+    obj:GetChild('tex_pername').text = member.parentId_nick or ""
     obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time)
 
     --上级

lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerBanPlaysView.lua

@@ -22,7 +22,6 @@ function M:initView(url)
     self.lst_allplays = self._view:GetChild("lst_allplays")
     self.lst_allplays:SetVirtual()
     self.lst_allplays.itemRenderer = function(index, obj)
-
     	self:OnRenderAllPlaysItem(index, obj)
     end
     self:GetBanPlaysData()
@@ -77,8 +76,6 @@ function M:OnRenderAllPlaysItem(index, obj)
             end
         end)
     end)
-    
-
 end
 
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua

@@ -95,9 +95,9 @@ MngPageConfig.Config = {
 	},
 
 	{
-		{ 20, 10, 21 },
+		{ 20,  21 },
-		{ 20, 10, 21 },
+		{ 20,  21 },
-		{ 20, 10, 21 },
+		{ 20,  21 },
 	},
 	--暂时弹出查看
 	{

lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua

@@ -730,6 +730,7 @@ function M:__FangziTip(tip, _uid, fptype)
     end
 
     if fpao and zdhu then
+        self:PlaySound(p.self_user.sex, 'F_DianPao')
         _gamectr:SendAction(tip_id)
         _chipeng_tip:Dispose()
         self._chipeng_tip = nil

wb_new_ui/.objs/metas/m7iejg46/avqi7ijp.info

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

wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info

@@ -6,6 +6,9 @@
     "n33_rpaz": {
       "hidden": true
     },
+    "n142_ufim": {
+      "hidden": true
+    },
     "n86_t1hq": {
       "hidden": true
     },

wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info

@@ -1,6 +1,6 @@
 {
   "objectStatus": {
-    "n57_ocx0": {
+    "n67_z384": {
       "hidden": true
     },
     "n78_iaes": {
@@ -15,8 +15,14 @@
     "n72_mtk5": {
       "hidden": true
     },
+    "n80_ufim": {
+      "hidden": true
+    },
     "n58_ocx0": {
       "hidden": true
+    },
+    "n57_ocx0": {
+      "hidden": true
     }
   }
 }

wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info

@@ -1,8 +1,5 @@
 {
   "objectStatus": {
-    "n36_k3io": {
-      "collapsed": true
-    },
     "n34_k3io": {
       "hidden": true
     },

wb_new_ui/.objs/workspace.json

@@ -1,61 +1,24 @@
 {
-  "libview.firstColumnWidth": 297,
+  "doc.openedDocs": [
-  "expanded_nodes": [
+    "ui://2zlli80mw9te0",
-    "27vd145b",
+    "ui://9n9stu2eprgzf0",
-    "/",
+    "ui://9n9stu2eprgzep"
-    "m7iejg46",
-    "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [
+  "doc.activeDoc": "ui://2zlli80mw9te0",
-    "ui://v6yvqp7wyfzf1h4",
-    "ui://v6yvqp7wcyprwq",
-<<<<<<< HEAD
-    "ui://ppu1wv7699we8b",
-    "ui://v6yvqp7wf55qwa",
-    "ui://v6yvqp7wfgao1dn",
-    "ui://v6yvqp7wvoqg1dy",
-=======
-    "ui://m7iejg46e5q7hu2",
->>>>>>> d72cae313154093171bc44630d103e84bf862c73
-    "ui://v6yvqp7wlvh412c"
-  ],
-  "test.device": "720p Phone",
-  "canvasColor": 10066329,
-  "auxline2": true,
-<<<<<<< HEAD
-  "doc.activeDoc": "ui://v6yvqp7wfgao1dn",
-=======
-  "doc.activeDoc": "ui://m7iejg46e5q7hu2",
->>>>>>> d72cae313154093171bc44630d103e84bf862c73
-  "libview.twoColumn": false,
-  "libview.expandedNodes": [
-    "m7iejg46",
-    "/",
-<<<<<<< HEAD
-    "v6yvqp7w",
-    "/images/",
-    "v6yvqp7w",
-    "/images/cards8/",
-    "v6yvqp7w",
-    "/images/clearing/"
-=======
-    "m7iejg46",
-    "/component/",
-    "m7iejg46",
-    "/component/Lst_info/",
-    "m7iejg46",
-    "/mgr/",
-    "m7iejg46",
-    "/mgr/component/"
->>>>>>> d72cae313154093171bc44630d103e84bf862c73
-  ],
-  "auxline1": true,
-  "snapToGrid": true,
-  "test.orientation": "landscape",
-  "backgroundColor": 6710886,
   "libview.currentGroup": "",
-  "hidden_packages": [],
+  "libview.expandedNodes": [
-  "gridSize": 30,
+    "9n9stu2e",
-  "gridColor": 80
+    "/",
+    "9n9stu2e",
+    "/component/",
+    "9n9stu2e",
+    "/component/Main/",
+    "9n9stu2e",
+    "/component/Main/component/",
+    "2zlli80m",
+    "/"
+  ],
+  "libview.firstColumnWidth": 297,
+  "libview.twoColumn": false
 }

wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml

@@ -2,14 +2,14 @@
 <component size="227,47" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n7_rpaz" name="n7" src="o9jnhy2" fileName="component/create_room/image/multiple_btn_n.png" xy="13,8">
+    <image id="n7_rpaz" name="n7" src="o9jnhy2" fileName="component/create_room/image/multiple_btn_n.png" xy="7,0" size="45,45" aspect="true">
       <gearDisplay controller="button" pages="0"/>
     </image>
     <text id="n9_rpaz" name="title" xy="59,0" size="212,45" font="Microsoft YaHei" fontSize="22" color="#aa3300" vAlign="middle" autoSize="shrink" text=""/>
-    <image id="n10_vyn3" name="n10" src="o9jnhy2" fileName="component/create_room/image/multiple_btn_n.png" xy="13,8">
+    <image id="n10_vyn3" name="n10" src="o9jnhy2" fileName="component/create_room/image/multiple_btn_n.png" xy="7,0" size="40,45" aspect="true">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n11_vyn3" name="n11" src="vyn37i5g" fileName="component/create_room/image/gou.png" xy="13,4">
+    <image id="n11_vyn3" name="n11" src="vyn37i5g" fileName="component/create_room/image/gou.png" xy="-1,-4" size="60,53">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

wb_new_ui/assets/Common/package.xml

@@ -1091,6 +1091,7 @@
     <component id="m16m7iji" name="Btn_mul_checkbox3.xml" path="/component/create_room/" exported="true"/>
     <image id="m16m7ijj" name="Rectangle 388.png" path="/component/create_room/image/"/>
     <image id="m16m7ijk" name="Vector.png" path="/component/create_room/image/"/>
+    <image id="avqi7ijl" name="games.png" path="/font/images/win/" exported="true"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/NewGroup/Main_GroupInfo.xml

@@ -262,5 +262,8 @@
       <gearDisplay controller="manager" pages="1,2,3"/>
       <relation target="" sidePair="right-right,top-top%"/>
     </image>
+    <component id="n271_avqi" name="goselectgames" src="avqi7ijt" fileName="component/Lst_info/getgames.xml" xy="1296,273">
+      <relation target="" sidePair="middle-middle,right-right"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/Win_SelectGames.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1196,700">
+  <displayList>
+    <image id="n10_avqi" name="n10" src="avqi7ijq" fileName="images/Group 691.png" xy="-5,2" size="1200,696"/>
+    <list id="n1_8h20" name="lst_allplays" xy="40,163" size="1105,497" group="n6_8h20" overflow="scroll" lineGap="7" defaultItem="ui://m7iejg46kwdo7i98" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n3_8h20" name="n3" xy="117,118" size="117,0" group="n5_8h20" font="Microsoft YaHei" fontSize="30" color="#aa3300" vAlign="middle" text="玩法名称"/>
+    <text id="n4_8h20" name="n4" xy="788,116" size="317,0" group="n5_8h20" font="Microsoft YaHei" fontSize="30" color="#aa3300" align="center" vAlign="middle" text="操作(勾选即为快速开始)"/>
+    <group id="n5_8h20" name="n5" xy="117,116" size="988,0" group="n6_8h20"/>
+    <image id="n2_8h20" name="n2" src="csp47i44" fileName="component/nav/sd.png" xy="20,108" size="1160,0" group="n6_8h20">
+      <relation target="" sidePair="width-width"/>
+    </image>
+    <group id="n6_8h20" name="index0" xy="20,108" size="1160,552" advanced="true"/>
+    <component id="n7_8h20" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1137,-29" controller="style,0"/>
+    <text id="n9_avqi" name="n9" xy="397,1" size="391,84" font="Microsoft YaHei" fontSize="60" color="#ffcc99" align="center" vAlign="middle" autoSize="none" text="设置玩法"/>
+  </displayList>
+</component>

wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml

@@ -14,15 +14,15 @@
     <text id="n16_l0s4" name="tex_name" xy="107,16" size="184,32" font="Microsoft YaHei" fontSize="20" color="#444444" autoSize="none" bold="true" autoClearText="true" text="我的点点滴滴">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n17_l0s4" name="tex_num" xy="574,2" size="98,90" font="Microsoft YaHei" fontSize="26" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" autoClearText="true" text="+12345999999999999">
+    <text id="n17_l0s4" name="tex_num" xy="414,5" size="98,90" font="Microsoft YaHei" fontSize="26" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" autoClearText="true" text="+12345999999999999">
       <gearColor controller="add" pages="0,1" values="#444444,#000000|#663300,#000000"/>
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n22_r96t" name="tex_reason" xy="683,2" size="198,90" font="Microsoft YaHei" fontSize="26" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="shrink" bold="true" autoClearText="true" text="[color=#8D1235]某某电[/color] 操作增加">
+    <text id="n22_r96t" name="tex_reason" xy="676,2" size="204,90" font="Microsoft YaHei" fontSize="26" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="shrink" bold="true" autoClearText="true" text="[color=#8D1235]某某电[/color] 操作增加">
       <gearDisplay controller="show_check" pages="0"/>
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n33_fk7k" name="tex_fag" xy="1039,0" size="125,93" font="Microsoft YaHei" fontSize="24" color="#444444" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="1234567890.00">
+    <text id="n33_fk7k" name="tex_fag" xy="1039,1" size="139,93" font="Microsoft YaHei" fontSize="24" color="#444444" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="1234567890.00">
       <relation target="" sidePair="center-center%"/>
     </text>
     <text id="n42_gltd" name="tex_time" xy="883,16" size="155,61" font="Microsoft YaHei" fontSize="24" color="#444444" align="center" vAlign="middle" leading="-5" autoSize="none" bold="true" autoClearText="true" text="2018-10-14&#xA;14:00">
@@ -52,11 +52,11 @@
     <text id="n50_m16m" name="tex_id" xy="107,49" size="184,34" font="Microsoft YaHei" fontSize="24" color="#444444" autoSize="none" bold="true" autoClearText="true" text="我的点点滴滴">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n52_hdkr" name="tex_roomID" xy="294,2" size="103,90" font="Microsoft YaHei" fontSize="28" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" autoClearText="true" text="123456">
+    <text id="n52_hdkr" name="tex_roomID" xy="294,3" size="103,90" font="Microsoft YaHei" fontSize="28" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" autoClearText="true" text="123456">
       <gearColor controller="add" pages="0,1" values="#444444,#000000|#663300,#000000"/>
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n53_hdkr" name="tex_playName" xy="414,2" size="144,90" font="Microsoft YaHei" fontSize="26" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" autoClearText="true" text="玩法0.1抽0.01">
+    <text id="n53_hdkr" name="tex_playName" xy="521,6" size="144,90" font="Microsoft YaHei" fontSize="26" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" autoClearText="true" text="玩法0.1抽0.01">
       <gearColor controller="add" pages="0,1" values="#444444,#000000|#663300,#000000"/>
       <relation target="" sidePair="center-center%"/>
     </text>

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

@@ -2,17 +2,18 @@
 <component size="200,92" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_csp4" name="n0" src="iaes7idl" fileName="images/index/Group 633.png" xy="-9,-2">
+    <image id="n0_csp4" name="n0" src="iaes7idl" fileName="images/index/Group 633.png" xy="-6,-6" size="213,101">
       <gearDisplay controller="button" pages="0,2"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_csp4" name="n1" src="iaes7idl" fileName="images/index/Group 633.png" xy="-6,-6" size="213,105">
+    <image id="n1_csp4" name="n1" src="iaes7idl" fileName="images/index/Group 633.png" xy="-6,-6" size="213,101">
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n2_n6w8" name="title" xy="44,58" size="69,26" font="Microsoft YaHei" fontSize="18" color="#ffffff" bold="true" autoClearText="true" text="1跑得快">
+    <text id="n2_n6w8" name="title" xy="47,57" size="69,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" bold="true" autoClearText="true" text="1跑得快">
       <relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
     </text>
+    <image id="n3_avqi" name="n3" src="avqi7ijr" fileName="component/Lst_info/快速开始.png" xy="57,7" size="136,36"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="43,204" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_avqi" name="n3" src="avqi7ijs" fileName="images/Group 414.png" xy="0,0"/>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml

@@ -21,22 +21,22 @@
     <image id="n115_csp4" name="n115" src="csp47i44" fileName="component/nav/sd.png" xy="29,11" size="1093,56" group="n89_t1hq">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n83_t1hq" name="n83" xy="22,16" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" text="玩家昵称">
+    <text id="n83_t1hq" name="n83" xy="22,16" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="玩家昵称">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n91_task" name="n91" xy="261,17" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" text="总场次">
+    <text id="n91_task" name="n91" xy="261,17" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" bold="true" text="上级信息">
       <relation target="" sidePair="center-center%"/>
     </text>
     <text id="n85_t1hq" name="n85" xy="411,21" size="164,42" group="n88_t1hq" visible="false" font="Microsoft YaHei" fontSize="24" color="#367256" align="center" autoSize="none" text="赛分">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n87_t1hq" name="n87" xy="484,16" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" text="入会时间">
+    <text id="n87_t1hq" name="n87" xy="484,16" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" bold="true" text="最后登录时间">
       <relation target="" sidePair="center-center%"/>
     </text>
     <text id="n86_t1hq" name="n86" xy="776,21" size="133,42" group="n88_t1hq" visible="false" font="Microsoft YaHei" fontSize="26" color="#367256" align="center" autoSize="none" text="状态">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n142_ufim" name="n142" xy="845,16" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" text="总线疲劳值">
+    <text id="n142_ufim" name="n142" xy="845,16" size="166,42" group="n88_t1hq" visible="false" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" text="总线疲劳值">
       <relation target="" sidePair="center-center%"/>
     </text>
     <group id="n88_t1hq" name="n88" xy="22,16" size="989,47" group="n89_t1hq" advanced="true"/>

wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml

@@ -30,7 +30,7 @@
     <text id="n152_sbng" name="n152" xy="612,202" size="128,51" group="n155_sbng" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="总场次">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n183_omkm" name="n183" xy="737,202" size="127,51" group="n155_sbng" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="有效场">
+    <text id="n183_omkm" name="n183" xy="737,202" size="127,51" group="n155_sbng" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="大赢家">
       <relation target="" sidePair="center-center%"/>
     </text>
     <text id="n154_sbng" name="n154" xy="905,202" size="122,51" group="n155_sbng" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="总赢分">

wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml

@@ -2,7 +2,7 @@
 <component size="1334,750">
   <controller name="manager" pages="0,,1," selected="0"/>
   <controller name="index" pages="0,,1," selected="0"/>
-  <controller name="top" pages="0,,1,,2,,3,,4," selected="4"/>
+  <controller name="top" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
     <image id="n95_xt5s" name="n95" src="xt5s7iit" fileName="images/jifen/Rectangle 424.png" xy="36,36">
       <relation target="" sidePair="width-width%,height-height%"/>
@@ -25,37 +25,37 @@
     <group id="n48_kkrh" name="n48" xy="59,123" size="271,175" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <image id="n87_vyn3" name="n87" src="csp47i44" fileName="component/nav/sd.png" xy="79,143" group="n34_gltd"/>
+    <image id="n87_vyn3" name="n87" src="csp47i44" fileName="component/nav/sd.png" xy="79,142" group="n34_gltd"/>
-    <text id="n29_gltd" name="n29" xy="152,145" size="80,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="玩家名">
+    <text id="n29_gltd" name="n29" xy="152,144" size="80,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="玩家名">
       <relation target="" sidePair=""/>
       <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <text id="n30_gltd" name="n30" xy="649,145" size="127,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="积分变化">
+    <text id="n30_gltd" name="n30" xy="483,143" size="127,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="积分变化">
       <relation target="" sidePair=""/>
       <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <text id="n31_gltd" name="n31" xy="740,145" size="244,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="原因">
+    <text id="n31_gltd" name="n31" xy="740,144" size="244,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="原因">
       <relation target="" sidePair=""/>
       <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <text id="n32_gltd" name="n32" xy="968,145" size="155,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="操作时间">
+    <text id="n32_gltd" name="n32" xy="968,144" size="155,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="操作时间">
       <relation target="" sidePair=""/>
       <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <text id="n33_gltd" name="n33" xy="1110,145" size="142,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="当前积分">
+    <text id="n33_gltd" name="n33" xy="1110,144" size="142,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="当前积分">
       <gearText controller="top" pages="3" values="保险箱积分" default="当前积分"/>
       <relation target="" sidePair=""/>
       <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <text id="n90_hdkr" name="n90" xy="501,145" size="127,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="游戏名称">
+    <text id="n90_hdkr" name="n90" xy="610,145" size="127,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="游戏名称">
       <relation target="" sidePair=""/>
       <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <text id="n91_hdkr" name="n91" xy="360,145" size="127,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="房间ID">
+    <text id="n91_hdkr" name="n91" xy="349,144" size="127,61" group="n34_gltd" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="房间ID">
       <relation target="" sidePair=""/>
       <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <group id="n34_gltd" name="n34" xy="79,143" size="1173,63" group="n45_kkrh" advanced="true">
+    <group id="n34_gltd" name="n34" xy="79,142" size="1173,64" group="n45_kkrh" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <list id="n4_l0s4" name="lst_fag" xy="70,212" size="1193,405" group="n45_kkrh" overflow="scroll" lineGap="18" colGap="43" defaultItem="ui://m7iejg46gltdhc9" autoClearItems="true">
@@ -118,7 +118,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <image id="n81_7b4q" name="n81" pkg="m7iejg46" src="7b4q7i20" fileName="images/main/img_xian.png" xy="327,655" size="945,28" group="n45_kkrh" visible="false"/>
-    <group id="n45_kkrh" name="index0" xy="67,143" size="1205,589" advanced="true">
+    <group id="n45_kkrh" name="index0" xy="67,142" size="1205,589" advanced="true">
       <gearDisplay controller="index" pages="0"/>
     </group>
     <image id="n49_kkrh" name="n49" src="ivzcchb" fileName="font/images/win/dbt.png" pkg="27vd145b" xy="322,137" size="1111,15" group="n55_kkrh" visible="false"/>
@@ -149,7 +149,7 @@
     </text>
     <image id="n82_et16" name="n82" pkg="m7iejg46" src="et167i3a" fileName="积分详情11_PxCook.png" xy="-216,0" pivot="0.5,0" visible="false" alpha="0.5"/>
     <component id="n105_xt5s" name="btn_all" src="xt5s7iix" fileName="images/jifen/btn_all.xml" xy="167,64" group="n103_xt5s">
-      <Button controller="top" page="0"/>
+      <Button checked="true" controller="top" page="0"/>
     </component>
     <component id="n106_xt5s" name="btn_filter1" src="xt5s7iiy" fileName="images/jifen/btn_filter1.xml" xy="367,64" group="n103_xt5s">
       <Button controller="top" page="1"/>
@@ -161,7 +161,7 @@
       <Button controller="top" page="3"/>
     </component>
     <component id="n109_xt5s" name="btn_filter64" src="xt5s7ij4" fileName="images/jifen/btn_filter64.xml" xy="967,64" group="n103_xt5s">
-      <Button checked="true" controller="top" page="4"/>
+      <Button controller="top" page="4"/>
     </component>
     <group id="n103_xt5s" name="newFillter" xy="167,64" size="1000,56" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>

wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml

@@ -30,16 +30,19 @@
     <text id="n17_kwi0" name="tex_id" xy="92,40" size="174,39" group="n46_rpaz" font="Microsoft YaHei" fontSize="24" color="#444444" vAlign="middle" autoSize="shrink" bold="true" text="100000">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n67_z384" name="tex_ruhui" xy="422,15" size="214,29" group="n46_rpaz" font="Microsoft YaHei" fontSize="20" color="#444444" align="center" vAlign="middle" bold="true" singleLine="true" autoClearText="true" text="2025-04-06  15:20:21">
+    <text id="n67_z384" name="tex_ruhui" xy="422,15" size="223,29" group="n46_rpaz" visible="false" font="Microsoft YaHei" fontSize="20" color="#444444" align="center" vAlign="middle" bold="true" singleLine="true" autoClearText="true" text="2025-04-06  15:20:21">
       <relation target="" sidePair="center-center%"/>
     </text>
     <component id="n72_mtk5" name="super_btn" src="mtk57i94" fileName="mgr/component/member/superior_btn.xml" xy="641,40" size="76,38" group="n46_rpaz" visible="false">
       <relation target="" sidePair="center-center%"/>
     </component>
-    <text id="n41_utix" name="tex_last_login" xy="441,44" size="196,29" group="n46_rpaz" font="Microsoft YaHei" fontSize="20" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="11时前&#xA;两行撒旦撒撒大大">
+    <text id="n41_utix" name="tex_last_login" xy="470,10" size="212,65" group="n46_rpaz" font="Microsoft YaHei" fontSize="30" color="#af4300" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="11时前&#xA;两行撒旦撒撒大大">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n68_z384" name="tex_zongchangci" xy="299,28" size="32,33" group="n46_rpaz" font="Microsoft YaHei" fontSize="23" color="#444444" align="center" vAlign="middle" bold="true" text="88">
+    <text id="n82_avqi" name="tex_pername" xy="306,47" size="115,39" group="n46_rpaz" font="Microsoft YaHei" fontSize="26" color="#af4300" align="center" vAlign="middle" autoSize="none" text="88">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n68_z384" name="tex_zongchangci" xy="306,4" size="115,39" group="n46_rpaz" font="Microsoft YaHei" fontSize="26" color="#af4300" align="center" vAlign="middle" autoSize="none" text="88">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <image id="n73_iaes" name="n73" src="ilon7ibh" fileName="mgr/imgs/numberHpAlone/Rectangle 371.png" xy="355,26" size="142,36" group="n77_iaes">
@@ -54,23 +57,23 @@
     <group id="n78_iaes" name="group_score" xy="318,26" size="215,36" group="n46_rpaz" visible="false" advanced="true"/>
     <text id="n57_ocx0" name="tex_shangjiName" xy="529,10" size="118,39" group="n46_rpaz" visible="false" font="Microsoft YaHei" fontSize="25" color="#845e3b" align="center" vAlign="middle" autoSize="none" text="昵称"/>
     <text id="n58_ocx0" name="tex_shangjiID" xy="529,42" size="122,39" group="n46_rpaz" visible="false" font="Microsoft YaHei" fontSize="25" color="#845e3b" align="center" vAlign="middle" autoSize="none" text="123456"/>
-    <group id="n46_rpaz" name="group_player" xy="8,3" size="709,78"/>
+    <group id="n46_rpaz" name="group_player" xy="8,3" size="709,83"/>
-    <component id="n49_tqi8" name="btn_operate" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="667,5" size="165,74" group="n51_t1hq">
+    <component id="n49_tqi8" name="btn_operate" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="760,5" size="165,74" group="n51_t1hq">
       <Button title="   " icon="ui://m7iejg46yscl7ic2"/>
     </component>
-    <component id="n69_z384" name="btn_score_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="819,1" size="142,82" group="n51_t1hq" visible="false">
+    <component id="n69_z384" name="btn_score_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="810,1" size="142,82" group="n51_t1hq" visible="false">
       <Button title="   " titleColor="#805133" titleFontSize="28" icon="ui://m7iejg46yscl7ic4"/>
     </component>
-    <component id="n70_k5m9" name="btn_bxx" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="980,14" size="116,75" group="n51_t1hq" scale="0.8,0.8">
+    <component id="n70_k5m9" name="btn_bxx" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="971,14" size="116,75" group="n51_t1hq" scale="0.8,0.8">
       <Button title="  " titleColor="#805133" titleFontSize="28" icon="ui://m7iejg46k5m97i78"/>
     </component>
-    <component id="n80_ufim" name="all_btn" src="imp57ihu" fileName="mgr/component/numberHpAlone/all_btn.xml" xy="850,5" group="n51_t1hq">
+    <component id="n80_ufim" name="all_btn" src="imp57ihu" fileName="mgr/component/numberHpAlone/all_btn.xml" xy="878,1" group="n51_t1hq" visible="false">
       <gearDisplay controller="all" pages="0"/>
     </component>
-    <text id="n81_ufim" name="tex_all" xy="825,24" size="163,36" group="n51_t1hq" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" autoClearText="true" text="1234567890">
+    <text id="n81_ufim" name="tex_all" xy="816,24" size="163,36" group="n51_t1hq" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" autoClearText="true" text="1234567890">
       <gearDisplay controller="all" pages="1"/>
     </text>
-    <group id="n51_t1hq" name="n51" xy="667,1" size="429,88" advanced="true">
+    <group id="n51_t1hq" name="n51" xy="760,1" size="327,88" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
   </displayList>

wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1100,72">
+<component size="1100,114">
   <controller name="promote" pages="0,,1," selected="0"/>
   <controller name="fandian" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n5_s98c" name="n5" src="vyn37i4y" fileName="component/nav/hengtiao3.png" xy="0,0" size="1100,72"/>
+    <image id="n5_s98c" name="n5" src="vyn37i4y" fileName="component/nav/hengtiao3.png" xy="0,0" size="1100,114"/>
-    <text id="n1_gls1" name="tex_name" xy="27,0" size="249,68" font="Microsoft YaHei" fontSize="20" color="#495f55" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="一毛转转麻将"/>
+    <text id="n1_gls1" name="tex_name" xy="17,19" size="249,71" font="Microsoft YaHei" fontSize="34" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="一毛转转麻将"/>
-    <component id="n13_kwdo" name="gxbtn" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="907,13" size="110,47"/>
+    <component id="n13_kwdo" name="gxbtn" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="940,29" size="62,49"/>
+    <text id="n14_avqi" name="tex_display" xy="285,9" size="622,93" fontSize="24" color="#444444" vAlign="middle" autoSize="none" text=""/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/package.xml

@@ -1154,6 +1154,11 @@
     <component id="yvb27ik1" name="Btn_menu_h2.xml" path="/component/nav/" exported="true"/>
     <image id="yvb27ik2" name="房.png" path="/font/"/>
     <image id="yvb27ik3" name="间.png" path="/font/"/>
+    <component id="avqi7ijp" name="Win_SelectGames.xml" path="/" exported="true"/>
+    <image id="avqi7ijq" name="Group 691.png" path="/images/"/>
+    <image id="avqi7ijr" name="快速开始.png" path="/component/Lst_info/"/>
+    <image id="avqi7ijs" name="Group 414.png" path="/images/"/>
+    <component id="avqi7ijt" name="getgames.xml" path="/component/Lst_info/"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>