726

lua_probject/base_project/Game/View/LoginView.lua

@@ -41,7 +41,7 @@ function M:init()
     local _btn_login = view:GetChild("btn_wx")
 
     _btn_login.onClick:Add(function()
-        ViewUtil.ShowModalWait(true, "正在登录游戏...")
+        ViewUtil.ShowModalWait(true, "正在登录游戏...", 2)
         coroutine.start(function()
             coroutine.wait(8)
             if self.isWXCallBackMark then
@@ -149,7 +149,7 @@ local function __login_response(self, response)
             local roomid = user.room_id
             if (string.len(roomid) > 1) then
                 if user.group_id == 0 then
-                    ViewUtil.ShowModalWait(true, "正在加入房间...")
+                    ViewUtil.ShowModalWait(true, "正在加入房间...", 2)
                     __join_room(roomid, response)
                     return
                 end
@@ -198,7 +198,7 @@ function M:QuickLogin()
         local session_id = PlayerPrefs.GetString("session_id")
         print("session_id:" .. session_id)
         if session_id and string.len(session_id) > 3 then
-            ViewUtil.ShowModalWait(true, "正在登录游戏...")
+            ViewUtil.ShowModalWait(true, "正在登录游戏...", 2)
             local loginCtr = ControllerManager.GetController(LoginController)
             loginCtr:QuickLogin(session_id, function(response)
                 __login_response(self, response)
@@ -214,7 +214,7 @@ function M:LoginCallBack(result, data)
     --pt(data)
     if (not result) or result ~= 0 then
         if result == 10 then
-            ViewUtil.ShowModalWait(true)
+            ViewUtil.ShowModalWait(true, nil, 2)
             return
         end
         ViewUtil.CloseModalWait()

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

@@ -4,105 +4,120 @@ local GroupFastGamesView = {}
 
 local M = GroupFastGamesView
 
-function GroupFastGamesView.new(gid, blur_view, playIdList, uid)
-	setmetatable(M, { __index = BaseWindow })
-	local self = setmetatable({}, { __index = M })
+function GroupFastGamesView.new(gid, blur_view, playIdList)
+    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
+    self.class = "GroupFastGamesView"
+    self._close_destroy = true
+    self.group_id = gid
+    self.blur_view = blur_view
+    self.playIdList = playIdList
+    self.allplays_data = {}
+    self.uid = DataManager.SelfUser.account_id
+    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)
+    --lst_allplays
+    self.showid = Utils.LoadLocalFile("selectplay" .. self.uid)
 
-	self.lst_allplays = self._view:GetChild("lst_allplays")
+    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)
+        self:OnRenderAllPlaysItem(index, obj, self.showid)
     end
-	self:GetFlagPlaysData(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
-     
+    local allplays = self.playIdList
+    self.allplays_data = allplays
+    table.sort(self.allplays_data, handler(self, self.SortPlayList))
+    -- 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 = {}
+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
+    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
+    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 = 
+    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()
-	
+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()
+    if self.callback then
+        self.callback()
+    end
+    self:Destroy()
 end
 
 function M:SetCallback(callback)
-	self.callback = callback
+    self.callback = callback
+end
+
+function M:SortPlayList(a, b)
+    local a_play = a
+    local b_play = b
+
+    if a_play.gameType == b_play.gameType then
+        if a_play.gameId == a_play.gameId then
+            return a_play.id < b_play.id
+        else
+            return a_play.gameId < b_play.gameId
+        end
+    else
+        return a_play.gameType < b_play.gameType
+    end
 end
 
 -- 销毁窗口
 function M:Destroy(remove_map)
-	if self.callback then
-		self.callback()
-	end
-	BaseWindow.Destroy(self, remove_map)
-	ImageLoad.Clear(self.class)
+    -- 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

@@ -292,18 +292,73 @@ local function __fillRoomItem(self, index, item, room)
                 if self.roominfo.view and not self.roominfo.view.isDisposed then
                     self.roominfo.view:Dispose()
                 end
-                local riv = UIPackage.CreateObjectFromURL('ui://NewGroup/Win_roomInfo')
-                self.roominfo.view = riv
-                self.roominfo.room = room
-                riv:GetChild('tex_room_id').text = room.id and '房间号:' .. room.id or ''
-                local play = self.curGroup:getPlay(room.pid)
-                riv:GetChild('tex_room_name').text = play.game_name
-                riv:GetController("mengzhu").selectedIndex = 1
-                printlog("tex_room_name:")
                 if self.curGroup.lev == 1 then
-                    riv:GetController("mengzhu").selectedIndex = 0
-                    local jiesannum = riv:GetChild("jiesan_input")
-                    riv:GetChild("btn_jiesan").onClick:Set(
+                    local riv = UIPackage.CreateObjectFromURL('ui://NewGroup/Win_roomInfo')
+                    self.roominfo.view = riv
+                    self.roominfo.room = room
+                    riv:GetChild('tex_room_id').text = room.id and '房间号:' .. room.id or ''
+                    local play = self.curGroup:getPlay(room.pid)
+                    riv:GetChild('tex_room_name').text = play.game_name
+                    riv:GetController("mengzhu").selectedIndex = 1
+                    printlog("tex_room_name:")
+                    if self.curGroup.lev == 1 then
+                        riv:GetController("mengzhu").selectedIndex = 0
+                        local jiesannum = riv:GetChild("jiesan_input")
+                        riv:GetChild("btn_jiesan").onClick:Set(
+                            function()
+                                local _curren_msg =
+                                    MsgWindow.new(
+                                        self._root_view,
+                                        '确定解散该桌子吗？\r(解散该桌子没有任何结算信息，请谨慎操作)',
+                                        MsgWindow.MsgMode.OkAndCancel
+                                    )
+                                _curren_msg.onOk:Add(
+                                    function()
+                                        ViewUtil.ShowModalWait(self._root_view)
+                                        local fgCtr = ControllerManager.GetController(NewGroupController)
+                                        local roomid = jiesannum.text
+                                        fgCtr:FG_RemoveRoom(
+                                            self.curGroup.id,
+                                            roomid,
+                                            function(res)
+                                                if self._is_destroy then
+                                                    return
+                                                end
+                                                ViewUtil.CloseModalWait()
+                                                if res.ReturnCode ~= 0 then
+                                                    ViewUtil.ErrorTip(res.ReturnCode, '删除房间失败！')
+                                                    return
+                                                else
+                                                    riv:Dispose()
+                                                end
+                                            end
+                                        )
+                                    end
+                                )
+                                _curren_msg:Show()
+                            end
+                        )
+                    end
+                    local exconfig = ExtendManager.GetExtendConfig(play.gameId)
+                    local data = json.decode(play.config)
+                    local r = {}
+                    exconfig:FillRoomConfig(r, data)
+                    local gameStr = ""
+                    gameStr = "[" .. play.name .. "]" .. string.gsub(r.room_config:GetDes(), "\r", "")
+                    riv:GetChild("wafashuoming").text = gameStr
+
+                    self:InitRoomInfoView()
+                    riv:GetChild('btn_enter').onClick:Set(
+                        function()
+                            riv:Dispose()
+                            if room.default or isHidden == 1 then
+                                self:__startGame(room.id, room.pid, false, isHidden)
+                            else
+                                self:__joinRoom(roomid, room)
+                            end
+                        end
+                    )
+                    riv:GetChild('btn_del').onClick:Set(
                         function()
                             local _curren_msg =
                                 MsgWindow.new(
@@ -315,7 +370,7 @@ local function __fillRoomItem(self, index, item, room)
                                 function()
                                     ViewUtil.ShowModalWait(self._root_view)
                                     local fgCtr = ControllerManager.GetController(NewGroupController)
-                                    local roomid = jiesannum.text
+
                                     fgCtr:FG_RemoveRoom(
                                         self.curGroup.id,
                                         roomid,
@@ -337,67 +392,20 @@ local function __fillRoomItem(self, index, item, room)
                             _curren_msg:Show()
                         end
                     )
-                end
-                local exconfig = ExtendManager.GetExtendConfig(play.gameId)
-                local data = json.decode(play.config)
-                local r = {}
-                exconfig:FillRoomConfig(r, data)
-                local gameStr = ""
-                gameStr = "[" .. play.name .. "]" .. string.gsub(r.room_config:GetDes(), "\r", "")
-                riv:GetChild("wafashuoming").text = gameStr
-
-                self:InitRoomInfoView()
-                riv:GetChild('btn_enter').onClick:Set(
-                    function()
-                        riv:Dispose()
-                        if room.default or isHidden == 1 then
-                            self:__startGame(room.id, room.pid, false, isHidden)
-                        else
-                            self:__joinRoom(roomid, room)
+                    riv:GetChild('btn_close').onClick:Set(
+                        function()
+                            riv:Dispose()
                         end
+                    )
+                    self._view:AddChild(riv)
+                    riv:Center()
+                else
+                    if room.default or isHidden == 1 then
+                        self:__startGame(room.id, room.pid, false, isHidden)
+                    else
+                        self:__joinRoom(roomid, room)
                     end
-                )
-                riv:GetChild('btn_del').onClick:Set(
-                    function()
-                        local _curren_msg =
-                            MsgWindow.new(
-                                self._root_view,
-                                '确定解散该桌子吗？\r(解散该桌子没有任何结算信息，请谨慎操作)',
-                                MsgWindow.MsgMode.OkAndCancel
-                            )
-                        _curren_msg.onOk:Add(
-                            function()
-                                ViewUtil.ShowModalWait(self._root_view)
-                                local fgCtr = ControllerManager.GetController(NewGroupController)
-
-                                fgCtr:FG_RemoveRoom(
-                                    self.curGroup.id,
-                                    roomid,
-                                    function(res)
-                                        if self._is_destroy then
-                                            return
-                                        end
-                                        ViewUtil.CloseModalWait()
-                                        if res.ReturnCode ~= 0 then
-                                            ViewUtil.ErrorTip(res.ReturnCode, '删除房间失败！')
-                                            return
-                                        else
-                                            riv:Dispose()
-                                        end
-                                    end
-                                )
-                            end
-                        )
-                        _curren_msg:Show()
-                    end
-                )
-                riv:GetChild('btn_close').onClick:Set(
-                    function()
-                        riv:Dispose()
-                    end
-                )
-                self._view:AddChild(riv)
-                riv:Center()
+                end
             end
 
 
@@ -653,7 +661,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
@@ -750,14 +758,13 @@ local function __fillPlayItem(self, index, item)
     if (index == 0) then
         -- tex_gameName.text = __getLayerName(self, 0)
         item:GetController('all').selectedIndex = 1
-        
+        item.data = ""
     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
@@ -858,7 +865,6 @@ 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)
@@ -1104,7 +1110,6 @@ 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
@@ -1135,9 +1140,22 @@ function M:InitView(url)
 
     self.lst_layer.onClickItem:Add(
         function(context)
-            
-            self._view:GetChild('btn_start2').text = context.data.data
-            self:__loadPlayData()
+            if context.data.data == "" then
+                --如果点击了全部游戏，如果有本地配置则显示本地配置，否则显示全部开始
+                local showid2 = Utils.LoadLocalFile("selectplay" .. DataManager.SelfUser.account_id)
+                if showid2 == nil or showid2 == "" then
+                    self._view:GetChild('btn_start2'):GetController('isChoose').selectedIndex = 1
+                    self._view:GetChild('btn_start2').text = context.data.data
+                else
+                    local gamename = Utils.LoadLocalFile("selectplayname" .. DataManager.SelfUser.account_id)
+                    self._view:GetChild('btn_start2').text = gamename
+                end
+            else
+                --如果点击了玩法则显示快速开始
+                self._view:GetChild('btn_start2'):GetController('isChoose').selectedIndex = 0
+                self._view:GetChild('btn_start2').text = context.data.data
+                self:__loadPlayData()
+            end
         end
     )
 
@@ -1145,11 +1163,8 @@ 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
     )
 
@@ -1193,69 +1208,92 @@ function M:InitView(url)
     goselectgames.onClick:Set(
         function()
             local gfg = GroupFastGamesView.new(self.curGroup.id, self._root_view, self.curGroup.playList,
-                            DataManager.SelfUser.account_id)
+                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)
 
-                    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
     btn_start2.onClick:Set(
         function()
-            local currentPlayID = self:GetSelectedPlayID()
-            if currentPlayID == 0 then
-                local showid2 = Utils.LoadLocalFile("selectplay"..DataManager.SelfUser.account_id)
+            if btn_start2:GetController('isChoose').selectedIndex == 1 then
+                local gfg = GroupFastGamesView.new(self.curGroup.id, self._root_view, self.curGroup.playList,
+                    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
+                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()
+            else
+                local currentPlayID = self:GetSelectedPlayID()
+                if currentPlayID == 0 then
+                    local showid2 = Utils.LoadLocalFile("selectplay" .. DataManager.SelfUser.account_id)
 
-                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, '没有选择玩法1')
+                    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
-                    local p_data = self.curGroup:getPlay(pid)
-                    local currentGameID = self:GetSelectedGameID()
-                    if currentGameID == p_data.gameId then
-                        currentPlayID = pid
+
+                    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, '没有选择玩法1')
+                            return
+                        end
+                        local p_data = self.curGroup:getPlay(pid)
+                        local currentGameID = self:GetSelectedGameID()
+                        if currentGameID == p_data.gameId then
+                            currentPlayID = pid
+                        end
+                    end
+                    if currentPlayID == 0 then
+                        local gfg = GroupFastGamesView.new(self.curGroup.id, self._root_view, self.curGroup.playList,
+                            self.playIdList)
+
+                        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
-                if currentPlayID == 0 then
 
-                    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
+                self:__startGame("", currentPlayID, false)
             end
-
-            self:__startGame("", currentPlayID, false)
         end
     )
+    --lingmeng 开始前读取本地日志，如果没有则显示选择玩法，如果有则显示在下方小字上
+    local showid2 = Utils.LoadLocalFile("selectplay" .. DataManager.SelfUser.account_id)
+    if showid2 == nil or showid2 == "" then
+        btn_start2:GetController('isChoose').selectedIndex = 1
+    else
+        local gamename = Utils.LoadLocalFile("selectplayname" .. DataManager.SelfUser.account_id)
+        self._view:GetChild('btn_start2').text = gamename
+    end
 
     -- 选择玩法按钮
     local btn_choose = self._view:GetChild('btn_choose')
@@ -1540,39 +1578,32 @@ function M:__joinRoom2(room_id)
             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)
+            if response.ReturnCode == -2 then
+                self:__joinRoom2(room_id)
+                return
+            elseif response.ReturnCode ~= 0 then
                 ViewUtil.CloseModalWait('join_room')
-                timer = 0
-                end,
-                self.curGroup.id
+                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)
-   
-    
+function M:__joinRoom(room_id, room)
     if self.roominfo.view and not self.roominfo.view.isDisposed then
         self.roominfo.view:Dispose()
     end
-    local riv = UIPackage.CreateObjectFromURL('ui://NewGroup/Win_roomInfo')
-    self.roominfo.view = riv
-    self.roominfo.room = room
 
-    riv:GetChild('tex_room_id').text = room_id and '房间号:' .. room_id or ''
     local play = self.curGroup:getPlay(room.pid)
     local isHidden = 0
     if play then
@@ -1586,115 +1617,203 @@ function M:__joinRoom(room_id,room)
         end
         play.isHidden = isHidden
     end
-    riv:GetChild('tex_room_name').text = play.game_name
-    riv:GetController("mengzhu").selectedIndex = 1
-    printlog("tex_room_name:")
-    riv:GetController("mengzhu").selectedIndex = 1
-    local exconfig = ExtendManager.GetExtendConfig(play.gameId)
-    local data = json.decode(play.config)
-    local r = {}
-    exconfig:FillRoomConfig(r, data)
-    local gameStr = ""
-    gameStr = "[" .. play.name .. "]" .. string.gsub(r.room_config:GetDes(), "\r", "")
-    riv:GetChild("wafashuoming").text = gameStr
-
-    self:InitRoomInfoView()
 
     local roomCtr = ControllerManager.GetController(RoomController)
     local _gameCtrl = ControllerManager.GetController(GameController)
     local _currentCtrl = ControllerManager.GetCurrenController()
+    if self.curGroup.lev == 1 then
+        local riv = UIPackage.CreateObjectFromURL('ui://NewGroup/Win_roomInfo')
+        self.roominfo.view = riv
+        self.roominfo.room = room
 
-    riv:GetChild('btn_enter').onClick:Set(
-        function()
-            riv:Dispose()
-            if room.default or isHidden == 1 then
-                self:__startGame(room.id, room.pid, false, isHidden)
-            else
-                -- self:__joinRoom(room_id,room)
-                printlog("join_room")
+        riv:GetChild('tex_room_id').text = room_id and '房间号:' .. room_id or ''
 
-                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
+        riv:GetChild('tex_room_name').text = play.game_name
+        riv:GetController("mengzhu").selectedIndex = 1
+        printlog("tex_room_name:")
+        riv:GetController("mengzhu").selectedIndex = 1
+        local exconfig = ExtendManager.GetExtendConfig(play.gameId)
+        local data = json.decode(play.config)
+        local r = {}
+        exconfig:FillRoomConfig(r, data)
+        local gameStr = ""
+        gameStr = "[" .. play.name .. "]" .. string.gsub(r.room_config:GetDes(), "\r", "")
+        riv:GetChild("wafashuoming").text = gameStr
+
+        self:InitRoomInfoView()
+
+        riv:GetChild('btn_enter').onClick:Set(
+            function()
+                riv:Dispose()
+                if room.default or isHidden == 1 then
+                    self:__startGame(room.id, room.pid, false, isHidden)
+                else
+                    -- self:__joinRoom(room_id,room)
+                    printlog("join_room")
+
+                    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:__joinRoom(room_id, room)
+                                                return
+                                            elseif response.ReturnCode ~= 0 then
+                                                ViewUtil.CloseModalWait('join_room')
+                                                ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
+                                                return
+                                            end
+                                            self.__join_room = true
+                                            self._view.visible = false
+                                            ImageLoad.Clear(self.class)
+                                            ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
                                             ViewUtil.CloseModalWait('join_room')
-                                            RestartGame()
-                                            return
-                                        end
+                                            timer = 0
+                                        end,
+                                        self.curGroup.id
+                                    )
+                                end
+                            )
+                            return
+                        end
+                    end
 
-                                        if response.ReturnCode == -2 then
-                                            self:__joinRoom(room_id, room)
-                                            return
-                                        elseif response.ReturnCode ~= 0 then
-                                            ViewUtil.CloseModalWait('join_room')
-                                            ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
-                                            return
-                                        end
-                                        self.__join_room = true
-                                        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
-                                )
+                    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:__joinRoom(room_id, room)
+                                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
+            end
+        )
+
+        riv:GetChild('btn_close').onClick:Set(
+            function()
+                riv:Dispose()
+            end
+        )
+        self._view:AddChild(riv)
+        riv:Center()
+    else
+        if room.default or isHidden == 1 then
+            self:__startGame(room.id, room.pid, false, isHidden)
+        else
+            -- self:__joinRoom(room_id,room)
+            printlog("join_room")
+
+            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:__joinRoom(room_id, room)
+                                        return
+                                    elseif response.ReturnCode ~= 0 then
+                                        ViewUtil.CloseModalWait('join_room')
+                                        ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
+                                        return
+                                    end
+                                    self.__join_room = true
+                                    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
-                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:__joinRoom(room_id, room)
-                            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)
+                    if response.ReturnCode == -2 then
+                        self:__joinRoom(room_id, room)
+                        return
+                    elseif response.ReturnCode ~= 0 then
                         ViewUtil.CloseModalWait('join_room')
-                        timer = 0
-                    end,
-                    self.curGroup.id
-                )
-            end
+                        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
-    )
+    end
 
-    riv:GetChild('btn_close').onClick:Set(
-        function()
-            riv:Dispose()
-        end
-    )
-    self._view:AddChild(riv)
-    riv:Center()
     --[[
     ViewUtil.ShowModalWait(self._root_view, '正在加入游戏...', 'join_room')
     local roomCtr = ControllerManager.GetController(RoomController)
@@ -1953,7 +2072,7 @@ function M:_evtInvited(...)
             self.curGroup.id,
             function(roomid)
                 printlog("Into game")
-                self:__joinRoom(roomid,self.roominfo.room)
+                self:__joinRoom(roomid, self.roominfo.room)
             end
         )
     imv:FillData(data)
@@ -2321,7 +2440,6 @@ function M:__refreshPay()
     local currentGameID = self:GetSelectedGameID()
 
     if currentPlayID > 0 then
-       
         --self._view:GetChild("tex_name").text = __getLayerName(self,currentPlayID)
         ctr_all.selectedIndex = 0
     else

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

@@ -109,6 +109,10 @@ function M:InitView(url)
     local lst_group = self._view:GetChild('lst_group')
     lst_group.onClickItem:Add(function(context)
         local curGroup = context.data.data
+        --点击进入亲友圈的时候清空亲友圈快捷玩法
+        print("lingmeng selectplay", string.format("selectplay%d", DataManager.SelfUser.account_id))
+        Utils.SaveLocalFile(string.format("selectplay%d", DataManager.SelfUser.account_id), "")
+        Utils.SaveLocalFile(string.format("selectplayname%d", DataManager.SelfUser.account_id), "")
         local info = GroupInfoView.new(curGroup, self.fg_info)
         self._groupInfoView = info
         info:SetCallBack(function()

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

@@ -31,11 +31,10 @@ function M:InitInfo()
         { uid = DataManager.SelfUser.account_id, nick = DataManager.SelfUser.nick_name }, obj)
     -- obj:GetController('show').selectedIndex = 1
     obj.data.selected = true
-    ViewUtil.ShowModalWait("正在获取成员中")
+    ViewUtil.ShowModalWait(true, "正在获取成员中", 0.01)
     self:RecursionGetNumber1(0, DataManager.SelfUser.account_id, {})
     --将外面设置为最外圈页面
     self.ctr_index.selectedIndex = #self.page_config
-    obj:GetController('arrow').selectedIndex = 1
     self._data_selectedData = obj
 end
 
@@ -48,68 +47,98 @@ function M:SetRecursionGetNumber1Info(id, tempTable)
         local obj = me.data.list:AddItemFromPool()
         self:PartnerRender(tempTable[i], obj)
     end
-    self:SetListShow(tempTable, 1)
     self:RecursionReSize(me)
-    self._viewList_partner.scrollPane:SetPosY(self.lastY and self.lastY - me.data.list.height or 0, true)
+    self:RecursionSetScrollPannel(me, 0)
 end
 
 function M:PartnerRender(data, obj)
-    obj:GetChild('text_name').text = string.format("ID:%d", data.uid)
+    obj:GetChild('text_name').text = string.format("%d", data.uid)
     obj:GetChild('text_id').text = data.nick
+    obj:GetChild('text_lev').text = data.partnerLev and data.partnerLev + 1 or 1
+    obj:GetController('show').selectedIndex = data.partnerLev and 1 or 0
+    obj:GetController('isLine').selectedIndex = 1
     obj.data = {}
     obj.data.list = obj:GetChild('list')
     obj.data.info = data
     self._map_members[data.uid] = obj
     obj:GetChild('area').onClick:Set(function()
-        self.lastY = self._viewList_partner.scrollPane.posY
-        self._data_selectedData:GetController('arrow').selectedIndex = 0
-        obj:GetController('arrow').selectedIndex = 1
-        self._data_selectedData = obj
-        if obj.data.info.parentId then
-            self:SetListShow(self._map_members[obj.data.info.parentId].data.listInfo, 0, data.uid)
-        end
-        if obj.data.selected then
-            self:SetListShow(obj.data.listInfo, 0, data.uid)
-            obj.data.selected = false
-            self:RecursionReSize(obj, -1, true)
-            self:SetListShow(obj.data.listInfo, 1)
+        if obj.data.info.uid == DataManager.SelfUser.account_id then
+            if obj.data.info.uid ~= self._data_selectedData.data.info.uid then
+                self:RecursionReSize(self._data_selectedData, -1, true, obj.data.info.uid)
+            end
         else
-            obj.data.selected = true
-            self._data_choosePlayer = data
-            if obj.data.listNum then
-                self:RecursionReSize(obj)
-            else
-                ViewUtil.ShowModalWait("正在获取成员中")
-                self:RecursionGetNumber1(0, data.uid, {})
+            if obj.data.info.parentId and obj.data.info.parentId ~= 0 then
+                if obj.data.info.parentId ~= self._data_selectedData.data.info.uid then
+                    self:RecursionReSize(self._data_selectedData, -1, true, obj.data.info.parentId)
+                end
+                local father = self._map_members[obj.data.info.parentId]
+                for i = 1, father.data.listNum do
+                    father.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 0
+                end
+                obj:GetController('isLine').selectedIndex = 1
             end
         end
-        -- obj:GetController('show').selectedIndex = 1
+
+        -- if obj.data.selected then
+        --     self:RecursionReSize(self._data_selectedData, -1, true, obj.data.info.uid)
+        --     self:RecursionSetScrollPannel(obj, 0)
+        -- else
+        self._data_choosePlayer = data
+        if obj.data.listNum then
+            self:RecursionReSize(obj)
+            self:RecursionSetScrollPannel(obj, 0)
+        else
+            ViewUtil.ShowModalWait(true, "正在获取成员中", 0.01)
+            self:RecursionGetNumber1(0, data.uid, {})
+        end
+        -- end
         if self.ctr_index.selectedIndex == #self.page_config then
             self._view_map[#self.page_config + 1]:RefrenRecordData(data)
         else
             self.ctr_index.selectedIndex = #self.page_config
         end
-        self._ctr_tongji.selectedIndex = 1
+        obj.data.selected = true
+        self._data_selectedData = obj
+        -- self._ctr_tongji.selectedIndex = 1
     end)
 end
 
-function M:RecursionReSize(obj, add, flag)
+function M:RecursionReSize(obj, add, flag, tagFather)
+    --如果把小箭头取消选择状态
+    if not add then
+        for i = 1, obj.data.listNum do
+            obj.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 1
+        end
+    elseif add == -1 then
+        obj.data.selected = false
+        for i = 1, obj.data.listNum do
+            obj.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 0
+        end
+    elseif add == 0 then
+        for i = 1, obj.data.listNum do
+            obj.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 0
+        end
+    end
+    --递归把列表缩回
     obj.data.list:ResizeToFit(flag and 0 or obj.data.childNum)
     if obj.data.info.parentId and obj.data.info.parentId ~= 0 then
+        if tagFather and obj.data.info.parentId == tagFather then
+            return
+        end
         local father = self._map_members[obj.data.info.parentId]
         father.data.childNum = father.data.childNum + obj.data.childNum * (add or 1)
-        self:RecursionReSize(father, add, false)
+        father:GetController('isLine').selectedIndex = 1
+        self:RecursionReSize(father, add or 1, flag, tagFather)
     end
 end
 
-function M:SetListShow(list, isShow, myID)
-    for i = 1, #list do
-        local obj = self._map_members[list[i].uid]
-        obj:GetController('show').selectedIndex = isShow
-        if isShow == 0 and obj.data.selected and list[i].uid ~= myID then
-            obj.data.selected = false
-            self:RecursionReSize(obj, -1, true)
-        end
+function M:RecursionSetScrollPannel(obj, scrollIndex)
+    if obj.data.info.parentId and obj.data.info.parentId ~= 0 then
+        local father = self._map_members[obj.data.info.parentId]
+        self:RecursionSetScrollPannel(father, scrollIndex + father.data.list:GetChildIndex(obj) + 1)
+    else
+        print("lingmeng RecursionSetScrollPannel", scrollIndex, self._viewList_partner.scrollPane.posY, scrollIndex * 85)
+        self._viewList_partner.scrollPane:SetPosY(scrollIndex * 85, true)
     end
 end
 

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -42,12 +42,12 @@ end
 
 local modal_wait_win = nil
 -- local modal_wait_win_url = "ui://Common/GlobalModalWaiting"
-function ViewUtil.ShowModalWait(blur_view, title)
+function ViewUtil.ShowModalWait(blur_view, title, time)
     local flag = type(blur_view) == "boolean"
     ViewUtil.CloseModalWait()
     ViewUtil.continue = coroutine.start(
         function()
-            coroutine.wait(flag and 0.01 or 0.8)
+            coroutine.wait(flag and time or 0.8)
             ModalWaitingWindow.ShowModal(title)
         end
     )

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

@@ -15,9 +15,6 @@
     "n241_n6w8": {
       "hidden": true
     },
-    "n74_i7lq": {
-      "locked": true
-    },
     "n243_n6w8": {
       "hidden": true
     },
@@ -42,6 +39,9 @@
     },
     "n171_mpll": {
       "hidden": true
+    },
+    "n271_avqi": {
+      "hidden": true
     }
   },
   "adaptiveTest": true,

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

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

wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info

@@ -1,10 +1,13 @@
 {
   "objectStatus": {
-    "n87_csp4": {
+    "n93_t8gf": {
       "hidden": true
     },
     "n79_ovii": {
       "hidden": true
+    },
+    "n87_csp4": {
+      "hidden": true
     }
   },
   "adaptiveTest": true,

wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info

@@ -1,5 +1,8 @@
 {
   "objectStatus": {
+    "n229_yvb2": {
+      "hidden": true
+    },
     "n213_yvb2": {
       "hidden": true
     },

wb_new_ui/.objs/metas/m7iejg46/kwdo7i98.info

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

wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info

@@ -1,5 +1,11 @@
 {
   "objectStatus": {
+    "n118_fcju": {
+      "hidden": true
+    },
+    "n104_kwi0": {
+      "collapsed": true
+    },
     "n115_dfkc": {
       "hidden": true
     },

wb_new_ui/.objs/metas/m7iejg46/l679hwn.info

@@ -2,6 +2,9 @@
   "objectStatus": {
     "n98_k5m9": {
       "hidden": true
+    },
+    "n100_m16m": {
+      "hidden": true
     }
   },
   "adaptiveTest": true,

wb_new_ui/.objs/metas/m7iejg46/l679hws.info

@@ -3,15 +3,15 @@
     "n86_kwi0": {
       "hidden": true
     },
+    "n142_m16m": {
+      "hidden": true
+    },
     "n115_l679": {
       "hidden": true
     },
     "n121_l679": {
       "collapsed": true
     },
-    "n112_kwi0": {
-      "collapsed": true
-    },
     "n122_j120": {
       "hidden": true
     }

wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info

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

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

@@ -3,6 +3,9 @@
     "n69_jd7v": {
       "hidden": true
     },
+    "n46_tqi8": {
+      "locked": true
+    },
     "n142_ufim": {
       "hidden": true
     },
@@ -15,6 +18,9 @@
     "n33_rpaz": {
       "hidden": true
     },
+    "n134_yscl": {
+      "hidden": true
+    },
     "n35_rpaz": {
       "hidden": true
     }

wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info

@@ -3,7 +3,7 @@
     "n130_yre9": {
       "hidden": true
     },
-    "n79_nk4v": {
+    "n136_iaes": {
       "hidden": true
     },
     "n13_gls1": {
@@ -17,6 +17,9 @@
     },
     "n20_gls1": {
       "hidden": true
+    },
+    "n79_nk4v": {
+      "hidden": true
     }
   }
 }

wb_new_ui/.objs/workspace.json

@@ -1,51 +1,27 @@
 {
-  "libview.firstColumnWidth": 297,
+  "libview.firstColumnWidth": 522,
   "libview.iconScale": 0,
   "doc.openedDocs": [
     "ui://m7iejg46hsbhhjn",
-    "ui://m7iejg46c0or7i7d",
-    "ui://m7iejg46nwgkhx2",
-    "ui://m7iejg46nwgkhx0",
-    "ui://m7iejg46ozazhxs",
-    "ui://m7iejg46cioehos",
-    "ui://m7iejg468h207i99",
-    "ui://m7iejg46kwdo7i97",
-    "ui://m7iejg46cvc87i5y",
-    "ui://m7iejg46nk4vhwh",
-    "ui://m7iejg4610snh5j",
-    "ui://m7iejg46kwi0hk0",
-    "ui://m7iejg46qlxihsm",
-    "ui://m7iejg46kwi0hk1",
-    "ui://m7iejg46kwi0hkb",
-    "ui://m7iejg46ilon7ias",
-    "ui://m7iejg46i5987i75",
-    "ui://m7iejg46ilon7i9k",
-    "ui://m7iejg46ilon7ia2",
-    "ui://m7iejg46kwi0hkr",
-    "ui://m7iejg46z3847i6m",
-    "ui://m7iejg46kk3uhrk",
-    "ui://m7iejg46kk3uhrm",
-    "ui://m7iejg46tqi8hwa",
-    "ui://m7iejg46jr1l7i3c",
-    "ui://m7iejg46ilon7ibl",
-    "ui://m7iejg46k5m97i76",
-    "ui://m7iejg46taski05",
-    "ui://m7iejg46i9oq7i3m",
-    "ui://m7iejg46w111hhx",
-    "ui://m7iejg46avqi7ijp",
-    "ui://m7iejg46kk3uhrs",
-    "ui://m7iejg46irlqhyt"
+    "ui://m7iejg46t1hqhxw",
+    "ui://m7iejg46t1hqhy5",
+    "ui://m7iejg46kwi0hm5",
+    "ui://m7iejg46l679hwn",
+    "ui://m7iejg46gojuhh5",
+    "ui://m7iejg46l679hws"
   ],
   "auxline1": true,
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://m7iejg46z3847i6m",
+  "doc.activeDoc": "ui://m7iejg46hsbhhjn",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "m7iejg46",
     "/",
     "m7iejg46",
-    "/mgr/"
+    "/font/",
+    "m7iejg46",
+    "/images/"
   ],
   "snapToGrid": true,
   "backgroundColor": 6710886,

wb_new_ui/assets/Common/GlobalModalWaiting.xml

@@ -3,9 +3,9 @@
   <displayList>
     <graph id="n1_lwcl" name="n1" xy="0,0" size="1751,1001" visible="false" type="rect" lineSize="0" fillColor="#0d000000"/>
     <component id="n4_9p4j" name="gcm_qiu" src="cjli6" fileName="UIPanel.xml" xy="872,465" size="1,1"/>
-    <image id="n6_f86r" name="n6" src="f86rhxn" fileName="images/加载底(1).png" xy="396,442" size="897,117" group="n7_f86r"/>
-    <text id="n3_lwcl" name="title" xy="695,483" size="442,42" group="n7_f86r" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="网络信号太差，正在检查网络中..."/>
-    <component id="n5_j1s2" name="n5" src="j4vkhxi" fileName="component/loading.xml" xy="602,450" group="n7_f86r"/>
+    <image id="n6_f86r" name="n6" src="f86rhxn" fileName="font/images/加载底(1).png" xy="396,442" size="897,117" group="n7_f86r"/>
+    <text id="n3_lwcl" name="title" xy="695,483" size="448,42" group="n7_f86r" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="网络信号太差，正在检查网络中..."/>
+    <component id="n5_j1s2" name="n5" src="j4vkhxi" fileName="component/loading.xml" xy="603,450" group="n7_f86r"/>
     <group id="n7_f86r" name="n7" xy="396,442" size="897,117" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>

wb_new_ui/assets/Common/buttons/Btn_close.xml

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

wb_new_ui/assets/Hotupdate/Version.xml

@@ -25,18 +25,18 @@
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
-    <text id="n15_rdjf" name="tex_tip" xy="382,430" size="536,49" group="n17_rdjf" font="Microsoft YaHei" fontSize="36" color="#ffffff" align="center" autoSize="none" text="请检查网络设置!"/>
-    <component id="n25_lk2r" name="btn_ok" src="cpi87i4s" fileName="commpoent/Btn_Common(1).xml" xy="518,502" size="262,106" group="n17_rdjf">
+    <text id="n15_rdjf" name="tex_tip" xy="382,500" size="536,49" group="n17_rdjf" font="Microsoft YaHei" fontSize="36" color="#ffffff" align="center" autoSize="none" text="请检查网络设置!"/>
+    <component id="n25_lk2r" name="btn_ok" src="cpi87i4s" fileName="commpoent/Btn_Common(1).xml" xy="518,572" size="262,106" group="n17_rdjf">
       <Button title=" " icon="ui://0khx14arh1uuz"/>
     </component>
-    <image id="n27_csp4" name="n27" src="csp47i4t" fileName="images/queren.png" xy="611,537" group="n17_rdjf"/>
-    <group id="n17_rdjf" name="n17" xy="382,430" size="536,178" advanced="true">
+    <image id="n27_csp4" name="n27" src="csp47i4t" fileName="images/queren.png" xy="611,607" group="n17_rdjf"/>
+    <group id="n17_rdjf" name="n17" xy="382,500" size="536,178" advanced="true">
       <gearDisplay controller="state" pages="1"/>
-      <relation target="" sidePair="bottom-bottom"/>
+      <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
-    <component id="n30_yvb2" name="GlobalModalWaiting" src="yvb27i4z" fileName="commpoent/GlobalModalWaiting.xml" xy="-208,-125">
+    <component id="n30_yvb2" name="GlobalModalWaiting" src="yvb27i4z" fileName="commpoent/GlobalModalWaiting.xml" xy="0,0" size="1334,750">
       <gearDisplay controller="state" pages="0"/>
-      <relation target="" sidePair="center-center,middle-middle"/>
+      <relation target="" sidePair="left-center,right-center,bottom-bottom%"/>
     </component>
   </displayList>
   <transition name="t0" autoPlay="true">

wb_new_ui/assets/Hotupdate/commpoent/GlobalModalWaiting.xml

@@ -3,12 +3,23 @@
   <displayList>
     <graph id="n1_lwcl" name="n1" xy="0,0" size="1751,1001" visible="false" type="rect" lineSize="0" fillColor="#0d000000"/>
     <component id="n4_9p4j" name="gcm_qiu" src="cjli6" fileName="UIPanel.xml" pkg="27vd145b" xy="872,465" size="1,1"/>
-    <image id="n6_f86r" name="n6" src="yvb27i50" fileName="commpoent/font/images/加载底(1).png" xy="396,442" size="897,117" group="n7_f86r"/>
-    <text id="n3_lwcl" name="title" xy="695,483" size="214,42" group="n7_f86r" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="正在进入游戏中"/>
-    <component id="n5_j1s2" name="n5" src="yvb27i51" fileName="commpoent/component/loading.xml" xy="602,450" group="n7_f86r"/>
-    <group id="n7_f86r" name="n7" xy="396,442" size="897,117" advanced="true">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <image id="n6_f86r" name="n6" src="yvb27i50" fileName="commpoent/font/images/加载底(1).png" xy="397,753" size="897,117" group="n7_f86r"/>
+    <text id="n3_lwcl" name="title" xy="696,794" size="214,42" group="n7_f86r" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="正在进入游戏中"/>
+    <component id="n5_j1s2" name="n5" src="yvb27i51" fileName="commpoent/component/loading.xml" xy="603,761" group="n7_f86r"/>
+    <text id="n9_t8gf" name="shengluehao" xy="910,784" size="52,42" group="n7_f86r" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="......">
+      <relation target="n3_lwcl" sidePair="left-right,bottom-middle"/>
+    </text>
+    <group id="n7_f86r" name="n7" xy="397,753" size="897,117" advanced="true">
+      <relation target="" sidePair="left-center,bottom-bottom%"/>
     </group>
   </displayList>
   <Button/>
+  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
+    <item time="0" type="Text" target="n9_t8gf" value=""/>
+    <item time="3" type="Text" target="n9_t8gf" value="."/>
+    <item time="6" type="Text" target="n9_t8gf" value=".."/>
+    <item time="9" type="Text" target="n9_t8gf" value="..."/>
+    <item time="12" type="Text" target="n9_t8gf" value="...."/>
+    <item time="15" type="Text" target="n9_t8gf" value="......"/>
+  </transition>
 </component>

wb_new_ui/assets/Lobby/component/notice/pop_notice(1).xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1176,703" adaptationTest="FitSize">
+  <controller name="type" pages="0,,1," selected="0"/>
+  <displayList>
+    <component id="n0_ildu" name="n0" src="eeqmcgu" fileName="Win_Frame_full.xml" pkg="27vd145b" xy="-1,3" size="1179,700" controller="show_line,0,show_di,0,style,0">
+      <Button icon="ui://2d9xdj6zildu7c"/>
+    </component>
+    <list id="n1_ildu" name="list" xy="29,102" size="262,569" lineGap="5" defaultItem="ui://27vd145beeqmch3" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n5_ildu" name="tex_title" xy="316,111" size="766,50" group="n18_trjm" fontSize="40" color="#663300" align="center" ubb="true" autoSize="none" autoClearText="true" text="双十二优惠活动"/>
+    <image id="n6_ildu" name="n6" src="ildu79" fileName="component/notice/07.png" xy="433,165" size="496,0" group="n18_trjm"/>
+    <component id="n7_ildu" name="com_content" src="ltr0cdi" fileName="component/notice/com_content.xml" xy="338,177" size="730,421" group="n18_trjm"/>
+    <group id="n18_trjm" name="n18" xy="316,111" size="766,487" group="n11_ildu" advanced="true"/>
+    <group id="n11_ildu" name="n11" xy="316,111" size="766,487"/>
+    <component id="n14_ildu" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1131,-1" controller="style,0"/>
+  </displayList>
+</component>

wb_new_ui/assets/NewGroup/Main_GroupInfo.xml

@@ -34,7 +34,7 @@
     <image id="n244_n6w8" name="n244" src="n6w87i9h" fileName="images/Rectangle 9.png" xy="0,656" size="1334,90">
       <relation target="" sidePair="width-width%,height-height%"/>
     </image>
-    <image id="n246_ilon" name="n246" src="ilon7i9i" fileName="Rectangle 12.png" xy="0,0" size="249,121"/>
+    <image id="n246_ilon" name="n246" src="ilon7i9i" fileName="images/Rectangle 12.png" xy="0,0" size="249,121"/>
     <component id="n121_goju" name="bg_anchor" src="gojuhh5" fileName="component/anchor.xml" xy="0,3"/>
     <component id="n233_o6b1" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="90,15" size="77,77" group="n236_o6b1" aspect="true" visible="false"/>
     <text id="n234_o6b1" name="tex_name--" xy="90,16" size="122,34" group="n236_o6b1" font="Microsoft YaHei" fontSize="21" color="#ffffff" vAlign="middle" autoSize="shrink" strokeColor="#a79b17" text="老司机带带我"/>
@@ -116,10 +116,10 @@
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <group id="n206_jvvo" name="n206" xy="221,-77" size="252,195" group="n176_mn85"/>
-    <image id="n248_ilon" name="n248" src="ilon7i9j" fileName="Rectangle 13.png" xy="261,46" size="212,69" group="n206_jvvo">
+    <image id="n248_ilon" name="n248" src="ilon7i9j" fileName="images/Rectangle 13.png" xy="261,46" size="212,69" group="n206_jvvo">
       <relation target="" sidePair="left-left,top-top"/>
     </image>
-    <text id="n251_ilon" name="tex_hp_title" xy="264,46" size="89,37" group="n206_jvvo" font="Microsoft YaHei" fontSize="26" color="#fff5b8" align="center" vAlign="middle" bold="true" strokeColor="#be4500" strokeSize="2" text="疲劳值:">
+    <text id="n251_ilon" name="tex_hp_title" xy="264,46" size="89,36" group="n206_jvvo" font="Microsoft YaHei" fontSize="26" color="#fff5b8" align="center" vAlign="middle" bold="true" strokeColor="#be4500" strokeSize="2" text="疲劳值:">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <text id="n250_ilon" name="tex_fag" xy="354,46" size="113,36" group="n206_jvvo" font="Microsoft YaHei" fontSize="26" color="#fff5b8" vAlign="middle" autoSize="none" bold="true" strokeColor="#be4500" strokeSize="2" text="A79B17">
@@ -134,7 +134,7 @@
     <text id="n205_jvvo" name="tex_hp" xy="354,82" size="113,36" group="n206_jvvo" font="Microsoft YaHei" fontSize="26" color="#fff5b8" vAlign="middle" autoSize="none" bold="true" strokeColor="#be4500" strokeSize="2" text="7">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
-    <text id="n216_ovii" name="n216" xy="221,-77" size="94,41" group="n206_jvvo" visible="false" font="Microsoft YaHei" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
+    <text id="n216_ovii" name="n216" xy="221,-77" size="94,42" group="n206_jvvo" visible="false" font="Microsoft YaHei" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <image id="n229_csp4" name="n229" src="csp47i3u" fileName="images/room/jifen.png" xy="237,-61" group="n206_jvvo" visible="false"/>
@@ -187,7 +187,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n122_gg9f" name="lst_layer" xy="17,665" size="1163,80" layout="row" overflow="scroll" scroll="horizontal" lineGap="1" colGap="13" defaultItem="ui://m7iejg46jiu8hef" vAlign="middle" autoClearItems="true">
+    <list id="n122_gg9f" name="lst_layer" xy="17,665" size="1114,80" layout="row" overflow="scroll" scroll="horizontal" lineGap="1" colGap="13" defaultItem="ui://m7iejg46jiu8hef" vAlign="middle" autoClearItems="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="height-height%,bottom-bottom"/>
       <relation target="n230_csp4" sidePair="rightext-left"/>
@@ -203,25 +203,25 @@
       <item/>
       <item/>
     </list>
-    <component id="n230_csp4" name="btn_start2" src="csp47i3z" fileName="component/Lst_info/Btn_start.xml" xy="1134,656" size="200,97" group="n74_i7lq">
+    <component id="n230_csp4" name="btn_start2" src="csp47i3z" fileName="component/Lst_info/Btn_start.xml" xy="1135,661" size="200,97" group="n74_i7lq">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n171_mpll" name="btn_select_play" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="998,833" size="58,77" group="n74_i7lq" visible="false">
+    <component id="n171_mpll" name="btn_select_play" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="999,833" size="58,77" group="n74_i7lq" visible="false">
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://m7iejg46mpllhv8"/>
     </component>
-    <component id="n88_kxzv" name="btn_start" src="csp47i3z" fileName="component/Lst_info/Btn_start.xml" xy="1126,792" size="130,76" group="n130_w111"/>
-    <group id="n130_w111" name="PlayGameBtns" xy="1126,792" size="130,76" group="n74_i7lq" advanced="true">
+    <component id="n88_kxzv" name="btn_start" src="csp47i3z" fileName="component/Lst_info/Btn_start.xml" xy="1127,792" size="130,76" group="n130_w111"/>
+    <group id="n130_w111" name="PlayGameBtns" xy="1127,792" size="130,76" group="n74_i7lq" advanced="true">
       <gearDisplay controller="all" pages="1"/>
       <relation target="" sidePair="right-right"/>
     </group>
-    <component id="n214_ovii" name="btn_choose" src="oviii0w" fileName="component/Lst_info/Btn_choose.xml" xy="-70,791" size="231,86" group="n74_i7lq" visible="false">
+    <component id="n214_ovii" name="btn_choose" src="oviii0w" fileName="component/Lst_info/Btn_choose.xml" xy="-69,791" size="231,86" group="n74_i7lq" visible="false">
       <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="231,900" size="110,76" group="n74_i7lq" visible="false" touchable="false">
+    <component id="n238_dg1v" name="btn_quanbu" src="dg1v7i92" fileName="component/Lst_info/btn_quanbu.xml" xy="232,900" size="110,76" group="n74_i7lq" visible="false" touchable="false">
       <relation target="" sidePair="left-left,top-bottom"/>
     </component>
-    <group id="n74_i7lq" name="bottom" xy="-70,656" size="1404,320" advanced="true"/>
+    <group id="n74_i7lq" name="bottom" xy="-69,661" size="1404,315" advanced="true"/>
     <component id="n159_lnha" name="com_notice" src="lnhahsf" fileName="component/notice/Cgm_message.xml" xy="262,116" size="900,35">
       <gearDisplay controller="show_search" pages="0"/>
       <relation target="" sidePair="center-center"/>
@@ -263,7 +263,7 @@
       <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">
+    <component id="n271_avqi" name="goselectgames" src="avqi7ijt" fileName="component/Lst_info/getgames.xml" xy="1296,273" visible="false">
       <relation target="" sidePair="middle-middle,right-right"/>
     </component>
   </displayList>

wb_new_ui/assets/NewGroup/Win_FagInput1.xml

@@ -7,61 +7,60 @@
     <component id="n63_omkm" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="660,-22">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n99_l7wn" name="btn_ok" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="501,471" size="193,85" group="n120_l7wn">
-      <Button title="确认" titleFontSize="1" icon="ui://m7iejg46mcgb7ijb"/>
+    <component id="n98_l7wn" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="51,459" size="193,85" group="n120_l7wn">
+      <Button title="删除" titleFontSize="1" icon="ui://27vd145bl7wn7iiq"/>
     </component>
-    <component id="n100_l7wn" name="btn_1" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="48,155" size="193,85" group="n120_l7wn">
-      <Button title="1" titleFontSize="1" icon="ui://m7iejg46mcgb7ija"/>
+    <component id="n99_l7wn" name="btn_ok" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="475,459" size="193,85" group="n120_l7wn">
+      <Button title="确认" titleFontSize="1" icon="ui://27vd145bl7wn7iip"/>
     </component>
-    <component id="n101_l7wn" name="btn_2" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="273,155" size="193,85" group="n120_l7wn">
-      <Button title="2" titleFontSize="1" icon="ui://m7iejg46mcgb7ijc"/>
+    <component id="n100_l7wn" name="btn_1" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="51,163" size="193,85" group="n120_l7wn">
+      <Button title="1" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n102_l7wn" name="btn_3" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="498,155" size="193,85" group="n120_l7wn">
-      <Button title="3" titleFontSize="1" icon="ui://m7iejg46mcgb7ijd"/>
+    <component id="n101_l7wn" name="btn_2" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="263,163" size="193,85" group="n120_l7wn">
+      <Button title="2" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n103_l7wn" name="btn_4" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="48,257" size="193,85" group="n120_l7wn">
-      <Button title="4" titleFontSize="1" icon="ui://m7iejg46mcgb7ije"/>
+    <component id="n102_l7wn" name="btn_3" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="475,163" size="193,85" group="n120_l7wn">
+      <Button title="3" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n104_l7wn" name="btn_5" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="273,257" size="193,85" group="n120_l7wn">
-      <Button title="5" titleFontSize="1" icon="ui://m7iejg46mcgb7ijf"/>
+    <component id="n103_l7wn" name="btn_4" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="51,262" size="193,85" group="n120_l7wn">
+      <Button title="4" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n105_l7wn" name="btn_6" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="498,257" size="193,85" group="n120_l7wn">
-      <Button title="6" titleFontSize="1" icon="ui://m7iejg46mcgb7ijg"/>
+    <component id="n104_l7wn" name="btn_5" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="263,262" size="193,85" group="n120_l7wn">
+      <Button title="5" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n106_l7wn" name="btn_7" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="48,359" size="193,85" group="n120_l7wn">
-      <Button title="7" titleFontSize="1" icon="ui://m7iejg46mcgb7ijh"/>
+    <component id="n105_l7wn" name="btn_6" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="475,262" size="193,85" group="n120_l7wn">
+      <Button title="6" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n107_l7wn" name="btn_8" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="273,359" size="193,85" group="n120_l7wn">
-      <Button title="8" titleFontSize="1" icon="ui://m7iejg46mcgb7iji"/>
+    <component id="n106_l7wn" name="btn_7" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="51,364" size="193,85" group="n120_l7wn">
+      <Button title="7" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n108_l7wn" name="btn_9" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="498,359" size="193,85" group="n120_l7wn">
-      <Button title="9" titleFontSize="1" icon="ui://m7iejg46mcgb7ijj"/>
+    <component id="n107_l7wn" name="btn_8" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="263,364" size="193,85" group="n120_l7wn">
+      <Button title="8" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n109_l7wn" name="btn_0" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="47,470" size="193,85" group="n120_l7wn">
-      <Button title="0" titleFontSize="1" icon="ui://m7iejg46mcgb7ijk"/>
+    <component id="n108_l7wn" name="btn_9" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="475,364" size="193,85" group="n120_l7wn">
+      <Button title="9" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <image id="n117_l7wn" name="n117" src="b8zx7i57" fileName="font/images/btn_keyboard/shuzi_08.png" pkg="27vd145b" xy="105,380" group="n120_l7wn" visible="false"/>
-    <image id="n116_l7wn" name="n116" src="b8zx7i56" fileName="font/images/btn_keyboard/shuzi_07.png" pkg="27vd145b" xy="526,274" group="n120_l7wn" visible="false"/>
-    <image id="n115_l7wn" name="n115" src="b8zx7i55" fileName="font/images/btn_keyboard/shuzi_06.png" pkg="27vd145b" xy="317,274" group="n120_l7wn" visible="false"/>
-    <image id="n114_l7wn" name="n114" src="b8zx7i54" fileName="font/images/btn_keyboard/shuzi_05.png" pkg="27vd145b" xy="103,274" group="n120_l7wn" visible="false"/>
-    <image id="n113_l7wn" name="n113" src="b8zx7i53" fileName="font/images/btn_keyboard/shuzi_04.png" pkg="27vd145b" xy="521,174" group="n120_l7wn" visible="false"/>
-    <image id="n112_l7wn" name="n112" src="b8zx7i52" fileName="font/images/btn_keyboard/shuzi_03.png" pkg="27vd145b" xy="314,174" group="n120_l7wn" visible="false"/>
-    <image id="n111_l7wn" name="n111" src="b8zx7i51" fileName="font/images/btn_keyboard/shuzi_02.png" pkg="27vd145b" xy="103,174" group="n120_l7wn" visible="false"/>
-    <image id="n110_l7wn" name="n110" src="b8zx7i50" fileName="font/images/btn_keyboard/shuzi_01.png" pkg="27vd145b" xy="316,476" group="n120_l7wn" visible="false"/>
-    <image id="n118_l7wn" name="n118" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" pkg="27vd145b" xy="316,380" group="n120_l7wn" visible="false"/>
-    <image id="n119_l7wn" name="n119" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" pkg="27vd145b" xy="528,380" group="n120_l7wn" visible="false"/>
-    <component id="n121_mcgb" name="btn_10" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="272,470" size="185,85" group="n120_l7wn">
-      <Button title="." titleFontSize="1" icon="ui://m7iejg46mcgb7ijl"/>
+    <component id="n109_l7wn" name="btn_0" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="264,459" size="98,85" group="n120_l7wn">
+      <Button title="0" titleFontSize="1" icon="ui://27vd145bl7wn7iir"/>
     </component>
-    <group id="n120_l7wn" name="input_panel" xy="47,155" size="646,401" group="n92_omkm"/>
-    <group id="n92_omkm" name="n92" xy="47,155" size="646,401" advanced="true">
+    <component id="n121_l7wn" name="btn_10" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="364,459" size="98,85" group="n120_l7wn">
+      <Button title="." titleFontSize="1" icon="ui://27vd145bl2997iev"/>
+    </component>
+    <image id="n111_l7wn" name="n111" src="b8zx7i51" fileName="font/images/btn_keyboard/shuzi_02.png" pkg="27vd145b" xy="131,179" group="n120_l7wn"/>
+    <image id="n112_l7wn" name="n112" src="b8zx7i52" fileName="font/images/btn_keyboard/shuzi_03.png" pkg="27vd145b" xy="342,179" group="n120_l7wn"/>
+    <image id="n113_l7wn" name="n113" src="b8zx7i53" fileName="font/images/btn_keyboard/shuzi_04.png" pkg="27vd145b" xy="549,179" group="n120_l7wn"/>
+    <image id="n114_l7wn" name="n114" src="b8zx7i54" fileName="font/images/btn_keyboard/shuzi_05.png" pkg="27vd145b" xy="131,279" group="n120_l7wn"/>
+    <image id="n115_l7wn" name="n115" src="b8zx7i55" fileName="font/images/btn_keyboard/shuzi_06.png" pkg="27vd145b" xy="345,279" group="n120_l7wn"/>
+    <image id="n116_l7wn" name="n116" src="b8zx7i56" fileName="font/images/btn_keyboard/shuzi_07.png" pkg="27vd145b" xy="554,279" group="n120_l7wn"/>
+    <image id="n117_l7wn" name="n117" src="b8zx7i57" fileName="font/images/btn_keyboard/shuzi_08.png" pkg="27vd145b" xy="133,385" group="n120_l7wn"/>
+    <image id="n118_l7wn" name="n118" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" pkg="27vd145b" xy="344,385" group="n120_l7wn"/>
+    <image id="n119_l7wn" name="n119" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" pkg="27vd145b" xy="556,385" group="n120_l7wn"/>
+    <group id="n120_l7wn" name="input_panel" xy="51,163" size="617,381" group="n92_omkm"/>
+    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="51,77" size="615,76" group="n91_omkm"/>
+    <text id="n90_omkm" name="tex_num" xy="58,79" size="609,70" group="n91_omkm" font="Microsoft YaHei" fontSize="36" color="#367256" vAlign="middle" autoSize="none" text="123"/>
+    <group id="n91_omkm" name="show" xy="51,77" size="616,76" group="n92_omkm"/>
+    <group id="n92_omkm" name="n92" xy="51,77" size="617,467" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <group id="n91_omkm" name="show" xy="46,53" size="651,85"/>
-    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="46,53" size="651,85" group="n91_omkm"/>
-    <text id="n90_omkm" name="tex_num" xy="77,61" size="509,71" group="n91_omkm" font="Microsoft YaHei" fontSize="42" color="#ffffff" align="right" vAlign="middle" autoSize="none" text=""/>
-    <component id="n98_l7wn" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="610,64" size="78,60">
-      <Button title="删除" titleFontSize="1" icon="ui://m7iejg46mcgb7ijm"/>
-    </component>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/Win_FagInput1_qi.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="722,587">
+  <displayList>
+    <image id="n96_l7wn" name="bg" src="m0eibt" fileName="font/images/win/tkd.png" pkg="27vd145b" xy="0,0" size="722,587">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <component id="n63_omkm" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="660,-22">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <component id="n99_l7wn" name="btn_ok" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="501,471" size="193,85" group="n120_l7wn">
+      <Button title="确认" titleFontSize="1" icon="ui://m7iejg46mcgb7ijb"/>
+    </component>
+    <component id="n100_l7wn" name="btn_1" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="48,155" size="193,85" group="n120_l7wn">
+      <Button title="1" titleFontSize="1" icon="ui://m7iejg46mcgb7ija"/>
+    </component>
+    <component id="n101_l7wn" name="btn_2" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="273,155" size="193,85" group="n120_l7wn">
+      <Button title="2" titleFontSize="1" icon="ui://m7iejg46mcgb7ijc"/>
+    </component>
+    <component id="n102_l7wn" name="btn_3" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="498,155" size="193,85" group="n120_l7wn">
+      <Button title="3" titleFontSize="1" icon="ui://m7iejg46mcgb7ijd"/>
+    </component>
+    <component id="n103_l7wn" name="btn_4" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="48,257" size="193,85" group="n120_l7wn">
+      <Button title="4" titleFontSize="1" icon="ui://m7iejg46mcgb7ije"/>
+    </component>
+    <component id="n104_l7wn" name="btn_5" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="273,257" size="193,85" group="n120_l7wn">
+      <Button title="5" titleFontSize="1" icon="ui://m7iejg46mcgb7ijf"/>
+    </component>
+    <component id="n105_l7wn" name="btn_6" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="498,257" size="193,85" group="n120_l7wn">
+      <Button title="6" titleFontSize="1" icon="ui://m7iejg46mcgb7ijg"/>
+    </component>
+    <component id="n106_l7wn" name="btn_7" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="48,359" size="193,85" group="n120_l7wn">
+      <Button title="7" titleFontSize="1" icon="ui://m7iejg46mcgb7ijh"/>
+    </component>
+    <component id="n107_l7wn" name="btn_8" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="273,359" size="193,85" group="n120_l7wn">
+      <Button title="8" titleFontSize="1" icon="ui://m7iejg46mcgb7iji"/>
+    </component>
+    <component id="n108_l7wn" name="btn_9" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="498,359" size="193,85" group="n120_l7wn">
+      <Button title="9" titleFontSize="1" icon="ui://m7iejg46mcgb7ijj"/>
+    </component>
+    <component id="n109_l7wn" name="btn_0" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="47,470" size="193,85" group="n120_l7wn">
+      <Button title="0" titleFontSize="1" icon="ui://m7iejg46mcgb7ijk"/>
+    </component>
+    <image id="n117_l7wn" name="n117" src="b8zx7i57" fileName="font/images/btn_keyboard/shuzi_08.png" pkg="27vd145b" xy="105,380" group="n120_l7wn" visible="false"/>
+    <image id="n116_l7wn" name="n116" src="b8zx7i56" fileName="font/images/btn_keyboard/shuzi_07.png" pkg="27vd145b" xy="526,274" group="n120_l7wn" visible="false"/>
+    <image id="n115_l7wn" name="n115" src="b8zx7i55" fileName="font/images/btn_keyboard/shuzi_06.png" pkg="27vd145b" xy="317,274" group="n120_l7wn" visible="false"/>
+    <image id="n114_l7wn" name="n114" src="b8zx7i54" fileName="font/images/btn_keyboard/shuzi_05.png" pkg="27vd145b" xy="103,274" group="n120_l7wn" visible="false"/>
+    <image id="n113_l7wn" name="n113" src="b8zx7i53" fileName="font/images/btn_keyboard/shuzi_04.png" pkg="27vd145b" xy="521,174" group="n120_l7wn" visible="false"/>
+    <image id="n112_l7wn" name="n112" src="b8zx7i52" fileName="font/images/btn_keyboard/shuzi_03.png" pkg="27vd145b" xy="314,174" group="n120_l7wn" visible="false"/>
+    <image id="n111_l7wn" name="n111" src="b8zx7i51" fileName="font/images/btn_keyboard/shuzi_02.png" pkg="27vd145b" xy="103,174" group="n120_l7wn" visible="false"/>
+    <image id="n110_l7wn" name="n110" src="b8zx7i50" fileName="font/images/btn_keyboard/shuzi_01.png" pkg="27vd145b" xy="316,476" group="n120_l7wn" visible="false"/>
+    <image id="n118_l7wn" name="n118" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" pkg="27vd145b" xy="316,380" group="n120_l7wn" visible="false"/>
+    <image id="n119_l7wn" name="n119" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" pkg="27vd145b" xy="528,380" group="n120_l7wn" visible="false"/>
+    <component id="n121_mcgb" name="btn_10" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="272,470" size="185,85" group="n120_l7wn">
+      <Button title="." titleFontSize="1" icon="ui://m7iejg46mcgb7ijl"/>
+    </component>
+    <group id="n120_l7wn" name="input_panel" xy="47,155" size="646,401" group="n92_omkm"/>
+    <group id="n92_omkm" name="n92" xy="47,155" size="646,401" advanced="true">
+      <relation target="" sidePair="center-center%"/>
+    </group>
+    <group id="n91_omkm" name="show" xy="46,53" size="651,85"/>
+    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="46,53" size="651,85" group="n91_omkm"/>
+    <text id="n90_omkm" name="tex_num" xy="77,61" size="509,71" group="n91_omkm" font="Microsoft YaHei" fontSize="42" color="#ffffff" align="right" vAlign="middle" autoSize="none" text=""/>
+    <component id="n98_l7wn" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="610,64" size="78,60">
+      <Button title="删除" titleFontSize="1" icon="ui://m7iejg46mcgb7ijm"/>
+    </component>
+  </displayList>
+</component>

wb_new_ui/assets/NewGroup/Win_GroupSetting.xml

@@ -121,9 +121,9 @@
       <relation target="" sidePair="center-center%"/>
       <Button title=" " titleColor="#a65e3e" titleFontSize="36" icon="ui://m7iejg46vyn37i56"/>
     </component>
-    <component id="n105_vyn3" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1174,53" controller="style,0">
+    <component id="n105_vyn3" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1162,33" controller="style,0">
       <relation target="" sidePair="right-right,top-top"/>
-      <Button icon="ui://27vd145bm0eibv"/>
+      <Button icon="ui://m7iejg46ilon7iax"/>
     </component>
     <image id="n110_h2hj" name="n110" src="h2hj7i85" fileName="images/main/sz_bg_02.png" xy="158,179" group="n55_g21o"/>
     <image id="n111_h2hj" name="n111" src="h2hj7i86" fileName="images/main/sz_bg_03.png" xy="164,231" group="n55_g21o"/>

wb_new_ui/assets/NewGroup/Win_Mail.xml

@@ -12,9 +12,9 @@
       <item/>
       <item/>
     </list>
-    <component id="n7_r96t" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1282,-1" controller="style,0">
+    <component id="n7_r96t" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1252,17" controller="style,0">
       <relation target="" sidePair="center-center,top-top"/>
-      <Button icon="ui://27vd145bm0eibv"/>
+      <Button icon="ui://m7iejg46ilon7iax"/>
     </component>
     <component id="n20_mpll" name="btn_delete" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="523,621">
       <relation target="" sidePair="center-center%"/>

wb_new_ui/assets/NewGroup/Win_ManagerView.xml

@@ -8,10 +8,9 @@
     <image id="n80_ovii" name="n80" src="oviii10" fileName="images/bg_tk_02.png" xy="0,0" size="1396,690">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <component id="n66_lf2q" name="anchor" src="gojuhh5" fileName="component/anchor.xml" xy="233,104" size="1135,559">
-      <relation target="" sidePair="left-left,top-top"/>
-    </component>
-    <list id="n65_hsbh" name="lst_index" xy="12,12" size="715,74" layout="row" overflow="scroll" lineGap="3" defaultItem="ui://m7iejg46t1hqhy5" selectionController="index" autoClearItems="true">
+    <image id="n94_t8gf" name="n94" src="imp57iho" fileName="images/Rectangle 343.png" xy="13,93" size="1372,583"/>
+    <image id="n93_t8gf" name="n93" src="tt6k7ikb" fileName="images/Group 893.png" xy="524,-5" size="369,106" visible="false"/>
+    <list id="n65_hsbh" name="lst_index" xy="12,12" size="537,74" layout="row" overflow="scroll" lineGap="3" defaultItem="ui://m7iejg46t1hqhy5" selectionController="index" autoClearItems="true">
       <relation target="" sidePair="middle-middle,left-left"/>
       <item/>
       <item/>
@@ -20,19 +19,22 @@
       <item/>
       <item/>
     </list>
+    <component id="n66_lf2q" name="anchor" src="gojuhh5" fileName="component/anchor.xml" xy="233,105" size="1135,573">
+      <relation target="" sidePair="left-left,top-top"/>
+    </component>
+    <list id="n90_yvb2" name="lst_partner" xy="25,104" size="205,571" selectionMode="multipleSingleClick" overflow="scroll" lineGap="-6" defaultItem="ui://m7iejg46t1hqhxw" autoClearItems="true">
+      <gearLook controller="tongji" pages="0,1" values="1,0,0,1|1,0,0,1"/>
+      <item/>
+      <item/>
+    </list>
     <image id="n87_csp4" name="n87" src="csp47i44" fileName="component/nav/sd.png" xy="283,253" size="1085,56" visible="false">
       <relation target="" sidePair="width-width"/>
     </image>
-    <component id="n86_csp4" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="1338,-30">
+    <component id="n86_csp4" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="1285,-10" size="120,115" aspect="true">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <text id="n79_ovii" name="n79" xy="170,70" size="178,42" visible="false" font="Microsoft YaHei" fontSize="30" color="#fffff6" vAlign="middle" autoSize="none" text="统计">
       <relation target="" sidePair="center-center,top-top"/>
     </text>
-    <list id="n90_yvb2" name="lst_partner" xy="25,104" size="208,559" grayed="true" selectionMode="multipleSingleClick" overflow="scroll" lineGap="-6" defaultItem="ui://m7iejg46t1hqhxw" autoClearItems="true">
-      <gearLook controller="tongji" pages="0,1" values="1,0,1,1|1,0,0,1"/>
-      <item/>
-      <item/>
-    </list>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml

@@ -8,10 +8,11 @@
     <image id="n80_ovii" name="n80" src="oviii10" fileName="images/bg_tk_02.png" xy="0,0" size="1396,690">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <component id="n66_lf2q" name="anchor" src="gojuhh5" fileName="component/anchor.xml" xy="233,104" size="1135,559">
+    <image id="n88_t8gf" name="n88" src="imp57iho" fileName="images/Rectangle 343.png" xy="14,92" size="1372,583"/>
+    <component id="n66_lf2q" name="anchor" src="gojuhh5" fileName="component/anchor.xml" xy="233,104" size="1135,570">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <list id="n65_hsbh" name="lst_index" xy="25,96" size="258,559" overflow="scroll" lineGap="3" defaultItem="ui://m7iejg46yvb27ik1" selectionController="index" autoClearItems="true">
+    <list id="n65_hsbh" name="lst_index" xy="25,96" size="258,569" overflow="scroll" lineGap="3" defaultItem="ui://m7iejg46yvb27ik1" selectionController="index" autoClearItems="true">
       <relation target="" sidePair="middle-middle,left-left"/>
       <item/>
       <item/>
@@ -23,7 +24,7 @@
     <image id="n87_csp4" name="n87" src="csp47i44" fileName="component/nav/sd.png" xy="283,253" size="1085,56" visible="false">
       <relation target="" sidePair="width-width"/>
     </image>
-    <component id="n86_csp4" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="1338,-30">
+    <component id="n86_csp4" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="1288,-10" size="116,112" aspect="true">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <text id="n79_ovii" name="n79" xy="170,70" size="178,42" visible="false" font="Microsoft YaHei" fontSize="30" color="#fffff6" vAlign="middle" autoSize="none" text="统计">

wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="956,621">
-  <controller name="type" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="type" pages="0,,1,,2,,3," selected="0"/>
   <controller name="show_superior" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <image id="n86_nuxq" name="bg" src="iaes7ic8" fileName="images/caoZuoSheZhi/Group 548.png" xy="0,0" size="956,621">
@@ -8,20 +8,20 @@
     </image>
     <image id="n83_cvc8" name="n83" src="cvc87i60" fileName="mgr/imgs/fagpack/bt_caozuoshezhi.png" xy="350,16" visible="false"/>
     <component id="n81_cvc8" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="875,-22" controller="style,0">
-      <Button icon="ui://m7iejg46yscl7ibw"/>
+      <Button icon="ui://m7iejg46ilon7iax"/>
     </component>
     <component id="n84_cvc8" name="btn_head" src="ilon7ibj" fileName="mgr/component/numberHpAlone/Head2.xml" xy="304,111" size="122,122" group="n58_hsbh" scale="1.1,1.1"/>
-    <text id="n56_hsbh" name="tex_name" xy="448,120" size="170,39" group="n58_hsbh" font="Microsoft YaHei" fontSize="28" color="#444444" bold="true" singleLine="true" autoClearText="true" text="fdsfdsfdsfd">
+    <text id="n56_hsbh" name="tex_name" xy="448,120" size="166,39" group="n58_hsbh" font="Microsoft YaHei" fontSize="28" color="#444444" bold="true" singleLine="true" autoClearText="true" text="fdsfdsfdsfd">
       <relation target="" sidePair="left-left"/>
     </text>
-    <text id="n57_hsbh" name="tex_id" xy="448,160" size="108,34" group="n58_hsbh" font="Microsoft YaHei" fontSize="24" color="#444444" bold="true" singleLine="true" autoClearText="true" text="dfsdfdsf">
+    <text id="n57_hsbh" name="tex_id" xy="448,160" size="106,34" group="n58_hsbh" font="Microsoft YaHei" fontSize="24" color="#444444" bold="true" singleLine="true" autoClearText="true" text="dfsdfdsf">
       <relation target="" sidePair="left-left"/>
     </text>
     <group id="n58_hsbh" name="n58" xy="304,111" size="314,122" advanced="true"/>
-    <text id="n65_tqi8" name="n65" xy="448,195" size="102,34" group="n70_tqi8" font="Microsoft YaHei" fontSize="24" color="#444444" vAlign="middle" bold="true" text="上级ID：">
+    <text id="n65_tqi8" name="n65" xy="448,195" size="103,34" group="n70_tqi8" font="Microsoft YaHei" fontSize="24" color="#444444" vAlign="middle" bold="true" text="上级ID：">
       <gearDisplay controller="show_superior" pages="0,1"/>
     </text>
-    <text id="n66_tqi8" name="tex_superior_id" xy="534,195" size="86,34" group="n70_tqi8" font="Microsoft YaHei" fontSize="24" color="#444444" vAlign="middle" bold="true" singleLine="true" autoClearText="true" text="123456">
+    <text id="n66_tqi8" name="tex_superior_id" xy="534,195" size="94,34" group="n70_tqi8" font="Microsoft YaHei" fontSize="24" color="#444444" vAlign="middle" bold="true" singleLine="true" autoClearText="true" text="123456">
       <gearDisplay controller="show_superior" pages="0,1"/>
       <relation target="n65_tqi8" sidePair="left-right"/>
     </text>

wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd2.xml

@@ -6,7 +6,7 @@
     <image id="n92_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" pkg="27vd145b" xy="0,0" size="960,595">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <component id="n88_tayq" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="911,-24">
+    <component id="n88_tayq" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="876,-5">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n82_jr1l" name="btn_qd" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="181,396" size="274,120" controller="style,0">

wb_new_ui/assets/NewGroup/Win_SelectGames.xml

@@ -10,14 +10,14 @@
       <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"/>
+    <text id="n3_8h20" name="n3" xy="117,118" size="124,42" group="n5_8h20" font="Microsoft YaHei" fontSize="30" color="#aa3300" vAlign="middle" text="玩法名称"/>
+    <text id="n4_8h20" name="n4" xy="788,116" size="324,42" group="n5_8h20" visible="false" font="Microsoft YaHei" fontSize="30" color="#aa3300" align="center" vAlign="middle" text="操作(勾选即为快速开始)"/>
+    <group id="n5_8h20" name="n5" xy="117,116" size="995,44" 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"/>
+    <component id="n7_8h20" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1082,-12" 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/Win_bxx.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="956,588">
-  <controller name="ctr" pages="0,,1," selected="1"/>
-  <controller name="type" pages="0,,1,,2," selected="2"/>
+  <controller name="ctr" pages="0,,1," selected="0"/>
+  <controller name="type" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n70_nuxq" name="bg" src="yscl7ibt" fileName="images/bxx/Group 570.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n51_r0qx" name="n51" src="csp47i46" fileName="mgr/imgs/fagpack/bt_baoxianxiang.png" xy="357,15" visible="false"/>
-    <component id="n52_r0qx" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="862,-11" controller="style,0">
-      <Button icon="ui://m7iejg46yscl7ibw"/>
+    <component id="n52_r0qx" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="843,-11" controller="style,0">
+      <Button icon="ui://m7iejg46ilon7iax"/>
     </component>
     <list id="n35_r8m8" name="bxx_list" xy="38,106" size="798,78" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="2" lineGap="5" colGap="11" defaultItem="ui://m7iejg46r0qx7i70" vAlign="bottom" autoClearItems="true">
       <relation target="" sidePair="left-left"/>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,92" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="isChoose" pages="0,,1," selected="0"/>
   <displayList>
     <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"/>
@@ -10,10 +11,15 @@
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n2_n6w8" name="title" xy="47,48" size="141,36" font="Microsoft YaHei" fontSize="22" color="#ffffff" vAlign="middle" autoSize="ellipsis" bold="true" autoClearText="true" text="1跑得快">
+    <text id="n2_n6w8" name="title" xy="48,48" size="141,36" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="ellipsis" bold="true" autoClearText="true" text="1跑得快1234">
       <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"/>
+    <image id="n3_avqi" name="n3" src="avqi7ijr" fileName="component/Lst_info/快速开始.png" xy="57,7" size="136,36">
+      <gearDisplay controller="isChoose" pages="0"/>
+    </image>
+    <image id="n4_t8gf" name="n4" src="t8gf7iko" fileName="component/Lst_info/选择玩法.png" xy="57,7" size="136,36">
+      <gearDisplay controller="isChoose" pages="1"/>
+    </image>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml

@@ -2,7 +2,7 @@
 <component size="270,240" extention="Button">
   <controller name="color" pages="0,,1,,2,,3,,4,,5,,6,,7," selected="0"/>
   <displayList>
-    <image id="n15_iaes" name="n15" src="iaes7idd" fileName="images/room/zuoziMajiang.png" xy="-19,1" size="324,266"/>
+    <image id="n15_iaes" name="n15" src="iaes7idd" fileName="images/room/zuoziMajiang.png" xy="-18,1" size="324,266"/>
     <loader id="n12_n96g" name="ldr_table" xy="22,9" size="52,52" visible="false" url="ui://m7iejg46vyn37i5d">
       <gearIcon controller="color" pages="0,1,2,3,4,5,6,7" values="ui://m7iejg46vyn37i5d|ui://m7iejg46vyn37i5e|ui://m7iejg46vyn37i5f|ui://m7iejg46irlqhze|ui://m7iejg46irlqhzd|ui://m7iejg46irlqhzc|ui://m7iejg46irlqhzb|ui://m7iejg46irlqhza"/>
     </loader>

wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml

@@ -2,7 +2,7 @@
 <component size="270,240" extention="Button">
   <controller name="color" pages="0,,1,,2,,3,,4,,5,,6,,7," selected="0"/>
   <displayList>
-    <image id="n15_iaes" name="n15" src="iaes7idf" fileName="images/room/zuoziPuke.png" xy="-13,1" size="320,251"/>
+    <image id="n15_iaes" name="n15" src="iaes7idf" fileName="images/room/zuoziPuke.png" xy="-18,1" size="324,266"/>
     <loader id="n12_n96g" name="ldr_table" xy="22,9" size="52,52" visible="false" url="ui://m7iejg46vyn37i5d">
       <gearIcon controller="color" pages="0,1,2,3,4,5,6,7" values="ui://m7iejg46vyn37i5d|ui://m7iejg46vyn37i5e|ui://m7iejg46vyn37i5f|ui://m7iejg46irlqhze|ui://m7iejg46irlqhzd|ui://m7iejg46irlqhzc|ui://m7iejg46irlqhzb|ui://m7iejg46irlqhza"/>
     </loader>

wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk3.xml

@@ -2,7 +2,7 @@
 <component size="270,240" extention="Button">
   <controller name="color" pages="0,,1,,2,,3,,4,,5,,6,,7," selected="0"/>
   <displayList>
-    <image id="n15_iaes" name="n15" src="iaes7idh" fileName="images/room/zuoziZipai.png" xy="-3,9" size="305,253"/>
+    <image id="n15_iaes" name="n15" src="iaes7idh" fileName="images/room/zuoziZipai.png" xy="-18,1" size="324,266"/>
     <loader id="n12_n96g" name="ldr_table" xy="22,9" size="52,52" visible="false" url="ui://m7iejg46vyn37i5d">
       <gearIcon controller="color" pages="0,1,2,3,4,5,6,7" values="ui://m7iejg46vyn37i5d|ui://m7iejg46vyn37i5e|ui://m7iejg46vyn37i5f|ui://m7iejg46irlqhze|ui://m7iejg46irlqhzd|ui://m7iejg46irlqhzc|ui://m7iejg46irlqhzb|ui://m7iejg46irlqhza"/>
     </loader>

wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_head.xml

@@ -11,7 +11,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <image id="n9_m1dc" name="n9" src="m1dchyo" fileName="images/room/text_btn.png" xy="-13,111" size="109,39" group="n10_m1dc" visible="false"/>
-    <text id="n11_rfcn" name="tex_id" xy="-13,132" size="104,27" group="n10_m1dc" visible="false" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" autoSize="height" text="玩家名字的"/>
+    <text id="n11_rfcn" name="tex_id" xy="-13,132" size="104,26" group="n10_m1dc" visible="false" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" autoSize="height" text="玩家名字的"/>
     <text id="n12_quwh" name="tex_score" xy="-13,111" size="104,23" group="n10_m1dc" visible="false" font="Microsoft YaHei" fontSize="15" color="#ffffff" align="center" autoSize="shrink" text=""/>
     <image id="n15_kt8n" name="n15" src="kt8n7ij7" fileName="component/Lst_room/Rectangle 432.png" xy="-24,68" size="113,26" group="n10_m1dc" alpha="0.5"/>
     <text id="n2_yh61" name="tex_name" xy="-51,64" size="168,35" group="n10_m1dc" font="Arial Rounded MT Bold" fontSize="22" color="#ccffff" align="center" autoSize="none" strokeColor="#2d5079" strokeSize="1.5" shadowColor="#2d5079" shadowOffset="1,1" text="玩家名字的">
@@ -19,8 +19,8 @@
     </text>
     <group id="n10_m1dc" name="n10" xy="-51,64" size="168,95"/>
     <graph id="n4_nyna" name="n4" xy="7,6" size="47,47" group="n7_nyna" alpha="0.7" type="eclipse" fillColor="#ff000000" corner="7"/>
-    <text id="n5_nyna" name="n5" xy="12,9" size="40,27" group="n7_nyna" fontSize="18" color="#ffffff" text="离线"/>
-    <text id="n6_nyna" name="tex_time" xy="5,29" pivot="0.5,0.5" size="46,24" group="n7_nyna" fontSize="16" color="#ffffff" autoClearText="true" text="100秒"/>
+    <text id="n5_nyna" name="n5" xy="12,9" size="40,26" group="n7_nyna" fontSize="18" color="#ffffff" text="离线"/>
+    <text id="n6_nyna" name="tex_time" xy="4,29" pivot="0.5,0.5" size="47,24" group="n7_nyna" fontSize="16" color="#ffffff" autoClearText="true" text="100秒"/>
     <group id="n7_nyna" name="n7" xy="7,6" size="50,47" advanced="true">
       <gearDisplay controller="offline" pages="1"/>
     </group>

wb_new_ui/assets/NewGroup/component/Lst_room/Play_room2.xml

@@ -2,7 +2,7 @@
 <component size="380,270" extention="Button">
   <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n42_10snh" name="desk" src="iaes7idj" fileName="component/Lst_room/Gcm_Play_desk2.xml" xy="44,12" size="302,251"/>
+    <component id="n42_10snh" name="desk" src="iaes7idj" fileName="component/Lst_room/Gcm_Play_desk2.xml" xy="41,1" size="300,279"/>
     <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="159,153" size="104,126" scale="0.7,0.7" visible="false">
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46h60mhyq"/>
@@ -14,7 +14,7 @@
     <text id="n58_ufim" name="tex_gamename" xy="61,84" size="250,42" font="Microsoft YaHei" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" strokeColor="#053691" strokeSize="2" autoClearText="true" text="红中麻将">
       <relation target="" sidePair="center-center,top-top%"/>
     </text>
-    <text id="n54_hugj" name="tex_limit" xy="172,161" size="28,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
+    <text id="n54_hugj" name="tex_limit" xy="172,161" size="27,26" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n60_ufim" name="n60" src="ilon7i9w" fileName="images/room/Ellipse 13.png" xy="169,156">

wb_new_ui/assets/NewGroup/component/Lst_room/Play_room3.xml

@@ -2,7 +2,7 @@
 <component size="380,270" extention="Button">
   <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n42_10snh" name="desk" src="iaes7idk" fileName="component/Lst_room/Gcm_Play_desk3.xml" xy="40,4" size="300,279"/>
+    <component id="n42_10snh" name="desk" src="iaes7idk" fileName="component/Lst_room/Gcm_Play_desk3.xml" xy="41,1" size="300,279"/>
     <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="147,144" size="104,126" scale="0.7,0.7" visible="false">
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46h60mhyq"/>
@@ -14,7 +14,7 @@
     <text id="n58_ufim" name="tex_gamename" xy="80,86" size="204,42" font="Microsoft YaHei" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
       <relation target="" sidePair="center-center,top-top%"/>
     </text>
-    <text id="n59_ufim" name="tex_limit" xy="177,175" size="15,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="0">
+    <text id="n59_ufim" name="tex_limit" xy="177,175" size="15,26" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="0">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="n60_ufim" sidePair="top-top"/>
     </text>

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

@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="233,91" extention="Button" hitTest="n1_eeqm">
-  <controller name="button" pages="0,up,1,down" selected="0">
-    <action type="change_page" fromPage="0,1" toPage="0,1" controller="show" targetPage="~1"/>
-  </controller>
-  <controller name="show" homePageType="specific" homePage="1" pages="0,,1," selected="1"/>
-  <controller name="arrow" pages="0,,1," selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="show" homePageType="specific" homePage="1" pages="0,,1," selected="0"/>
+  <controller name="isLine" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n3_ovii" name="n3" src="oviii11" fileName="component/nav/button_08.png" xy="5,3">
+    <image id="n3_ovii" name="n3" src="oviii11" fileName="component/nav/button_08.png" xy="5,3" size="198,78">
       <gearDisplay controller="show" pages="1"/>
     </image>
-    <image id="n1_eeqm" name="n1" src="t1hqhxz" fileName="component/nav/match_left_btn_selected.png" xy="0,0">
+    <image id="n1_eeqm" name="n1" src="t1hqhxz" fileName="component/nav/match_left_btn_selected.png" xy="0,0" size="213,92">
       <gearDisplay controller="show" pages="0"/>
     </image>
-    <text id="n2_eeqm" name="text_name" xy="21,43" size="145,39" font="Microsoft YaHei" fontSize="28" color="#c84600" align="center" vAlign="middle" bold="true" singleLine="true" autoClearText="true" text="ID:123456">
-      <gearColor controller="show" pages="0,1" values="#ffffff,#c84600|#c84600,#c84600"/>
+    <text id="n2_eeqm" name="text_name" xy="38,38" size="106,39" font="Microsoft YaHei" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" singleLine="true" autoClearText="true" text="123456">
+      <gearColor controller="show" pages="0,1" values="#ffffff,#c84600|#fff6d9,#c84600"/>
     </text>
-    <text id="n4_eany" name="text_id" xy="8,3" size="196,42" font="Microsoft YaHei" fontSize="28" color="#c84600" vAlign="middle" leading="0" autoSize="none" bold="true" autoClearText="true" text="成员列表人一二三">
-      <gearColor controller="show" pages="0,1" values="#ffffff,#c84600|#c84600,#c84600"/>
+    <text id="n4_eany" name="text_id" xy="38,6" size="157,42" font="Microsoft YaHei" fontSize="28" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" autoClearText="true" text="成员列表人一二三">
+      <gearColor controller="show" pages="0,1" values="#ffffff,#c84600|#fff6d9,#c84600"/>
     </text>
     <list id="n6_yvb2" name="list" xy="1,87" size="231,0" overflow="hidden" lineGap="-6" defaultItem="ui://m7iejg46t1hqhxw"/>
     <graph id="n8_yvb2" name="area" xy="0,0" size="232,81" type="rect" lineSize="0" fillColor="#00ffffff"/>
-    <image id="n9_gdye" name="n9" src="gdye7ik7" fileName="component/nav/Polygon 7.png" xy="170,30" pivot="0.5,0.5" rotation="180" color="#ff0000">
-      <gearDisplay controller="arrow" pages="1"/>
-    </image>
+    <text id="n11_t8gf" name="text_lev" xy="4,4" size="34,76" font="Microsoft YaHei" fontSize="32" color="#ffedcf" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="9">
+      <gearDisplay controller="show" pages="1"/>
+    </text>
+    <component id="n14_t8gf" name="n14" src="xt5s7iia" fileName="mgr/component/member/partner/btn_mul.xml" xy="181,36" size="20,15" touchable="false">
+      <Button icon="ui://m7iejg46t8gf7ikg" selectedIcon="ui://m7iejg46t8gf7ikh" controller="isLine" page="1"/>
+    </component>
   </displayList>
   <Button mode="Check"/>
   <relation target="n6_yvb2" sidePair="bottomext-bottom"/>

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

@@ -15,9 +15,9 @@
       <gearDisplay controller="button" pages="1"/>
       <gearColor controller="button" default="#ffffff,#c84600"/>
     </text>
-    <text id="n4_eany" name="title2" xy="5,3" size="193,79" font="Microsoft YaHei" fontSize="32" color="#c84600" align="center" vAlign="middle" leading="0" autoSize="shrink" bold="true" autoClearText="true" text="成员列表人一">
+    <text id="n4_eany" name="title2" xy="5,3" size="193,79" font="Microsoft YaHei" fontSize="32" color="#fff6d9" align="center" vAlign="middle" leading="0" autoSize="shrink" bold="true" autoClearText="true" text="成员列表人一">
       <gearDisplay controller="button" pages="0"/>
-      <gearColor controller="button" default="#c84600,#c84600"/>
+      <gearColor controller="button" pages="0" values="#fff6d9,#c84600" default="#c84600,#c84600"/>
     </text>
   </displayList>
   <Button mode="Check"/>

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

@@ -5,7 +5,7 @@
     <image id="n4_yvb2" name="n4" src="yvb27ijv" fileName="component/nav/Group 882.png" xy="0,0" grayed="true">
       <gearLook controller="button" pages="0,1" values="1,0,1,0|1,0,0,0"/>
     </image>
-    <text id="n2_eeqm" name="title" xy="9,4" size="161,62" grayed="true" font="ui://m7iejg46eany7iev" fontSize="32" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="成员列表">
+    <text id="n2_eeqm" name="title" xy="9,4" size="161,62" grayed="true" font="ui://m7iejg46eany7iev" fontSize="32" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="个人战绩">
       <gearLook controller="button" pages="0,1" values="1,0,1,0|1,0,0,0"/>
     </text>
     <text id="n5_yvb2" name="title2" xy="97,46" size="51,42" visible="false" fontSize="30" text="title"/>

wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750">
-  <controller name="owner" pages="0,,1," selected="1"/>
+  <controller name="owner" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n13_vyn3" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" pkg="27vd145b" xy="77,33" size="1180,684">
       <relation target="" sidePair="width-width,height-height"/>
@@ -23,7 +23,7 @@
     </component>
     <component id="n4_poe8" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1173,7" controller="style,0">
       <relation target="" sidePair="right-right,top-top"/>
-      <Button icon="ui://27vd145bm0eibv"/>
+      <Button icon="ui://m7iejg46ilon7iax"/>
     </component>
     <image id="n6_y6xi" name="n6" pkg="m7iejg46" src="y6xii1r" fileName="玩法01_PxCook.png" xy="-216,0" visible="false" alpha="0.5"/>
   </displayList>

wb_new_ui/assets/NewGroup/mgr/View_GroupMemberHpList.xml

@@ -84,6 +84,6 @@
       <item/>
       <item/>
     </list>
-    <component id="n134_ilon" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="1338,-14"/>
+    <component id="n134_ilon" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="1285,-12" aspect="true"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml

@@ -12,49 +12,59 @@
     <image id="n136_nunk" name="n136" src="nunk7ij0" fileName="mgr/imgs/Rectangle 173.png" xy="505,112" size="90,90" group="n139_nunk"/>
     <image id="n135_nunk" name="n135" src="nunk7ij0" fileName="mgr/imgs/Rectangle 173.png" xy="385,112" size="90,90" group="n139_nunk"/>
     <image id="n134_nunk" name="n134" src="nunk7ij0" fileName="mgr/imgs/Rectangle 173.png" xy="265,112" size="90,90" group="n139_nunk"/>
-    <component id="n61_jd7v" name="btn_del" src="ilon7iaq" fileName="mgr/component/addMenberAlone/btn_del.xml" xy="147,546" size="210,80" group="n64_jd7v">
-      <Button title="删除" titleFontSize="1" icon="ui://27vd145bl7wn7iiq"/>
-    </component>
-    <component id="n63_jd7v" name="btn_ok" src="ilon7iar" fileName="mgr/component/addMenberAlone/btn_ok.xml" xy="637,546" size="210,80" group="n64_jd7v">
-      <Button title="确认" titleFontSize="1" icon="ui://27vd145bl7wn7iip"/>
-    </component>
-    <component id="n100_ovii" name="btn_1" src="ilon7iag" fileName="mgr/component/addMenberAlone/btn_1.xml" xy="147,235" size="210,80" group="n64_jd7v">
-      <Button title="1" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <component id="n101_ovii" name="btn_2" src="ilon7iah" fileName="mgr/component/addMenberAlone/btn_2.xml" xy="392,235" size="210,80" group="n64_jd7v">
-      <Button title="2" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <component id="n102_ovii" name="btn_3" src="ilon7iai" fileName="mgr/component/addMenberAlone/btn_3.xml" xy="637,235" size="210,80" group="n64_jd7v">
-      <Button title="3" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <component id="n103_ovii" name="btn_4" src="ilon7iaj" fileName="mgr/component/addMenberAlone/btn_4.xml" xy="147,338" size="210,80" group="n64_jd7v">
-      <Button title="4" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <component id="n104_ovii" name="btn_5" src="ilon7iak" fileName="mgr/component/addMenberAlone/btn_5.xml" xy="392,338" size="210,80" group="n64_jd7v">
-      <Button title="5" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <component id="n105_ovii" name="btn_6" src="ilon7ial" fileName="mgr/component/addMenberAlone/btn_6.xml" xy="637,338" size="210,80" group="n64_jd7v">
-      <Button title="6" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <component id="n106_ovii" name="btn_7" src="ilon7iam" fileName="mgr/component/addMenberAlone/btn_7.xml" xy="147,442" size="210,80" group="n64_jd7v">
-      <Button title="7" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <component id="n107_ovii" name="btn_8" src="ilon7ian" fileName="mgr/component/addMenberAlone/btn_8.xml" xy="392,442" size="210,80" group="n64_jd7v">
-      <Button title="8" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <component id="n108_ovii" name="btn_9" src="ilon7iao" fileName="mgr/component/addMenberAlone/btn_9.xml" xy="637,442" size="210,80" group="n64_jd7v">
-      <Button title="9" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <component id="n110_ovii" name="btn_0" src="ilon7iap" fileName="mgr/component/addMenberAlone/btn_0.xml" xy="392,546" size="210,80" group="n64_jd7v">
-      <Button title="0" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
-    </component>
-    <group id="n64_jd7v" name="input_panel" xy="147,235" size="700,391" group="n68_jd7v"/>
     <image id="n109_ovii" name="n109" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="77,117" size="629,78" group="n67_jd7v" visible="false"/>
     <text id="n66_jd7v" name="tex_num" xy="168,108" size="737,99" group="n67_jd7v" font="Microsoft YaHei" fontSize="48" color="#495f55" vAlign="middle" leading="2" letterSpacing="92" autoSize="none" bold="true" autoClearText="true" text="123564"/>
     <group id="n67_jd7v" name="show" xy="77,108" size="828,99" group="n68_jd7v"/>
-    <group id="n68_jd7v" name="n68" xy="77,108" size="828,518" advanced="true">
+    <component id="n163_t8gf" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="144,550" size="197,86" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="删除" titleFontSize="1" icon="ui://27vd145bl7wn7iiq"/>
+    </component>
+    <component id="n164_t8gf" name="btn_ok" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="630,550" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="确认" titleFontSize="1" icon="ui://27vd145bl7wn7iip"/>
+    </component>
+    <component id="n165_t8gf" name="btn_1" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="144,239" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="1" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <component id="n166_t8gf" name="btn_2" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="387,239" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="2" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <component id="n167_t8gf" name="btn_3" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="630,239" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="3" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <component id="n168_t8gf" name="btn_4" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="144,343" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="4" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <component id="n169_t8gf" name="btn_5" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="387,343" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="5" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <component id="n170_t8gf" name="btn_6" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="630,343" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="6" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <component id="n171_t8gf" name="btn_7" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="144,450" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="7" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <component id="n172_t8gf" name="btn_8" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="387,450" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="8" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <component id="n173_t8gf" name="btn_9" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="630,450" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="9" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <component id="n174_t8gf" name="btn_0" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="387,550" size="193,85" group="n185_t8gf" scale="1.05,1.05">
+      <Button title="0" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    </component>
+    <image id="n175_t8gf" name="n175" src="b8zx7i50" fileName="font/images/btn_keyboard/shuzi_01.png" pkg="27vd145b" xy="471,575" size="24,35" group="n185_t8gf"/>
+    <image id="n176_t8gf" name="n176" src="b8zx7i51" fileName="font/images/btn_keyboard/shuzi_02.png" pkg="27vd145b" xy="232,264" size="16,34" group="n185_t8gf"/>
+    <image id="n177_t8gf" name="n177" src="b8zx7i52" fileName="font/images/btn_keyboard/shuzi_03.png" pkg="27vd145b" xy="471,264" size="24,34" group="n185_t8gf"/>
+    <image id="n178_t8gf" name="n178" src="b8zx7i53" fileName="font/images/btn_keyboard/shuzi_04.png" pkg="27vd145b" xy="714,264" size="24,35" group="n185_t8gf"/>
+    <image id="n179_t8gf" name="n179" src="b8zx7i54" fileName="font/images/btn_keyboard/shuzi_05.png" pkg="27vd145b" xy="227,368" size="26,34" group="n185_t8gf"/>
+    <image id="n180_t8gf" name="n180" src="b8zx7i55" fileName="font/images/btn_keyboard/shuzi_06.png" pkg="27vd145b" xy="471,368" size="24,35" group="n185_t8gf"/>
+    <image id="n181_t8gf" name="n181" src="b8zx7i56" fileName="font/images/btn_keyboard/shuzi_07.png" pkg="27vd145b" xy="714,368" size="25,35" group="n185_t8gf"/>
+    <image id="n182_t8gf" name="n182" src="b8zx7i57" fileName="font/images/btn_keyboard/shuzi_08.png" pkg="27vd145b" xy="229,475" size="23,34" group="n185_t8gf"/>
+    <image id="n183_t8gf" name="n183" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" pkg="27vd145b" xy="471,475" size="25,35" group="n185_t8gf"/>
+    <image id="n184_t8gf" name="n184" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" pkg="27vd145b" xy="714,475" size="24,35" group="n185_t8gf"/>
+    <group id="n185_t8gf" name="input_panel" xy="144,239" size="679,397" group="n68_jd7v"/>
+    <group id="n68_jd7v" name="n68" xy="77,108" size="828,528" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <component id="n131_ilon" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="858,-17" size="124,118"/>
+    <component id="n131_ilon" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="846,-7" size="124,118"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1132,550">
+<component size="1132,570">
   <controller name="search" pages="0,,1," selected="0"/>
   <controller name="page" pages="0,,1,,2," selected="0"/>
   <controller name="mng" pages="0,,1," selected="0"/>
@@ -11,37 +11,37 @@
     <component id="n113_csp4" name="n50" src="csp47i4x" fileName="buttons/Btn_menu_r.xml" pkg="27vd145b" xy="599,-91" visible="false">
       <Button title="添加成员" controller="page" page="2"/>
     </component>
-    <image id="n134_yscl" name="n134" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1137,554">
+    <image id="n134_yscl" name="n134" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1137,574">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <component id="n51_jd7v" name="n51" src="eeqmch0" fileName="buttons/Btn_menu_v.xml" pkg="27vd145b" xy="169,-299">
       <gearDisplay controller="mng" pages="1"/>
       <Button title="全部队员" controller="page" page="1"/>
     </component>
-    <image id="n115_csp4" name="n115" src="csp47i44" fileName="component/nav/sd.png" xy="29,11" size="1093,56" group="n89_t1hq">
+    <image id="n115_csp4" name="n115" src="csp47i44" fileName="component/nav/sd.png" xy="29,3" 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" bold="true" text="玩家昵称">
+    <text id="n83_t1hq" name="n83" xy="22,8" 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="231,17" size="166,42" group="n88_t1hq" visible="false" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" bold="true" text="总场次">
+    <text id="n91_task" name="n91" xy="231,9" size="166,42" group="n88_t1hq" visible="false" 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="371,17" size="164,42" group="n88_t1hq" visible="false" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" autoSize="none" bold="true" text="上级">
+    <text id="n85_t1hq" name="n85" xy="371,9" size="164,42" group="n88_t1hq" visible="false" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" autoSize="none" bold="true" text="上级">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n87_t1hq" name="n87" xy="575,16" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" bold="true" text="最后登录时间">
+    <text id="n87_t1hq" name="n87" xy="575,8" 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="状态">
+    <text id="n86_t1hq" name="n86" xy="776,13" 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" visible="false" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" text="总线疲劳值">
+    <text id="n142_ufim" name="n142" xy="845,8" 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"/>
-    <group id="n89_t1hq" name="col" xy="22,11" size="1100,56" group="n45_tqi8"/>
-    <list id="n2_kwi0" name="lst_member" xy="20,65" size="1091,471" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" colGap="5" defaultItem="ui://m7iejg46z3847i6q" autoClearItems="true">
+    <group id="n88_t1hq" name="n88" xy="22,8" size="989,47" group="n89_t1hq" advanced="true"/>
+    <group id="n89_t1hq" name="col" xy="22,3" size="1100,56" group="n45_tqi8"/>
+    <list id="n2_kwi0" name="lst_member" xy="20,65" size="1091,500" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" colGap="5" defaultItem="ui://m7iejg46z3847i6q" autoClearItems="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -51,7 +51,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n90_tyis" name="lst_member_find" xy="26,83" size="1091,455" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" colGap="5" defaultItem="ui://m7iejg46z3847i6q" autoClearItems="true">
+    <list id="n90_tyis" name="lst_member_find" xy="26,65" size="1091,500" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" colGap="5" defaultItem="ui://m7iejg46z3847i6q" autoClearItems="true">
       <gearDisplay controller="search" pages="1"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -61,7 +61,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n45_tqi8" name="n45" xy="20,11" size="1102,527" group="n49_jd7v"/>
+    <group id="n45_tqi8" name="n45" xy="20,3" size="1102,562" group="n49_jd7v"/>
     <component id="n20_kwi0" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="1006,16" size="71,54" group="n49_jd7v">
       <gearDisplay controller="search" pages="1"/>
       <Button controller="search" page="0"/>
@@ -83,7 +83,7 @@
         <item title="离线状态" value="0"/>
       </ComboBox>
     </component>
-    <image id="n133_yscl" name="n133" src="yscl7ic0" fileName="images/allNumber/Group 585.png" xy="286,-110" size="369,97" group="n46_tqi8">
+    <image id="n133_yscl" name="n133" src="yscl7ic0" fileName="images/allNumber/Group 585.png" xy="241,-114" size="448,117" group="n46_tqi8">
       <relation target="" sidePair="center-center%,top-top%"/>
     </image>
     <image id="n135_btip" name="n135" src="yscl7iby" fileName="images/allNumber/Group 583.png" xy="673,-90" size="225,66" group="n137_btip"/>
@@ -93,8 +93,11 @@
     <group id="n141_btip" name="n141" xy="673,-90" size="385,72" group="n46_tqi8" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <group id="n46_tqi8" name="n46" xy="286,-110" size="854,158" group="n49_jd7v"/>
-    <group id="n49_jd7v" name="n49" xy="20,-110" size="1120,648" advanced="true">
+    <image id="n143_t8gf" name="n143" src="t8gf7iki" fileName="images/Rectangle 444.png" xy="-1,-12" size="13,582" group="n46_tqi8">
+      <relation target="" sidePair="height-height%"/>
+    </image>
+    <group id="n46_tqi8" name="n46" xy="-1,-114" size="1141,684" group="n49_jd7v"/>
+    <group id="n49_jd7v" name="n49" xy="-1,-114" size="1141,684" advanced="true">
       <gearDisplay controller="page" pages="0,1"/>
     </group>
     <component id="n61_jd7v" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="249,410" size="193,85" group="n64_jd7v">

wb_new_ui/assets/NewGroup/mgr/View_GroupMenKang.xml

@@ -2,8 +2,8 @@
 <component size="1396,690">
   <controller name="search" pages="0,,1," selected="0"/>
   <controller name="page" pages="0,,1,,2," selected="0"/>
-  <controller name="mng" pages="0,,1," selected="1"/>
-  <controller name="set" pages="0,,1," selected="1"/>
+  <controller name="mng" pages="0,,1," selected="0"/>
+  <controller name="set" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n133_ilon" name="n133" src="imp57igz" fileName="images/Group 759.png" xy="0,-3" size="1396,694"/>
     <component id="n20_kwi0" name="btn_back" src="ilon7ibk" fileName="mgr/component/numberHpAlone/Btn_back1.xml" xy="1273,105" size="71,54" group="n49_jd7v">
@@ -82,7 +82,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n134_ilon" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="1338,-14"/>
+    <component id="n134_ilon" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="1285,-11"/>
     <component id="n152_imp5" name="n152" src="imp57ih2" fileName="btn_bg.xml" xy="-239,-197" size="1892,1110" group="n151_imp5">
       <gearDisplay controller="set" pages="1"/>
       <relation target="" sidePair="width-width%,height-height%,center-center,middle-middle"/>

wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1132,550">
-  <controller name="search" pages="0,,1," selected="0"/>
+<component size="1132,570">
+  <controller name="search" pages="0,,1," selected="1"/>
   <controller name="page" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n136_iaes" name="n136" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1132,550">
+    <image id="n136_iaes" name="n136" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1132,570">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n134_b8zx" name="n134" src="iaes7ick" fileName="images/allNumber/Group 626.png" xy="28,2" size="1063,56">
@@ -15,35 +15,35 @@
     <component id="n79_nk4v" name="n79" src="eeqmch0" fileName="buttons/Btn_menu_v.xml" pkg="27vd145b" xy="243,-110" visible="false">
       <Button title="添加合伙人" controller="page" page="1"/>
     </component>
-    <image id="n135_vyn3" name="n135" src="dfkc7i4w" fileName="images/kuang2.png" xy="675,474" group="n73_cioe" visible="false"/>
-    <graph id="n111_myu9" name="n111" xy="638,479" size="276,50" group="n73_cioe" visible="false" type="rect" lineSize="0" fillColor="#ff163972" corner="12,12,12,12"/>
-    <text id="n72_cioe" name="tex_id" xy="689,474" size="252,59" group="n73_cioe" visible="false" font="Microsoft YaHei" fontSize="25" color="#724b25" align="center" vAlign="middle" autoSize="none" singleLine="true" text="" input="true" prompt="输入玩家ID或昵称" maxLength="8"/>
-    <group id="n73_cioe" name="n73" xy="638,474" size="327,59" group="n74_cioe"/>
-    <component id="n12_gls1" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="977,475" group="n13_gls1"/>
-    <group id="n13_gls1" name="n13" xy="977,475" size="114,58" group="n74_cioe" visible="false" advanced="true"/>
-    <group id="n74_cioe" name="n74" xy="638,474" size="453,59" group="n77_nk4v" advanced="true">
+    <image id="n135_vyn3" name="n135" src="dfkc7i4w" fileName="images/kuang2.png" xy="675,474" size="236,97" group="n73_cioe" visible="false"/>
+    <graph id="n111_myu9" name="n111" xy="638,479" size="276,81" group="n73_cioe" visible="false" type="rect" lineSize="0" fillColor="#ff163972" corner="12,12,12,12"/>
+    <text id="n72_cioe" name="tex_id" xy="689,474" size="252,90" group="n73_cioe" visible="false" font="Microsoft YaHei" fontSize="25" color="#724b25" align="center" vAlign="middle" autoSize="none" singleLine="true" text="" input="true" prompt="输入玩家ID或昵称" maxLength="8"/>
+    <group id="n73_cioe" name="n73" xy="638,474" size="327,90" group="n74_cioe"/>
+    <component id="n12_gls1" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="977,475" size="138,105" group="n13_gls1"/>
+    <group id="n13_gls1" name="n13" xy="977,475" size="114,89" group="n74_cioe" visible="false" advanced="true"/>
+    <group id="n74_cioe" name="n74" xy="638,474" size="453,90" group="n77_nk4v" advanced="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="center-center%"/>
     </group>
-    <image id="n98_yetw" name="n98" src="ivzcchb" fileName="font/images/win/dbt.png" pkg="27vd145b" xy="-33,-22" size="1114,51" group="n20_gls1" visible="false"/>
-    <text id="n99_sbng" name="n99" xy="87,13" size="98,34" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="玩家信息">
+    <image id="n98_yetw" name="n98" src="ivzcchb" fileName="font/images/win/dbt.png" pkg="27vd145b" xy="-33,-22" size="1114,82" group="n20_gls1" visible="false"/>
+    <text id="n99_sbng" name="n99" xy="87,13" size="100,65" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="玩家信息">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n101_sbng" name="n101" xy="291,14" size="122,34" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="玩牌总场数">
+    <text id="n101_sbng" name="n101" xy="291,14" size="124,65" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="玩牌总场数">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n103_sbng" name="n103" xy="529,13" size="51,34" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="分组">
+    <text id="n103_sbng" name="n103" xy="529,13" size="52,65" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="分组">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n105_sbng" name="n105" xy="721,13" size="75,34" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="操作人">
+    <text id="n105_sbng" name="n105" xy="721,13" size="76,65" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="操作人">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n107_sbng" name="n107" xy="941,13" size="98,34" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="退出时间">
+    <text id="n107_sbng" name="n107" xy="941,13" size="100,65" group="n108_sbng" font="Microsoft YaHei" fontSize="24" color="#367256" text="退出时间">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <group id="n108_sbng" name="n108" xy="87,13" size="952,35" group="n20_gls1"/>
-    <group id="n20_gls1" name="col" xy="-33,-22" size="1114,70" group="n77_nk4v" visible="false" advanced="true"/>
-    <list id="n21_gls1" name="lst_partner" xy="25,55" size="1079,479" group="n77_nk4v" overflow="scroll" defaultItem="ui://m7iejg46z3847i6s" autoClearItems="true">
+    <group id="n108_sbng" name="n108" xy="87,13" size="952,66" group="n20_gls1"/>
+    <group id="n20_gls1" name="col" xy="-33,-22" size="1114,101" group="n77_nk4v" visible="false" advanced="true"/>
+    <list id="n21_gls1" name="lst_partner" xy="25,55" size="1079,510" group="n77_nk4v" overflow="scroll" defaultItem="ui://m7iejg46z3847i6s" autoClearItems="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -56,7 +56,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n109_tyis" name="lst_partner_search" xy="25,65" size="1079,466" group="n77_nk4v" overflow="scroll" defaultItem="ui://m7iejg46z3847i6s" autoClearItems="true">
+    <list id="n109_tyis" name="lst_partner_search" xy="25,62" size="1079,500" group="n77_nk4v" overflow="scroll" defaultItem="ui://m7iejg46z3847i6s" autoClearItems="true">
       <gearDisplay controller="search" pages="1"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -69,10 +69,10 @@
       <item/>
       <item/>
     </list>
-    <component id="n75_cioe" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="912,-66" group="n77_nk4v">
+    <component id="n75_cioe" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="912,-66" size="80,83" group="n77_nk4v">
       <gearDisplay controller="search" pages="1"/>
     </component>
-    <group id="n77_nk4v" name="n77" xy="-33,-66" size="1137,600" advanced="true">
+    <group id="n77_nk4v" name="n77" xy="-33,-66" size="1137,631" advanced="true">
       <gearDisplay controller="page" pages="0"/>
     </group>
     <component id="n114_yre9" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="169,408" group="n126_yre9">
@@ -120,5 +120,8 @@
       <relation target="" sidePair="center-center%"/>
     </group>
     <image id="n133_et16" name="n133" pkg="m7iejg46" src="et167i37" fileName="成员3.png" xy="-542,-210" visible="false" alpha="0.5"/>
+    <image id="n137_t8gf" name="n137" src="t8gf7iki" fileName="images/Rectangle 444.png" xy="-1,-14" size="13,585">
+      <relation target="" sidePair="height-height%"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml

@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1135,559">
+<component size="1135,573">
   <controller name="type" pages="0,,1,,2," selected="0"/>
   <controller name="mng" pages="0,,1," selected="0"/>
-  <controller name="search" pages="0,,1," selected="1"/>
+  <controller name="search" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n229_yvb2" name="n229" src="imp57iho" fileName="images/Rectangle 343.png" xy="0,0" size="1135,559"/>
-    <list id="n184_b5ny" name="lst_mgr_index" xy="77,-177" size="612,53" group="n83_kwi0" visible="false" layout="row" overflow="hidden" colGap="1" defaultItem="ui://27vd145beeqmch0" selectionController="type">
+    <image id="n229_yvb2" name="n229" src="imp57iho" fileName="images/Rectangle 343.png" xy="0,0" size="1135,559" visible="false"/>
+    <image id="n241_t8gf" name="n241" src="t8gf7iki" fileName="images/Rectangle 444.png" xy="1,-13" size="13,526"/>
+    <image id="n242_t8gf" name="n242" src="t8gf7ikj" fileName="images/Rectangle 350.png" xy="0,502" size="1134,71"/>
+    <list id="n184_b5ny" name="lst_mgr_index" xy="78,-177" size="612,53" group="n83_kwi0" visible="false" layout="row" overflow="hidden" colGap="1" defaultItem="ui://27vd145beeqmch0" selectionController="type">
       <relation target="" sidePair="center-center%"/>
       <item url="ui://27vd145bjoap7i6d"/>
       <item url="ui://27vd145bjoap7i6f"/>
       <item url="ui://27vd145bjoap7i6e"/>
     </list>
-    <component id="n218_yvb2" name="btn_search1" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="649,492" size="141,60" group="n223_yvb2" scale="0.8,0.9" visible="false"/>
-    <component id="n219_yvb2" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="6,493" size="287,61" group="n222_yvb2"/>
-    <text id="n220_yvb2" name="n220" xy="303,500" size="30,48" group="n222_yvb2" font="Microsoft YaHei" fontSize="24" color="#ffffff" autoSize="none" text="至"/>
-    <component id="n221_yvb2" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="336,493" size="287,61" group="n222_yvb2"/>
-    <group id="n222_yvb2" name="n222" xy="6,493" size="617,61" group="n223_yvb2"/>
-    <group id="n223_yvb2" name="panel_search" xy="6,492" size="784,62" group="n83_kwi0" advanced="true"/>
-    <group id="n83_kwi0" name="index2" xy="6,-177" size="784,731" advanced="true"/>
-    <list id="n82_kwi0" name="lst_record" xy="7,65" size="1126,421" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46yvb27ijw" autoClearItems="true">
+    <component id="n218_yvb2" name="btn_search1" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="650,508" size="141,60" group="n223_yvb2" scale="0.8,0.9" visible="false"/>
+    <component id="n219_yvb2" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="7,509" size="287,61" group="n222_yvb2"/>
+    <text id="n220_yvb2" name="n220" xy="304,516" size="30,48" group="n222_yvb2" font="Microsoft YaHei" fontSize="24" color="#ffffff" autoSize="none" text="至"/>
+    <component id="n221_yvb2" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="337,509" size="287,61" group="n222_yvb2"/>
+    <group id="n222_yvb2" name="n222" xy="7,509" size="617,61" group="n223_yvb2"/>
+    <group id="n223_yvb2" name="panel_search" xy="7,508" size="784,62" group="n83_kwi0" advanced="true"/>
+    <group id="n83_kwi0" name="index2" xy="7,-177" size="784,747" advanced="true"/>
+    <list id="n82_kwi0" name="lst_record" xy="19,65" size="1114,427" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46yvb27ijw" autoClearItems="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -35,48 +37,48 @@
       <item/>
     </list>
     <image id="n181_b8zx" name="n181" pkg="m7iejg46" src="b8zx7i4g" fileName="合伙人统计.png" xy="-250,-145" visible="false" alpha="0.5"/>
-    <image id="n210_yvb2" name="n210" src="csp47i44" fileName="component/nav/sd.png" xy="1,0" size="1122,60" group="n216_yvb2">
+    <image id="n210_yvb2" name="n210" src="csp47i44" fileName="component/nav/sd.png" xy="20,0" size="1103,60" group="n216_yvb2">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n217_yvb2" name="n217" xy="-37,4" size="263,51" group="n215_yvb2" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="姓名">
+    <text id="n217_yvb2" name="n217" xy="-32,4" size="263,51" group="n215_yvb2" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="姓名">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n211_yvb2" name="n211" xy="246,4" size="263,51" group="n215_yvb2" visible="false" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="输赢比赛分">
+    <text id="n211_yvb2" name="n211" xy="251,4" size="263,51" group="n215_yvb2" visible="false" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="输赢比赛分">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n212_yvb2" name="n212" xy="439,4" size="262,51" group="n215_yvb2" visible="false" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="人次">
+    <text id="n212_yvb2" name="n212" xy="444,4" size="262,51" group="n215_yvb2" visible="false" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="人次">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n213_yvb2" name="n213" xy="631,4" size="257,51" group="n215_yvb2" visible="false" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="大赢家">
+    <text id="n213_yvb2" name="n213" xy="636,4" size="257,51" group="n215_yvb2" visible="false" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="大赢家">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n214_yvb2" name="n214" xy="844,4" size="268,51" group="n215_yvb2" visible="false" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="赠送分 ">
+    <text id="n214_yvb2" name="n214" xy="849,4" size="268,51" group="n215_yvb2" visible="false" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="赠送分 ">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <component id="n231_yvb2" name="btn_totalWin" src="yvb27ijz" fileName="mgr/component/member/partner/btn_sort_3.xml" xy="314,2" group="n215_yvb2"/>
-    <component id="n232_yvb2" name="btn_totalRound" src="yvb27ijz" fileName="mgr/component/member/partner/btn_sort_3.xml" xy="540,2" size="106,55" group="n215_yvb2">
+    <component id="n231_yvb2" name="btn_totalWin" src="yvb27ijz" fileName="mgr/component/member/partner/btn_sort_3.xml" xy="319,2" group="n215_yvb2"/>
+    <component id="n232_yvb2" name="btn_totalRound" src="yvb27ijz" fileName="mgr/component/member/partner/btn_sort_3.xml" xy="545,2" size="106,55" group="n215_yvb2">
       <Button title="场次"/>
     </component>
-    <component id="n233_yvb2" name="btn_total" src="yvb27ijz" fileName="mgr/component/member/partner/btn_sort_3.xml" xy="722,2" size="132,55" group="n215_yvb2">
+    <component id="n233_yvb2" name="btn_total" src="yvb27ijz" fileName="mgr/component/member/partner/btn_sort_3.xml" xy="727,2" size="132,55" group="n215_yvb2">
       <Button title="大赢家"/>
     </component>
-    <component id="n234_yvb2" name="btn_reward" src="yvb27ijz" fileName="mgr/component/member/partner/btn_sort_3.xml" xy="936,2" size="132,55" group="n215_yvb2">
+    <component id="n234_yvb2" name="btn_reward" src="yvb27ijz" fileName="mgr/component/member/partner/btn_sort_3.xml" xy="941,2" size="132,55" group="n215_yvb2">
       <Button title="赠送分"/>
     </component>
-    <component id="n235_gdye" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="659,-81" size="71,54" group="n215_yvb2">
+    <component id="n235_gdye" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="664,-81" size="71,54" group="n215_yvb2">
       <gearDisplay controller="search" pages="1"/>
       <Button controller="search" page="0"/>
     </component>
-    <image id="n236_gdye" name="n236" src="yscl7iby" fileName="images/allNumber/Group 583.png" xy="748,-91" size="220,71" group="n238_gdye"/>
-    <text id="n237_gdye" name="tex_id" xy="750,-92" size="215,71" group="n238_gdye" font="Microsoft YaHei" fontSize="40" color="#2b2b2b" vAlign="middle" autoSize="shrink" bold="true" autoClearText="true" text="" input="true" prompt="请输入玩家id" maxLength="8"/>
-    <group id="n238_gdye" name="n238" xy="748,-92" size="220,72" group="n240_gdye" advanced="true"/>
-    <component id="n239_gdye" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="969,-90" group="n240_gdye"/>
-    <group id="n240_gdye" name="group_search" xy="748,-92" size="359,76" group="n215_yvb2" advanced="true">
+    <image id="n236_gdye" name="n236" src="yscl7iby" fileName="images/allNumber/Group 583.png" xy="641,-91" size="220,71" group="n238_gdye"/>
+    <text id="n237_gdye" name="tex_id" xy="643,-92" size="215,71" group="n238_gdye" font="Microsoft YaHei" fontSize="40" color="#2b2b2b" vAlign="middle" autoSize="shrink" bold="true" autoClearText="true" text="" input="true" prompt="请输入玩家id" maxLength="8"/>
+    <group id="n238_gdye" name="n238" xy="641,-92" size="220,72" group="n240_gdye" advanced="true"/>
+    <component id="n239_gdye" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="862,-90" group="n240_gdye"/>
+    <group id="n240_gdye" name="group_search" xy="641,-92" size="359,76" group="n215_yvb2" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <group id="n215_yvb2" name="n215" xy="-37,-92" size="1149,149" group="n216_yvb2" advanced="true">
+    <group id="n215_yvb2" name="n215" xy="-32,-92" size="1149,149" group="n216_yvb2" advanced="true">
       <gearDisplay controller="mng" pages="0"/>
     </group>
-    <group id="n216_yvb2" name="col" xy="-37,-92" size="1160,152"/>
+    <group id="n216_yvb2" name="col" xy="-32,-92" size="1155,152"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml

@@ -102,6 +102,6 @@
     <group id="n197_imp5" name="group_search" xy="920,119" size="359,76" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <component id="n198_imp5" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="1337,21"/>
+    <component id="n198_imp5" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="1285,24"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/View_GroupPersonStat.xml

@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1132,550">
+<component size="1132,573">
   <controller name="record" pages="0,,1," selected="0"/>
-  <controller name="type" pages="0,,1,,2," selected="0"/>
+  <controller name="type" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <image id="n142_m16m" name="n142" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1132,550">
+    <image id="n142_m16m" name="n142" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1132,573" visible="false">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
+    <image id="n145_t8gf" name="n145" src="t8gf7iki" fileName="images/Rectangle 444.png" xy="1,-13" size="13,486">
+      <relation target="" sidePair="height-height%"/>
+    </image>
+    <image id="n144_t8gf" name="n144" src="t8gf7ikj" fileName="images/Rectangle 350.png" xy="1,463" size="1132,110"/>
     <list id="n115_l679" name="lst_mgr_index" xy="-17,-89" size="650,78" group="n83_kwi0" visible="false" layout="row" overflow="hidden" colGap="1" defaultItem="ui://27vd145beeqmch0" selectionController="type">
       <item url="ui://m7iejg46eany7ie1" title="今天"/>
       <item url="ui://m7iejg46eany7ie2" title="昨天"/>
       <item url="ui://m7iejg46eany7ie3" title="前天"/>
     </list>
-    <component id="n117_l679" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="22,443" size="256,59" group="n104_kwi0"/>
-    <text id="n123_omkm" name="n123" xy="335,459" size="24,29" group="n104_kwi0" font="Microsoft YaHei" fontSize="20" color="#367256" align="center" vAlign="middle" text="至"/>
-    <component id="n119_l679" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="372,443" size="261,57" group="n104_kwi0"/>
-    <component id="n86_kwi0" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="658,435" size="129,67" group="n104_kwi0" visible="false"/>
-    <group id="n104_kwi0" name="panel_search" xy="22,435" size="765,67" group="n83_kwi0" advanced="true">
+    <component id="n117_l679" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="22,466" size="256,59" group="n104_kwi0"/>
+    <text id="n123_omkm" name="n123" xy="335,482" size="24,29" group="n104_kwi0" font="Microsoft YaHei" fontSize="20" color="#367256" align="center" vAlign="middle" text="至"/>
+    <component id="n119_l679" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="372,466" size="261,57" group="n104_kwi0"/>
+    <component id="n86_kwi0" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="658,458" size="129,67" group="n104_kwi0" visible="false"/>
+    <group id="n104_kwi0" name="panel_search" xy="22,458" size="765,67" group="n83_kwi0" advanced="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <group id="n83_kwi0" name="index2" xy="-17,-89" size="804,591" advanced="true">
+    <group id="n83_kwi0" name="index2" xy="-17,-89" size="804,614" advanced="true">
       <gearDisplay controller="record" pages="0"/>
     </group>
-    <list id="n82_kwi0" name="lst_record" xy="24,8" size="1079,426" group="n121_l679" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmc" autoClearItems="true">
+    <list id="n82_kwi0" name="lst_record" xy="24,8" size="1079,446" group="n121_l679" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmc" autoClearItems="true">
       <gearDisplay controller="record" pages="0"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -31,12 +35,12 @@
       <item/>
       <item/>
     </list>
-    <group id="n121_l679" name="record0" xy="24,8" size="1079,426"/>
+    <group id="n121_l679" name="record0" xy="24,8" size="1079,446"/>
     <component id="n111_kwi0" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="1012,484" size="80,61" group="n112_kwi0">
       <relation target="" sidePair="center-center%"/>
       <Button controller="record" page="0"/>
     </component>
-    <list id="n109_kwi0" name="lst_recordInfo" xy="26,7" size="1087,471" group="n112_kwi0" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmd" autoClearItems="true">
+    <list id="n109_kwi0" name="lst_recordInfo" xy="26,7" size="1087,449" group="n112_kwi0" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmd" autoClearItems="true">
       <relation target="" sidePair="width-width"/>
       <item/>
       <item/>
@@ -49,24 +53,25 @@
       <gearDisplay controller="record" pages="1"/>
     </group>
     <image id="n122_j120" name="n122" pkg="m7iejg46" src="j1207i2s" fileName="个人战绩统计_PxCook.png" xy="-545,-210" visible="false" alpha="0.5"/>
-    <text id="n133_k5m9" name="n133" xy="428,508" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="总场次：">
+    <text id="n133_k5m9" name="n133" xy="428,530" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="总场次：">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n134_k5m9" name="tex_winner_count" xy="509,510" size="107,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
+    <text id="n134_k5m9" name="tex_winner_count" xy="509,532" size="107,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n137_k5m9" name="n137" xy="29,507" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="总输赢：">
+    <text id="n137_k5m9" name="n137" xy="29,529" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="总输赢：">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n138_k5m9" name="tex_total_proportion" xy="110,509" size="148,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
+    <text id="n138_k5m9" name="tex_total_proportion" xy="110,531" size="148,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n139_k5m9" name="n139" xy="776,509" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="有效场：">
+    <text id="n139_k5m9" name="n139" xy="776,531" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="有效场：">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n140_k5m9" name="tex_valid_count" xy="858,511" size="88,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
+    <text id="n140_k5m9" name="tex_valid_count" xy="858,533" size="88,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <group id="n141_k5m9" name="n141" xy="29,507" size="917,38" advanced="true"/>
+    <group id="n141_k5m9" name="n141" xy="29,529" size="917,38" advanced="true"/>
+    <image id="n143_tt6k" name="n143" src="tt6k7ikc" fileName="images/Group 894.png" xy="291,-109"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/View_GroupPiLaoZhi.xml

@@ -89,7 +89,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n134_ilon" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="1333,-27"/>
+    <component id="n134_ilon" name="btn_close" src="ilon7ib9" fileName="mgr/component/numberHpAlone/btn_close.xml" xy="1285,-11"/>
     <list id="n145_imp5" name="lst_member2" xy="50,183" size="1320,519" group="n155_imp5" overflow="scroll" scrollBarFlags="2" lineGap="2" colGap="5" defaultItem="ui://m7iejg46imp57ih4" autoClearItems="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="width-width"/>

wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1132,550" designImageLayer="1">
+<component size="1132,573" designImageLayer="1">
   <displayList>
-    <image id="n100_m16m" name="n100" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1132,550"/>
+    <image id="n100_m16m" name="n100" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1132,550" visible="false"/>
+    <image id="n103_t8gf" name="n103" src="t8gf7iki" fileName="images/Rectangle 444.png" xy="1,-13" size="13,521">
+      <relation target="" sidePair="height-height%"/>
+    </image>
+    <image id="n102_t8gf" name="n102" src="t8gf7ikj" fileName="images/Rectangle 350.png" xy="0,496" size="1132,77"/>
     <image id="n94_b8zx" name="n94" src="csp47i44" fileName="component/nav/sd.png" xy="16,2" size="1099,63">
       <relation target="" sidePair="width-width"/>
     </image>
-    <list id="n80_kwi0" name="lst_consume_stat" xy="18,73" size="1095,393" overflow="scroll" defaultItem="ui://m7iejg46kwi0hm9" autoClearItems="true">
+    <list id="n80_kwi0" name="lst_consume_stat" xy="18,73" size="1095,418" overflow="scroll" defaultItem="ui://m7iejg46kwi0hm9" autoClearItems="true">
       <relation target="" sidePair="width-width"/>
       <item/>
       <item/>
@@ -31,10 +35,11 @@
       <relation target="" sidePair="center-center%"/>
     </text>
     <group id="n92_sbng" name="n92" xy="45,8" size="977,52"/>
-    <component id="n95_k5m9" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="189,479" group="n99_k5m9"/>
-    <image id="n96_k5m9" name="n96" src="m16m7ig8" fileName="component/Btn/date_set/Polygon 3.png" xy="487,490" size="34,42" group="n99_k5m9"/>
-    <component id="n97_k5m9" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="524,479" size="290,58" group="n99_k5m9"/>
-    <component id="n98_k5m9" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="824,476" group="n99_k5m9" visible="false"/>
-    <group id="n99_k5m9" name="n99" xy="189,476" size="773,74" advanced="true"/>
+    <component id="n95_k5m9" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="189,502" group="n99_k5m9"/>
+    <image id="n96_k5m9" name="n96" src="m16m7ig8" fileName="component/Btn/date_set/Polygon 3.png" xy="487,513" size="34,42" group="n99_k5m9"/>
+    <component id="n97_k5m9" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="524,502" size="290,58" group="n99_k5m9"/>
+    <component id="n98_k5m9" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="824,499" group="n99_k5m9" visible="false"/>
+    <group id="n99_k5m9" name="n99" xy="189,499" size="773,74" advanced="true"/>
+    <image id="n101_tt6k" name="n101" src="tt6k7ike" fileName="images/Group 896.png" xy="291,-110"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/View_GroupStat.xml

@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1132,625">
+<component size="1132,573">
   <controller name="record" pages="0,,1," selected="0"/>
-  <controller name="search" pages="0,,1,,2," selected="0"/>
+  <controller name="search" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <image id="n118_fcju" name="n118" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1131,567"/>
-    <component id="n113_kwi0" name="cb_type" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="56,480" size="215,51" group="n104_kwi0" controller="type,2">
+    <image id="n118_fcju" name="n118" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1131,567" visible="false"/>
+    <image id="n121_t8gf" name="n121" src="t8gf7iki" fileName="images/Rectangle 444.png" xy="1,-13" size="13,519">
+      <gearDisplay controller="record" pages="0"/>
+    </image>
+    <image id="n120_t8gf" name="n120" src="t8gf7ikj" fileName="images/Rectangle 350.png" xy="0,490" size="1132,83"/>
+    <component id="n113_kwi0" name="cb_type" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="56,499" size="215,51" group="n104_kwi0" controller="type,2">
       <ComboBox visibleItemCount="10">
         <item title="玩家ID" value="1"/>
         <item title="房间ID" value="2"/>
       </ComboBox>
     </component>
-    <image id="n116_dfkc" name="n116" src="dfkc7i4w" fileName="images/kuang2.png" xy="647,483" size="258,55" group="n104_kwi0"/>
-    <text id="n85_kwi0" name="tex_id" xy="648,486" size="246,54" group="n104_kwi0" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" singleLine="true" text="" input="true" prompt="输入ID搜索" maxLength="8" restrict="[0-9]" keyboardType="4"/>
-    <component id="n86_kwi0" name="btn_search" src="kwi0hl8" fileName="mgr/component/member/btn_mgr_search.xml" xy="925,486" group="n104_kwi0"/>
-    <group id="n104_kwi0" name="panel_search" xy="56,480" size="1021,60" group="n83_kwi0" advanced="true">
+    <image id="n116_dfkc" name="n116" src="dfkc7i4w" fileName="images/kuang2.png" xy="647,502" size="258,55" group="n104_kwi0"/>
+    <text id="n85_kwi0" name="tex_id" xy="648,505" size="246,54" group="n104_kwi0" font="Microsoft YaHei" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" singleLine="true" text="" input="true" prompt="输入ID搜索" maxLength="8" restrict="[0-9]" keyboardType="4"/>
+    <component id="n86_kwi0" name="btn_search" src="kwi0hl8" fileName="mgr/component/member/btn_mgr_search.xml" xy="925,505" group="n104_kwi0"/>
+    <group id="n104_kwi0" name="panel_search" xy="56,499" size="1021,60" group="n83_kwi0" advanced="true">
       <gearDisplay controller="record" pages="0"/>
       <relation target="" sidePair="center-center%"/>
     </group>
-    <list id="n82_kwi0" name="lst_record" xy="15,0" size="1078,440" group="n107_kwi0" overflow="scroll" lineGap="10" defaultItem="ui://m7iejg46kwi0hmc">
+    <list id="n82_kwi0" name="lst_record" xy="19,0" size="1078,484" group="n107_kwi0" overflow="scroll" lineGap="10" defaultItem="ui://m7iejg46kwi0hmc">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -27,16 +31,16 @@
       <item/>
       <item/>
     </list>
-    <component id="n110_kwi0" name="btn_search_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="578,556" size="26,52" group="n107_kwi0">
+    <component id="n110_kwi0" name="btn_search_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="559,507" size="63,52" group="n107_kwi0">
       <gearDisplay controller="search" pages="1,2"/>
       <relation target="" sidePair="center-center%"/>
       <Button controller="search" page="0"/>
     </component>
-    <component id="n108_kwi0" name="item_record_result" src="kwi0hmc" fileName="mgr/component/record/Item_mng_recrod.xml" xy="15,0" size="1078,212" group="n107_kwi0" visible="false">
+    <component id="n108_kwi0" name="item_record_result" src="kwi0hmc" fileName="mgr/component/record/Item_mng_recrod.xml" xy="19,0" size="1078,212" group="n107_kwi0" visible="false">
       <gearDisplay controller="search" pages="1"/>
       <relation target="" sidePair="width-width"/>
     </component>
-    <list id="n114_kwi0" name="lst_player_record" xy="15,0" size="1078,440" group="n107_kwi0" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmc">
+    <list id="n114_kwi0" name="lst_player_record" xy="19,0" size="1078,484" group="n107_kwi0" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmc">
       <gearDisplay controller="search" pages="2"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -46,7 +50,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n117_df14" name="lst_record_find" xy="15,0" size="1078,440" group="n107_kwi0" overflow="scroll" lineGap="10" defaultItem="ui://m7iejg46kwi0hmc">
+    <list id="n117_df14" name="lst_record_find" xy="19,0" size="1078,480" group="n107_kwi0" overflow="scroll" lineGap="10" defaultItem="ui://m7iejg46kwi0hmc">
       <gearDisplay controller="search" pages="1"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -56,14 +60,14 @@
       <item/>
       <item/>
     </list>
-    <group id="n107_kwi0" name="record0" xy="15,0" size="1078,608" group="n83_kwi0" advanced="true">
+    <group id="n107_kwi0" name="record0" xy="19,0" size="1078,559" group="n83_kwi0" advanced="true">
       <gearDisplay controller="record" pages="0"/>
     </group>
-    <component id="n111_kwi0" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="476,483" group="n112_kwi0">
+    <component id="n111_kwi0" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="476,502" size="80,58" group="n112_kwi0">
       <relation target="" sidePair="center-center%"/>
       <Button controller="record" page="0"/>
     </component>
-    <list id="n109_kwi0" name="lst_recordInfo" xy="0,0" size="1132,440" group="n112_kwi0" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmd">
+    <list id="n109_kwi0" name="lst_recordInfo" xy="0,0" size="1132,481" group="n112_kwi0" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmd">
       <relation target="" sidePair="width-width"/>
       <item/>
       <item/>
@@ -72,10 +76,11 @@
       <item/>
       <item/>
     </list>
-    <group id="n112_kwi0" name="record1" xy="0,0" size="1132,535" group="n83_kwi0" advanced="true">
+    <group id="n112_kwi0" name="record1" xy="0,0" size="1132,560" group="n83_kwi0" advanced="true">
       <gearDisplay controller="record" pages="1"/>
     </group>
     <image id="n115_dfkc" name="n115" pkg="m7iejg46" src="dfkc7i4q" fileName="开桌明细.png" xy="-246,-145" group="n83_kwi0" visible="false" alpha="0.5"/>
-    <group id="n83_kwi0" name="index2" xy="-246,-145" size="1378,753" advanced="true"/>
+    <group id="n83_kwi0" name="index2" xy="-246,-145" size="1378,705" advanced="true"/>
+    <image id="n119_tt6k" name="n119" src="tt6k7ikd" fileName="images/Group 895.png" xy="291,-110"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml

@@ -14,7 +14,7 @@
     <image id="n104_xt5s" name="n104" src="xt5s7iiu" fileName="images/jifen/Rectangle 425.png" xy="53,625" size="1226,80">
       <relation target="" sidePair="width-width%,height-height%"/>
     </image>
-    <component id="n86_vyn3" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1218,28" controller="style,0">
+    <component id="n86_vyn3" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1185,22" controller="style,0">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <list id="n79_ovii" name="lst_mgr_index" xy="59,123" size="271,175" group="n48_kkrh" visible="false" overflow="scroll" lineGap="6" defaultItem="ui://m7iejg46t1hqhxw" selectionController="index">

wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_sort_3.xml

@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="184,55" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="type" pages="0,不排序,1,降序,2,升序" selected="0"/>
+  <controller name="type" pages="0,不排序,1,降序,2,升序" selected="1"/>
   <displayList>
     <text id="n3_yvb2" name="title" xy="0,9" size="134,36" font="Microsoft YaHei" fontSize="26" color="#aa3300" align="center" vAlign="middle" bold="true" text="输赢比赛分">
       <relation target="" sidePair="middle-middle,left-left"/>
     </text>
-    <image id="n4_gdye" name="n4" src="gdye7ik4" fileName="mgr/component/member/partner/images/Arrow 1 (Stroke).png" xy="134,3">
-      <gearDisplay controller="type" pages="1"/>
-      <relation target="n3_yvb2" sidePair="left-right"/>
-    </image>
-    <image id="n5_gdye" name="n5" src="gdye7ik5" fileName="mgr/component/member/partner/images/Arrow 2 (Stroke).png" xy="134,3">
-      <gearDisplay controller="type" pages="2"/>
-      <relation target="n3_yvb2" sidePair="left-right"/>
-    </image>
-    <image id="n6_gdye" name="n6" src="gdye7ik6" fileName="mgr/component/member/partner/images/Arrow 3 (Stroke).png" xy="134,3">
-      <gearDisplay controller="type" pages="0"/>
-      <relation target="n3_yvb2" sidePair="middle-middle,left-right"/>
-    </image>
+    <component id="n9_t8gf" name="n9" src="xt5s7iia" fileName="mgr/component/member/partner/btn_mul.xml" xy="148,32" size="22,11" aspect="true">
+      <relation target="" sidePair="right-right"/>
+      <Button checked="true" icon="ui://m7iejg46t8gf7ikn" selectedIcon="ui://m7iejg46t8gf7ikm" controller="type" page="1"/>
+    </component>
+    <component id="n10_t8gf" name="n10" src="xt5s7iia" fileName="mgr/component/member/partner/btn_mul.xml" xy="147,13" pivot="0.5,0.5" size="22,11" aspect="true" rotation="180">
+      <relation target="" sidePair="right-right"/>
+      <Button icon="ui://m7iejg46t8gf7ikn" selectedIcon="ui://m7iejg46t8gf7ikm" controller="type" page="2"/>
+    </component>
   </displayList>
   <Button mode="Check"/>
   <relation target="n3_yvb2" sidePair="width-width,height-height%"/>