“28号完成全部要求，除开更多”

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

@@ -981,7 +981,7 @@ function M:InitView(url)
 
     self._view:GetChild('tex_name').text = self.curGroup.name
     self._view:GetChild('tex_tableNum').text = string.format("进行:%d桌", self.curGroup.room_num)
-    self._view:GetChild('tex_hp').text = DataManager.SelfUser.diamo
+    -- self._view:GetChild('tex_hp').text = DataManager.SelfUser.diamo
     print("lingmenginitgroup", self.curGroup.id, self.curGroup.name)
 
     -- self._view:GetChild('tex_p_name').text = ViewUtil.stringEllipsis(DataManager.SelfUser.nick_name)

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

@@ -1,5 +1,5 @@
 -- 牌友圈成员体力值记录
-local TimeSettingPanel = import("Game.View.NewGroup.MngView.TimeSettingPanel")
+local TimeSettingPanel = import("Game.View.NewGroup.MngView.TimeSettingPanelTog")
 local GroupMemberFagLogView = {}
 
 local M = GroupMemberFagLogView
@@ -52,7 +52,6 @@ function M:init(url)
     end
     self.lst_fag.scrollPane.onPullUpRelease:Set(function()
         self:GetData(self.lst_fag.numItems + self.m_index)
-        
     end)
     if not self.not_manager then
         self._view:GetController("manager").selectedIndex = 1
@@ -75,16 +74,16 @@ function M:init(url)
         end
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
-    self.begin_time, self.end_time = self.time_panel:GetDate()
+        -308, 0, function()
-
-    self._view:GetChild("btn_search").onClick:Set(function()
             self.hp_log = {}
             self.lst_fag.numItems = 0
             self.m_index = 0
             self.begin_time, self.end_time = self.time_panel:GetDate()
             self:GetData(0)
         end)
+    self.begin_time, self.end_time = self.time_panel:GetDate()
+
     self:GetData(0)
 end
 
@@ -150,7 +149,8 @@ function M:GetData(index)
     if filter == 0 then return end
     ViewUtil.ShowModalWait()
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetMemberHpLog(self.group_id, self.member.uid, index, 6, filter, self.begin_time, self.end_time, function(res)
+    fgCtr:FG_GetMemberHpLog(self.group_id, self.member.uid, index, 6, filter, self.begin_time, self.end_time,
+        function(res)
             if self._is_destroy then
                 return
             end
@@ -217,7 +217,6 @@ function M:GuoLv(data)
         end
         self.m_index = #data - #m_data_other + self.m_index
     end
-   
 end
 
 local function fillItem(data, obj)
@@ -231,6 +230,7 @@ end
 function M:OnRenderItem(index, obj)
     local data = self.hp_log[index + 1]
     obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(self.member.nick)
+    obj:GetChild("tex_id").text = string.format("ID:%s", ViewUtil.stringEllipsis(self.member.uid))
     local num = d2ad(data.hp)
     obj:GetChild("tex_num").text = num >= 0 and ('+' .. num) or num
     obj:GetController("add").selectedIndex = num >= 0 and 1 or 0

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

@@ -6,6 +6,8 @@ local MngPermission = import(".MngPermission")
 local GroupSetTagView = import("../GroupSetTagView")
 local GroupSetMemberInfoDiaoduView = import('.GroupSetMemberInfoDiaoduView')
 local GroupPartnerBanPlaysView = import(".GroupPartnerBanPlaysView")
+local GroupPartnerRewardsView = import(".GroupPartnerRewardsView")
+
 
 -- 牌友圈成员体力值记录
 local GroupMemberOperateView = {}
@@ -105,7 +107,6 @@ function M:init(url)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
     self._view:GetChild("btn_deploy").onClick:Set(function()
-
         local gniv = GroupNumberInputView.new(nil, function(num)
             ViewUtil.ShowModalWait()
             local parent_id = tonumber(num)
@@ -192,7 +193,6 @@ function M:init(url)
                 end)
             end)
             _curren_msg:Show()
-            
         end)
     end
 
@@ -272,23 +272,32 @@ function M:init(url)
         -- end
     end
     -- 禁止同桌
+    -- if group.lev < 3 then
+    --     local btn_ban_table = lst_mng:AddItemFromPool()
+    --     btn_ban_table.icon = "ui://NewGroup/mng_ban_table"
+    --     btn_ban_table.onClick:Set(function()
+    --         if not CheckPermission(group.lev, perm_array[MngPermissionList.BanSameTable]) then
+    --             return
+    --         end
+    --         ViewUtil.ShowModalWait()
+    --         fgCtr:FG_GetBanTable(self.group_id, member.uid, function(res)
+    --             ViewUtil.CloseModalWait()
+    --             if res.ReturnCode == 0 then
+    --                 local btv = GroupBanSameTableView.new(self.blur_view, self.group_id, member.uid, res.Data)
+    --                 btv:Show()
+    --             else
+    --                 ViewUtil.ErrorTip(res.ReturnCode,"获取禁止同桌列表失败！")
+    --             end
+    --         end)
+    --     end)
+    -- end
+    -- 合伙人设置 临时从禁止同桌修改
     if group.lev < 3 then
         local btn_ban_table = lst_mng:AddItemFromPool()
         btn_ban_table.icon = "ui://NewGroup/mng_ban_table"
         btn_ban_table.onClick:Set(function()
-            if not CheckPermission(group.lev, perm_array[MngPermissionList.BanSameTable]) then
+            local prv = GroupPartnerRewardsView.new(self.group_id, member.uid, member.partnerLev)
-                return 
+            prv:Show()
-            end 
-            ViewUtil.ShowModalWait()
-            fgCtr:FG_GetBanTable(self.group_id, member.uid, function(res)
-                ViewUtil.CloseModalWait()
-                if res.ReturnCode == 0 then
-                    local btv = GroupBanSameTableView.new(self.blur_view, self.group_id, member.uid, res.Data)
-                    btv:Show()
-                else
-                    ViewUtil.ErrorTip(res.ReturnCode,"获取禁止同桌列表失败！")
-                end
-            end)
         end)
     end
 
@@ -309,11 +318,8 @@ function M:init(url)
                     else
                         ViewUtil.ErrorTip(res.ReturnCode, "获取整组调度失败！")
                     end
-					
                 end)
-				
             end)
-			
     end
 
 
@@ -504,5 +510,4 @@ function M:MovePartner(parent_id, member, obj)
     end)
 end
 
-
 return M

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

@@ -1,5 +1,5 @@
 --牌友圈体力值记录
-local TimeSettingPanel = import(".TimeSettingPanel")
+local TimeSettingPanel = import(".TimeSettingPanelTog")
 local GroupMngFagListView = {}
 
 local M = GroupMngFagListView
@@ -20,7 +20,6 @@ function GroupMngFagListView.new(group_id)
 end
 
 function M:initData()
-
     self.fag_result_data = {}
     self.fag_data = {}
 
@@ -36,9 +35,6 @@ function M:initData()
 end
 
 function M:FillView()
-
-    
-
     self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupFagList")
     local group = DataManager.groups:get(self.group_id)
     if group.lev < 3 then
@@ -72,7 +68,6 @@ function M:FillView()
                 self.fag_data = {}
                 self:GetFagData(0)
             else
-
                 self.quary_id = 0
                 self.query_nick = ""
 
@@ -98,7 +93,8 @@ function M:FillView()
         self.query_nick = ""
     end)
 
-    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, function()
+    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"),
+        self._view:GetChild("btn_date2"), -308, 0, function()
         self:GetMngFagInfo()
     end)
 end

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

@@ -13,7 +13,10 @@ local MngPermission = import('.MngPermission')
 
 local GroupMngMemberHpListView = {
     numberMap = { {}, {} },
-    backTable = {}
+    backTable = {},
+    pageNum = 4,
+    start = 1,
+    page = 1
 }
 
 local M = GroupMngMemberHpListView
@@ -91,12 +94,12 @@ function M:FillView()
     self.lst_member.itemRenderer = function(index, obj)
         self:OnRenderItem(index, obj)
     end
-    self.lst_member.scrollPane.onPullUpRelease:Set(
+    -- self.lst_member.scrollPane.onPullUpRelease:Set(
-        function()
+    --     function()
-            --printlog("aaaaaaaaaaaaaaaaaaaaaa   bbbbbbbbbbbbbbbbbb   ",self.lst_member.numItems)
+    --         --printlog("aaaaaaaaaaaaaaaaaaaaaa   bbbbbbbbbbbbbbbbbb   ",self.lst_member.numItems)
-            self:GetMemberData(self.lst_member.numItems)
+    --         self:GetMemberData(self.lst_member.numItems)
-        end
+    --     end
-    )
+    -- )
 
     -- 初始化搜索成员列表
     self.lst_member_find = self._view:GetChild('lst_member_find')
@@ -160,7 +163,7 @@ function M:FillView()
                 self.lst_member_find.numItems = #tempTable
             else
                 self._ctr_search.selectedIndex = 0
-                self.lst_member.numItems = #self.member_data
+                self.lst_member.numItems = self:GetChildNumForPage()
             end
         end
     )
@@ -168,6 +171,25 @@ function M:FillView()
     local group = DataManager.groups:get(self.group_id)
     local perm_array = MngPermission.getPermData(group.permission)
 
+    self._view:GetChild('btn_less').onClick:Set(function()
+        if self.start >= 2 then
+            self.start = self.start - 1
+            self.lst_member.numItems = self:GetChildNumForPage()
+            self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page)
+        else
+            ViewUtil.ErrorMsg(self._view, nil, "当前页数不能减少")
+        end
+    end)
+    self._view:GetChild('btn_add').onClick:Set(function()
+        if self.start < self.page then
+            self.start = self.start + 1
+            self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page)
+            self.lst_member.numItems = self:GetChildNumForPage()
+        else
+            ViewUtil.ErrorMsg(self._view, nil, "当前页数不能增加")
+        end
+    end)
+
     self:GetMemberData(0)
 end
 
@@ -206,7 +228,9 @@ function M:GetMemberData(index)
                 ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
             else
                 self.member_data = group.members
-                self.lst_member.numItems = group.member_num
+                self.lst_member.numItems = self:GetChildNumForPage()
+                self.page = math.ceil(#group.members / self.pageNum)
+                self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page)
                 if index == 0 then
                     -- self._view:GetChild('tex_memb_num').text = res.Data.member_num
                     -- self._view:GetChild('tex_total_hp').text = d2ad(res.Data.hp_num1+res.Data.otherHp)
@@ -345,7 +369,7 @@ function M:FillItem(obj, member, refresh, index)
                             mp.hp = mhp
                         end
                     end
-                    self.lst_member.numItems = #self.member_data
+                    self.lst_member.numItems = self:GetChildNumForPage()
                     -- 搜索出的玩家显示
                     if self._view:GetController('search').selectedIndex == 1 then
                         obj:GetChild('tex_fag').text = d2ad(hp)
@@ -374,7 +398,7 @@ function M:FillItem(obj, member, refresh, index)
                             mp.hp = mhp
                         end
                     end
-                    self.lst_member.numItems = #self.member_data
+                    self.lst_member.numItems = self:GetChildNumForPage()
                     -- 搜索出的玩家显示
                     if self._view:GetController('search').selectedIndex == 1 then
                         obj:GetChild('tex_fag').text = d2ad(hp)
@@ -401,10 +425,10 @@ function M:FillItem(obj, member, refresh, index)
                         if delete ~= nil and delete == true then
                             local group = DataManager.groups:get(self.group_id)
                             self.member_data = group.members
-                            self.lst_member.numItems = #self.member_data
+                            self.lst_member.numItems = self:GetChildNumForPage()
                             self._view:GetController('search').selectedIndex = 0
                         else
-                            self.lst_member.numItems = self.lst_member.numItems
+                            self.lst_member.numItems = self:GetChildNumForPage()
                             if refresh then
                                 self:FillItem(obj, member)
                             end
@@ -492,7 +516,7 @@ end
 
 function M:OnRenderItem(index, obj)
     --printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww    ",index)
-    local member = self.member_data[index + 1]
+    local member = self.member_data[(self.start - 1) * self.page + index + 1]
     if member then
         self:FillItem(obj, member, false, index + 1)
     end
@@ -600,4 +624,12 @@ function M:ClearNumTex()
     self.tex_num.text = self._texnum_str
 end
 
+function M:GetChildNumForPage()
+    local numberNum = #self.member_data
+    if self.start * self.pageNum > numberNum then
+        return numberNum - (self.start - 1) * self.pageNum
+    end
+    return self.pageNum
+end
+
 return M

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

@@ -68,7 +68,6 @@ function M:InitView()
     end
     local btn_ok = self._view:GetChild("btn_ok")
     btn_ok.onClick:Set(function()
-        
         ViewUtil.ShowModalWait(nil)
         local qid = tonumber(self._view:GetChild("tex_num").text)
         if not qid then
@@ -85,7 +84,6 @@ function M:InitView()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！")
             else
-
                 local member = res.Data
                 if member.parentId ~= 0 and member.parentId ~= DataManager.SelfUser.account_id then
                     ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！")
@@ -125,19 +123,15 @@ function M:OnNumButtonAction(context)
         end
     else
         if (self._currenIndex < 6) then
-
             self._currenIndex = self._currenIndex + 1
             self._texnum_str = self._texnum_str .. typer
             self.tex_num.text = self._texnum_str
-            
         end
     end
 end
 
-
 -- 获取合伙人数据
 function M:GetPartnerData(index, callback)
-
     local group = DataManager.groups:get(self.group_id)
     if index == 0 then
         self.partner_data = {}
@@ -145,7 +139,6 @@ function M:GetPartnerData(index,callback)
     ViewUtil.ShowModalWait(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetPartnerList(self.group_id, 0, index, 10, function(res)
-
         ViewUtil.CloseModalWait()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
@@ -161,7 +154,6 @@ end
 
 -- 获取合伙人数据
 function M:QueryPartnerData(query_id, query_nick)
-
     query_nick = query_nick or ""
     query_id = query_id or 0
 
@@ -170,12 +162,10 @@ function M:QueryPartnerData(query_id,query_nick)
     ViewUtil.ShowModalWait(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_QueryPartnerList(self.group_id, query_id, query_nick, function(res)
-
         ViewUtil.CloseModalWait()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
         else
-            
             if res.Data.members ~= nil and #res.Data.members > 0 then
                 self._view:GetController("search").selectedIndex = 1
                 local lst_partner_search = self._view:GetChild("lst_partner_search")
@@ -243,7 +233,6 @@ end
 
 -- 填充合伙人对象
 function M:FillItem(obj, partner)
-
     local group = DataManager.groups:get(self.group_id)
     local perm_array = MngPermission.getPermData(group.permission)
 
@@ -283,7 +272,6 @@ function M:FillItem(obj, partner)
         end)
     end)
     obj:GetChild("btn_fag_minus").onClick:Set(function()
-
         if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
             return
         end
@@ -326,18 +314,13 @@ function M:FillItem(obj, partner)
     end)
 
     local btnDetail = obj:GetChild("btn_detail")
-    btnDetail.visible = partner.total > 0
+    -- btnDetail.visible = partner.total > 0
     btnDetail.onClick:Set(function()
         local GroupMngPartnerListView2 = GroupMngPartnerListView2.new(self.group_id, partner.uid)
         GroupMngPartnerListView2:Show()
     end)
-
-    
 end
 
-
-
-
 -- 列表对象填充
 function M:OnRenderItem(index, obj)
     local partner = self.partner_data[index + 1]

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

@@ -1,4 +1,4 @@
-local TimeSettingPanel = import(".TimeSettingPanel")
+local TimeSettingPanel = import(".TimeSettingPanelTog")
 -- 开桌统计
 local GroupMngPersonStatView = {}
 
@@ -31,7 +31,14 @@ function M:InitView()
         self:GetRecordData(self.lst_record.numItems)
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0, function()
+        self.record_data = {}
+        self.lst_record.numItems = 0
+
+        self.begin_time, self.end_time = self.time_panel:GetDate()
+        self:GetRecordData(0)
+    end)
     self.begin_time, self.end_time = self.time_panel:GetDate()
     local ctr_page = self._view:GetController("type")
     ctr_page.onChanged:Set(function()
@@ -52,7 +59,6 @@ function M:InitView()
 end
 
 function M:GetRecordData(index)
-
     ViewUtil.ShowModalWait()
 
     local time_type = self._view:GetController("type").selectedIndex
@@ -62,8 +68,8 @@ function M:GetRecordData(index)
     end
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetGroupPersonRecord(self.group_id, GetPlatform(), DataManager.SelfUser.account_id, time_type, self.begin_time, self.end_time, index, 6, function(res)
+    fgCtr:FG_GetGroupPersonRecord(self.group_id, GetPlatform(), DataManager.SelfUser.account_id, time_type,
-
+        self.begin_time, self.end_time, index, 6, function(res)
         if self._is_destroy then
             return
         end
@@ -77,7 +83,8 @@ function M:GetRecordData(index)
             end
             self.lst_record.numItems = #self.record_data
 
-            printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333",res.Data.total_round,"    ",res.Data.valid_round)
+            printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333", res.Data.total_round,
+                "    ", res.Data.valid_round)
             pt(res.Data)
             if index == 0 then
                 --self._view:GetChild("tex_num1").text = ""..res.Data.total
@@ -171,7 +178,6 @@ function M:OnRenderRecordItem(index, obj)
     self:FillRecordItem(data, obj)
 end
 
-
 function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType)
     ViewUtil.ShowModalWait(self._view, "正在分享...")
     UIPackage.AddPackage("base/rank/ui/Rank")

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

@@ -1,5 +1,5 @@
 -- 开桌统计
-local TimeSettingPanel = import(".TimeSettingPanel")
+local TimeSettingPanel = import(".TimeSettingPanelTog")
 local GroupMngPlayStatView = {}
 
 local M = GroupMngPlayStatView
@@ -13,7 +13,6 @@ function GroupMngPlayStatView.new(gid)
 end
 
 function M:initData()
-    
     self:GetConsumeStatData()
 end
 
@@ -34,7 +33,12 @@ function M:InitView()
         self:GetConsumeStatData()
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0, function()
+        self.consume_stat = {}
+        self.lst_consume_stat.numItems = 0
+        self:GetConsumeStatData()
+    end)
 end
 
 function M:GetConsumeStatData()
@@ -62,7 +66,6 @@ function M:GetConsumeStatData()
             end
 
             self.lst_consume_stat.numItems = #self.consume_stat
-
         end
     end)
 end

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

@@ -1,5 +1,5 @@
 -- 牌友圈排行界面
-local TimeSettingPanel = import(".TimeSettingPanel")
+local TimeSettingPanel = import(".TimeSettingPanelTog")
 
 local GroupMngRankView = {}
 
@@ -62,7 +62,6 @@ function M:FillView()
 
     self._view:GetChild("btn_search1").onClick:Set(function()
         self:clearRankData()
-    
         self:GetWinRankData(#self.win_data)
     end)
 
@@ -138,8 +137,16 @@ function M:FillView()
         end
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
-    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btndate1"), self._view:GetChild("btndate2"), -308, 0)
+        -308, 0, function()
+        self:clearRankData()
+        self:GetRankData(#self.rank_data)
+    end)
+    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btndate1"), self._view:GetChild("btndate2"),
+        -308, 0, function()
+        self:clearRankData()
+        self:GetWinRankData(#self.win_data)
+    end)
 end
 
 function M:GetRankData(index)

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

@@ -1,5 +1,5 @@
 -- 能量包提取记录
-local TimeSettingPanel = import(".TimeSettingPanel")
+local TimeSettingPanel = import(".TimeSettingPanelTog")
 
 local GroupTakeLogView = {}
 
@@ -29,8 +29,8 @@ function M:init(url)
         self:getTakeLog(self.lst_log.numItems)
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
-    self._view:GetChild("btn_search").onClick:Set(function()
+        -308, 0, function()
             self.take_log = {}
             self:getTakeLog(0)
         end)

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

@@ -52,69 +52,101 @@ end
 
 local max_pos, min_pos = 0.2, 2.2
 -- 添加列表特效：中部的组件放大，两边的渐渐透明
-local function addListEffect(lst)
+-- local function addListEffect(lst)
-    local mid_y = 0.5 * lst.height
+--     local mid_y = 0.5 * lst.height
-    local cnt = lst.numChildren
+--     local cnt = lst.numChildren
-    for i = 0, cnt - 1 do
+--     for i = 0, cnt - 1 do
-        local item = lst:GetChildAt(i)
+--         local item = lst:GetChildAt(i)
-        local index = lst.scrollPane.percY * (lst.numChildren - 5)
+--         local index = lst.scrollPane.percY * (lst.numChildren - 5)
-        local dist = math.abs(index + 2 - i) -- 距离列表中点的位置
+--         local dist = math.abs(index + 2 - i) -- 距离列表中点的位置
-        if dist <= max_pos then
+--         if dist <= max_pos then
-            item.alpha = 1
+--             item.alpha = 1
-            item:GetChild("title"):SetScale(1, 1)
+--             item:GetChild("title"):SetScale(1, 1)
-        elseif dist <= min_pos then
+--         elseif dist <= min_pos then
-            local scale = dist / min_pos
+--             local scale = dist / min_pos
-            item.alpha = 1 - 0.7 * scale
+--             item.alpha = 1 - 0.7 * scale
-            item:GetChild("title"):SetScale(1 - 0.5 * scale, 1 - 0.5 * scale)
+--             item:GetChild("title"):SetScale(1 - 0.5 * scale, 1 - 0.5 * scale)
-        else
+--         else
-            item.alpha = 0.3
+--             item.alpha = 0.3
-            item:GetChild("title"):SetScale(0.5, 0.5)
+--             item:GetChild("title"):SetScale(0.5, 0.5)
-        end
+--         end
-        lst.data = lst:GetChildAt(2).data - math.floor(index + 0.5) * 86400
+--         lst.data = lst:GetChildAt(2).data - math.floor(index + 0.5) * 86400
-    end
+--     end
-end
+-- end
 -- 显示日期
 -- +/-2的原因是列表中需要两个看不见的组件
-local function initList(lst, date, show_day)
+-- local function initList(lst, date, show_day)
-    local now_time = os.date("*t", now)
+--     local now_time = os.date("*t", now)
+--     local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 })
+--     lst:RemoveChildrenToPool()
+--     local index = -1
+--     local num = show_day - 1
+--     for i = 0 - 2, num + 2 do
+--         local item = lst:AddItemFromPool()
+--         if i >= 0 and i <= num then
+--             local time = today - 86400 * i
+--             item.data = time
+--             item.title = os.date("%Y年%m月%d日", time)
+--             if time == date then
+--                 index = i
+--             end
+--         else
+--             item.title = " "
+--         end
+--     end
+--     lst.scrollPane.percY = index / num
+--     addListEffect(lst)
+--     lst.scrollPane.onScroll:Add(function()
+--         addListEffect(lst)
+--     end)
+-- end
+
+local function initList(list_start, list_end, showday, day1, day2)
+    local now_time = os.date("*t")
     local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 })
-    lst:RemoveChildrenToPool()
+    list_start:SetVirtual()
-    local index = -1
+    list_start.itemRenderer = function(index, obj)
-    local num = show_day - 1
+        local time = today - 86400 * index
-    for i = 0 - 2, num + 2 do
+        obj.data = time
-        local item = lst:AddItemFromPool()
+        obj.text = os.date("%m月%d日", time)
-        if i >= 0 and i <= num then
+        obj.selected = day1 == time
-            local time = today - 86400 * i
-            item.data = time
-            item.title = os.date("%Y年%m月%d日", time)
-            if time == date then
-                index = i
     end
-        else
+    list_end:SetVirtual()
-            item.title = " "
+    list_end.itemRenderer = function(index, obj)
+        local time = today - 86400 * index
+        obj.data = time
+        obj.text = os.date("%m月%d日", time)
+        obj.selected = day2 == time
     end
-    end
+    list_start.numItems = showday
-    lst.scrollPane.percY = index / num
+    list_end.numItems = showday
-    addListEffect(lst)
+    list_start:RefreshVirtualList()
-    lst.scrollPane.onScroll:Add(function()
+    list_end:RefreshVirtualList()
-        addListEffect(lst)
-    end)
 end
 
 -- 显示设置时间面板
-function M:ShowSetDatePanel(btn)
+function M:ShowSetDatePanel()
-    local date = btn.data
+    local com_set_date = UIPackage.CreateObjectFromURL("ui://NewGroup/com_set_time_together")
-    local com_set_date = UIPackage.CreateObjectFromURL("ui://NewGroup/com_set_time")
+    local list_start = com_set_date:GetChild("list_start")
-    local lst_y = com_set_date:GetChild("lst_year")
+    local list_end = com_set_date:GetChild("list_end")
-    initList(lst_y, date, self.show_day)
+    local now_time = os.date("*t")
-    com_set_date:GetChild("btn_confirm").onClick:Set(function()
+    local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 })
-        local time = os.date("%Y年%m月%d日", lst_y.data)
+    initList(list_start, list_end, self.show_day, self.btn1.data, self.btn2.data)
-        btn.title = time
+    com_set_date:GetChild("btn_ok").onClick:Set(function()
-        btn.data = lst_y.data
+        self.btn1.data = today - 86400 * list_start.selectedIndex
+        self.btn1.title = os.date("%Y年%m月%d日", self.btn1.data)
+        self.btn2.data = today - 86400 * list_end.selectedIndex
+        self.btn2.title = os.date("%Y年%m月%d日", self.btn2.data)
         com_set_date:Dispose()
         if self.callback then self.callback() end
     end)
-    AddPanel(com_set_date)
+    com_set_date:GetChild("btn_cancel").onClick:Set(function()
+        -- local time = os.date("%Y年%m月%d日", lst_y.data)
+        -- btn.title = time
+        -- btn.data = lst_y.data
+        com_set_date:Dispose()
+    end)
+    AddPanelCenter(com_set_date)
     -- self.parent:AddChild(com_set_date)
     -- com_set_date.x = self.posX
     -- com_set_date.y = GRoot.inst.height - com_set_date.height - (GRoot.inst.height - self.parent.height) * 0.5 + self.posY

lua_probject/base_project/Game/View/ResultView.lua

@@ -9,10 +9,8 @@ local self = setmetatable({}, {__index = M})
 function M:InitView()
     self:InitMaPai()
     self:InitMaPaiShowPanel()
-	
 end
 
-
 function M:InitMaPaiShowPanel()
     self.mapaiTypeCtr = self._view:GetController("matype")
     if self.mapaiTypeCtr then
@@ -45,9 +43,7 @@ function M:InitMaPai()
         if tempMP then
             table.insert(self.maPaiList, tempMP)
         end
-		
     end
-	
 end
 
 function M:IsMapaiShow(niao, isShow)
@@ -56,7 +52,6 @@ function M:IsMapaiShow(niao,isShow)
     end
 end
 
-
 function M:SetMaPaiValue(niao, value)
     if niao then
         niao.icon = 'ui://Main_Majiang/' .. get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. value
@@ -74,8 +69,6 @@ function M:HideAllMapai()
     end
 end
 
-
-
 function M:ShowSelectMaPai(niaoList)
     if niaoList and #niaoList > 0 then
         self.maPaiCtr.selectedIndex = 1
@@ -92,7 +85,6 @@ function M:ShowSelectMaPai(niaoList)
     end
 end
 
-
 function M:init(url, isBigFull)
     BaseWindow.init(self, url)
 
@@ -193,7 +185,6 @@ function M:init(url,isBigFull)
     end
 end
 
-
 -- 分享数据至聊天室，需在扩展填充数据，GenerateRoomResultInfo()
 function M:__ShareResultInfo()
     local info = self._resultInfo
@@ -277,6 +268,7 @@ function M:InitBigResult(room, fontsize)
 
         local maxScore = 0
         local isWin = false
+        local flag_new = big_result:GetChild('flag_tempNew')
         for i = 1, #self._resultInfo.player_list do
             local player_info = self._resultInfo.player_list[i]
 
@@ -310,11 +302,29 @@ function M:InitBigResult(room, fontsize)
         for i = 1, #self._resultInfo.player_list do
             local player_info = self._resultInfo.player_list[i]
 
+            local item2
+            if player_info.id == room.self_player.self_user.account_id then
+                if isWin then
+                    item2 = big_result:GetChild('play_win')
+                else
+                    item2 = big_result:GetChild('play_lose')
+                end
+            else
+                if not isWin then
+                    item2 = big_result:GetChild('play_win')
+                else
+                    item2 = big_result:GetChild('play_lose')
+                end
+            end
             local item = player_list:AddItemFromPool()
             item:GetChild('txt_name').text = player_info.nick
+            item2:GetChild('txt_name').text = player_info.nick
+            item2:GetChild('txt_id').text = player_info.id
 
             local head = item:GetChild('head'):GetChild('n4')
             ImageLoad.Load(player_info.head_url, head)
+            local head = item2:GetChild('head'):GetChild('n4')
+            ImageLoad.Load(player_info.head_url, head)
 
             if player_info.entrust ~= nil and player_info.entrust == true then
                 item:GetController('entrust').selectedIndex = 1
@@ -336,9 +346,15 @@ function M:InitBigResult(room, fontsize)
                 if player_info.total_score >= 0 then
                     item:GetController('pn').selectedIndex = 1
                     item:GetChild('txt_positive').text = '+' .. tostring(player_info.total_score)
+                    item2:GetChild('txt_navigate').text = string.format("总战绩:+%s", player_info.total_score)
+                    item2:GetChild('txt_daniao').text = string.format("打鸟  +%s", player_info.daniao)
+                    item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao
                 else
                     item:GetController('pn').selectedIndex = 0
                     item:GetChild('txt_navigate').text = tostring(player_info.total_score)
+                    item2:GetChild('txt_navigate').text = string.format("总战绩:%s", player_info.total_score)
+                    item2:GetChild('txt_daniao').text = string.format("打鸟  %s", player_info.daniao)
+                    item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao
                 end
             end
 
@@ -368,10 +384,43 @@ function M:InitBigResult(room, fontsize)
                     else
                         if big then
                             pitem:GetChild('txt_key').textFormat.size = 30
-                            pitem:GetChild('txt_value').textFormat.size = 12
+                            pitem:GetChild('txt_value').textFormat.size = 30
                         else
                             pitem:GetChild('txt_key').textFormat.size = 24
-                            pitem:GetChild('txt_value').textFormat.size = 8
+                            pitem:GetChild('txt_value').textFormat.size = 24
+                        end
+                    end
+                end
+            end
+
+            local list_param = item2:GetChild('list_param')
+            list_param:RemoveChildrenToPool()
+            if self._gameStatisticsLineSpacing ~= nil then
+                list_param.lineGap = self._gameStatisticsLineSpacing
+            end
+
+            if player_info.param ~= nil then
+                local big = false
+                if #player_info.param <= 4 then
+                    big = true
+                end
+
+                for i = 1, #player_info.param do
+                    local pitem = list_param:AddItemFromPool()
+
+                    pitem:GetChild('txt_key').text = player_info.param[i].key
+                    pitem:GetChild('txt_value').text = player_info.param[i].value
+
+                    if fontsize ~= nil and fontsize > 0 then
+                        pitem:GetChild('txt_key').textFormat.size = fontsize
+                        pitem:GetChild('txt_value').textFormat.size = fontsize
+                    else
+                        if big then
+                            pitem:GetChild('txt_key').textFormat.size = 30
+                            pitem:GetChild('txt_value').textFormat.size = 30
+                        else
+                            pitem:GetChild('txt_key').textFormat.size = 24
+                            pitem:GetChild('txt_value').textFormat.size = 24
                         end
                     end
                 end

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

@@ -23,7 +23,6 @@ function RunFast_ResultView.new(blur_view, data, roomid, over, win_seat, dissolv
 end
 
 function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
-    
     ResultView.init(self, url, true)
     self.xiPaiCtr = self._view:GetController("xipai")
 
@@ -65,7 +64,6 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
 
         self:InitData_One(data, win_seat, over, roomid, remaincards)
     end
-
 end
 
 function M:ChangeCodeByTo(card)
@@ -79,7 +77,6 @@ end
 
 -- 小结算
 function M:InitData_One(data, winseat, over, roomid, remaincards)
-    
     local room = DataManager.CurrenRoom
     self._view:GetController("sdk").selectedIndex = 1
     local _gamectr = ControllerManager.GetController(GameController)
@@ -92,7 +89,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
     if remaincards and #remaincards > 0 then
         table.sort(remaincards, function(a, b)
             return a % 100 < b % 100
-            
         end)
         for i = 1, #remaincards do
             local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. remaincards[i])
@@ -105,7 +101,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
         local player = data[i]
         local item = list_view:AddItemFromPool("ui://Extend_Poker_RunFastNew/clearing_item_1")
 
-		
         local leftCard = item:GetChild("leftCard")
         leftCard:RemoveChildrenToPool()
         -- table.sort(data[i].handCards,function (a,b)
@@ -150,7 +145,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
             -- body
             nichen.text = tostring(player.nick)
         else
-            
             nichen.text = tostring(player.self_user.nick_name)
         end
 
@@ -169,9 +163,8 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
         end
 
         local hp_nonnegative = room:checkHpNonnegative()
-        local roundScore = player.winscore
+        local roundScore = player.winCardScore
         if hp_nonnegative then
-            
             local jifen = ""
             if roundScore > 0 then
                 jifen = "+" .. roundScore
@@ -195,7 +188,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
 
             item:GetChild("score").text = jifen .. tili .. limit
         else
-            
             local jifen = ""
             if roundScore >= 0 then
                 jifen = "+" .. roundScore
@@ -206,7 +198,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
 
             local tili = ""
             if room.hpOnOff > 0 then
-                
                 local need = roundScore * rt
                 tili = "("
                 if roundScore > 0 then
@@ -223,18 +214,21 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
         end
 
         if roundScore >= 0 then
-            
             if room.self_player.seat == player.seat then
                 -- body
                 self._view:GetController("result").selectedIndex = 1
+                item:GetController('win').selectedIndex = 1
+            else
+                item:GetController('win').selectedIndex = 0
             end
         else
-            
             if room.self_player.seat == player.seat then
                 self._view:GetController("result").selectedIndex = 0
+                item:GetController('win').selectedIndex = 0
+            else
+                item:GetController('win').selectedIndex = 1
             end
         end
-    
     end
 
 
@@ -245,7 +239,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
             self:Destroy()
             local _gamectr = ControllerManager.GetController(GameController)
             _gamectr:ConformToNextGame()
-        
         end)
     else
         self.xiPaiCtr.selectedIndex = 0
@@ -255,7 +248,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
             self:InitData(data, winseat, roomid)
             -- ViewManager.ChangeView(ViewManager.View_Lobby)
         end)
-    
     end
 end
 
@@ -286,6 +278,7 @@ function M:InitData(data, winseat, roomid)
         player_list[i].nick = user.nick_name
         player_list[i].seat = data[i].seat
         player_list[i].head_url = data[i].self_user.head_url
+        player_list[i].daniao = data[i].daniao
 
         if data[i].entrust ~= nil then
             player_list[i].entrust = data[i].entrust > 0
@@ -316,7 +309,8 @@ function M:InitData(data, winseat, roomid)
         end
     end
 
-    self:GenerateRoomResultInfo(room.room_config.Times, room.room_config:GetGameName(), room.room_id, room.create_time, player_list)
+    self:GenerateRoomResultInfo(room.room_config.Times, room.room_config:GetGameName(), room.room_id, room.create_time,
+        player_list)
     self:InitBigResult(room)
     local big_result = self._view:GetChild("big_result")
     local lst_p = big_result:GetChild("player_list")
@@ -329,7 +323,6 @@ function M:InitData(data, winseat, roomid)
             tem:GetChild("txt_value").textFormat.size = 30
         end
     end
-
 end
 
 return M

wb_new_ui/.objs/metas/9n9stu2e/m9jahb.info

@@ -0,0 +1,25 @@
+{
+  "objectStatus": {
+    "n3_tjnv": {
+      "hidden": true
+    },
+    "n28_tjnv": {
+      "hidden": true
+    },
+    "n2_tjnv": {
+      "hidden": true
+    },
+    "n14_tjnv": {
+      "collapsed": true
+    },
+    "n11_tjnv": {
+      "collapsed": true
+    },
+    "n17_tjnv": {
+      "collapsed": true
+    },
+    "n26_tjnv": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/9n9stu2e/m9jahn.info

@@ -1,7 +1,34 @@
 {
   "objectStatus": {
+    "n20_naue": {
+      "hidden": true
+    },
+    "n12_tjnv": {
+      "hidden": true
+    },
+    "n7_tjnv": {
+      "hidden": true
+    },
+    "n2_tjnv": {
+      "hidden": true
+    },
+    "n10_tjnv": {
+      "hidden": true
+    },
     "n4_tjnv": {
       "hidden": true
+    },
+    "n18_n12b": {
+      "hidden": true
+    },
+    "n0_tjnv": {
+      "hidden": true
+    },
+    "n21_naue": {
+      "hidden": true
+    },
+    "n22_naue": {
+      "hidden": true
     }
   }
 }

wb_new_ui/.objs/metas/9n9stu2e/prgzee.info

@@ -1,14 +1,3 @@
 {
-  "objectStatus": {
-    "n39_j7ij": {
-      "collapsed": true
-    },
-    "n18_fmkv": {
-      "collapsed": true
-    },
-    "n47_m5rj": {
-      "collapsed": true
-    }
-  },
   "fitScreen": "FitSize"
 }

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

@@ -3,9 +3,6 @@
     "n154_cioe": {
       "hidden": true
     },
-    "n45_l0s4": {
-      "locked": true
-    },
     "n214_ovii": {
       "hidden": true
     },
@@ -15,21 +12,15 @@
     "n204_jvvo": {
       "hidden": true
     },
-    "n153_cioe": {
+    "n241_n6w8": {
       "hidden": true
     },
     "n175_mn85": {
       "collapsed": true
     },
-    "n74_i7lq": {
-      "locked": true
-    },
     "n243_n6w8": {
       "hidden": true
     },
-    "n171_mpll": {
-      "hidden": true
-    },
     "n236_o6b1": {
       "hidden": true,
       "collapsed": true
@@ -40,13 +31,16 @@
     "n240_n6w8": {
       "hidden": true
     },
+    "n153_cioe": {
+      "hidden": true
+    },
     "n229_csp4": {
       "hidden": true
     },
     "n216_ovii": {
       "hidden": true
     },
-    "n241_n6w8": {
+    "n171_mpll": {
       "hidden": true
     }
   },

wb_new_ui/.objs/metas/m7iejg46/cioeho9.info

@@ -1,18 +1,21 @@
 {
   "objectStatus": {
-    "n133_et16": {
+    "n107_sbng": {
       "hidden": true
     },
     "n79_nk4v": {
       "hidden": true
     },
+    "n101_sbng": {
+      "hidden": true
+    },
     "n78_nk4v": {
       "hidden": true
     },
-    "n98_yetw": {
+    "n133_et16": {
       "hidden": true
     },
-    "n108_sbng": {
+    "n98_yetw": {
       "hidden": true
     }
   },

wb_new_ui/.objs/metas/m7iejg46/cioehoa.info

@@ -1,4 +1,12 @@
 {
+  "objectStatus": {
+    "n51_k5m9": {
+      "hidden": true
+    },
+    "n42_ozaz": {
+      "hidden": true
+    }
+  },
   "adaptiveTest": true,
   "fitScreen": "FitSize"
 }

wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info

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

wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info

@@ -1,7 +1,13 @@
 {
   "objectStatus": {
+    "n100_dzx8": {
+      "hidden": true
+    },
     "n147_j120": {
       "hidden": true
+    },
+    "n161_rt3g": {
+      "hidden": true
     }
   },
   "adaptiveTest": true,

wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info

@@ -1,5 +1,8 @@
 {
   "objectStatus": {
+    "n80_7b4q": {
+      "hidden": true
+    },
     "n82_et16": {
       "hidden": true
     },
@@ -9,12 +12,18 @@
     "n81_7b4q": {
       "hidden": true
     },
-    "n80_7b4q": {
+    "n75_s9vt": {
-      "hidden": true
+      "collapsed": true
     },
     "n39_gltd": {
       "hidden": true
     },
+    "n40_gltd": {
+      "collapsed": true
+    },
+    "n74_s9vt": {
+      "hidden": true
+    },
     "n79_ovii": {
       "hidden": true
     }

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

@@ -1,4 +1,9 @@
 {
+  "objectStatus": {
+    "n98_k5m9": {
+      "hidden": true
+    }
+  },
   "adaptiveTest": true,
   "fitScreen": "FitSize"
 }

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

@@ -1,5 +1,8 @@
 {
   "objectStatus": {
+    "n86_kwi0": {
+      "hidden": true
+    },
     "n122_j120": {
       "hidden": true
     }

wb_new_ui/.objs/metas/m7iejg46/m16m7igb.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n3_imp5": {
+      "collapsed": true
+    }
+  }
+}

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

@@ -3,20 +3,20 @@
     "n69_jd7v": {
       "hidden": true
     },
+    "n33_rpaz": {
+      "hidden": true
+    },
     "n86_t1hq": {
       "hidden": true
     },
     "n113_csp4": {
       "hidden": true
     },
-    "n33_rpaz": {
+    "n85_t1hq": {
       "hidden": true
     },
     "n35_rpaz": {
       "hidden": true
-    },
-    "n88_t1hq": {
-      "hidden": true
     }
   },
   "adaptiveTest": true,

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

@@ -6,6 +6,9 @@
     "n57_ocx0": {
       "hidden": true
     },
+    "n78_iaes": {
+      "hidden": true
+    },
     "n44_rpaz": {
       "collapsed": true
     },

wb_new_ui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 297,
+  "libview.firstColumnWidth": 522,
   "expanded_nodes": [
     "27vd145b",
     "/",
@@ -8,65 +8,38 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://ppu1wv76j4mf9j",
+    "ui://m7iejg4610snh5j",
-    "ui://v6yvqp7wf55qwa",
+    "ui://0khx14are0py2",
-    "ui://v6yvqp7wf55qw7",
+    "ui://2d9xdj6zfn7fao",
-    "ui://v6yvqp7wf55qvx",
+    "ui://2d9xdj6zlumrgj",
-    "ui://v6yvqp7wf55qvw",
+    "ui://m7iejg46kwi0hma",
-    "ui://v6yvqp7wddb914i",
+    "ui://27vd145bm16m7iji",
-    "ui://v6yvqp7wcyprww",
+    "ui://27vd145bh1uu3i",
-    "ui://v6yvqp7wcyprwy",
+    "ui://m7iejg46gltdhc9",
-    "ui://v6yvqp7wcyprwu",
+    "ui://m7iejg46hsbhhjn",
-    "ui://v6yvqp7wcyprwt",
+    "ui://2zlli80mw9te0"
-    "ui://m7iejg46kwi0hkb",
+  ],
-    "ui://m7iejg46mpllhv2",
+  "packageGroup.mine": [
-    "ui://m7iejg46kwi0hkl",
+    "m7iejg46"
-    "ui://v6yvqp7wf55qw5",
-    "ui://v6yvqp7wf55qw4"
   ],
-  "packageGroup.mine": [],
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://v6yvqp7wf55qw4",
+  "doc.activeDoc": "ui://m7iejg46kwi0hma",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
     "/",
     "27vd145b",
     "/component/",
-    "egnzysm7",
+    "27vd145b",
+    "/component/create_room/",
+    "27vd145b",
+    "/component/create_room/image/",
+    "m7iejg46",
     "/",
-    "egnzysm7",
+    "m7iejg46",
-    "/component/",
+    "/images/"
-    "egnzysm7",
-    "/component/clearing/",
-    "egnzysm7",
-    "/component/clearing/image/",
-    "ppu1wv76",
-    "/",
-    "ppu1wv76",
-    "/component/",
-    "ppu1wv76",
-    "/component/cards/",
-    "ppu1wv76",
-    "/component/clearing/",
-    "ppu1wv76",
-    "/images/",
-    "v6yvqp7w",
-    "/",
-    "v6yvqp7w",
-    "/component/",
-    "v6yvqp7w",
-    "/component/Main/",
-    "v6yvqp7w",
-    "/component/Main/component/",
-    "v6yvqp7w",
-    "/component/cards/",
-    "v6yvqp7w",
-    "/images/",
-    "v6yvqp7w",
-    "/images/cards/"
   ],
   "auxline1": true,
   "snapToGrid": true,

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="227,47" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n7_rpaz" name="n7" src="m16m7ijj" fileName="component/create_room/image/Rectangle 388.png" xy="1,8">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <text id="n9_rpaz" name="title" xy="42,0" size="185,47" font="ui://27vd145bilon7ia1" fontSize="26" color="#c3a864" vAlign="middle" autoSize="shrink" bold="true" text="积分操作"/>
+    <image id="n10_vyn3" name="n10" src="m16m7ijj" fileName="component/create_room/image/Rectangle 388.png" xy="1,8">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n11_vyn3" name="n11" src="m16m7ijk" fileName="component/create_room/image/Vector.png" xy="1,12">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+  </displayList>
+  <Button mode="Check"/>
+</component>

wb_new_ui/assets/Common/package.xml

@@ -1088,6 +1088,9 @@
     <image id="nuxq7ijg" name="ann_xiayibu.png" path="/component/create_room/image/"/>
     <image id="nuxq7ijh" name="ann_zhuobuyanse.png" path="/component/create_room/image/"/>
     <font id="ilon7ia1" name="AlimamaFangYuanTiVF-Thin.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
+    <component id="m16m7iji" name="Btn_mul_checkbox3.xml" path="/component/create_room/" exported="true"/>
+    <image id="m16m7ijj" name="Rectangle 388.png" path="/component/create_room/image/"/>
+    <image id="m16m7ijk" name="Vector.png" path="/component/create_room/image/"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/big_result_item.xml

@@ -1,32 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="332,462">
+<component size="320,456">
   <controller name="self" pages="0,,1," selected="0"/>
-  <controller name="big_win" pages="0,,1," selected="0"/>
+  <controller name="big_win" pages="0,,1," selected="1"/>
   <controller name="pn" pages="0,,1," selected="0"/>
   <controller name="entrust" pages="0,,1," selected="0"/>
   <controller name="have_flag" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_tjnv" name="n0" src="m9jaho" fileName="component/Result/k.png" xy="0,0"/>
+    <image id="n0_tjnv" name="n0" src="m9jaho" fileName="component/Result/k.png" xy="0,0" visible="false"/>
-    <graph id="n20_naue" name="n20" xy="0,4" size="332,96" type="rect" lineSize="0" fillColor="#33000000"/>
+    <graph id="n20_naue" name="n20" xy="0,4" size="332,96" visible="false" type="rect" lineSize="0" fillColor="#33000000"/>
-    <graph id="n21_naue" name="n21" xy="0,369" size="332,87" type="rect" lineSize="0" fillColor="#33000000"/>
+    <graph id="n21_naue" name="n21" xy="0,369" size="332,87" visible="false" type="rect" lineSize="0" fillColor="#33000000"/>
+    <image id="n24_imp5" name="n24" src="imp5cji" fileName="component/Result/Group 737.png" xy="0,105" group="n26_imp5"/>
+    <image id="n25_imp5" name="n25" src="imp5cjc" fileName="component/Result/Rectangle 413.png" xy="-3,169" group="n26_imp5"/>
+    <group id="n26_imp5" name="win" xy="-3,105" size="327,303"/>
     <image id="n1_tjnv" name="n1" src="m9jahp" fileName="component/Result/zjwjd.png" xy="21,18" visible="false">
       <gearDisplay controller="self" pages="1"/>
     </image>
     <image id="n2_tjnv" name="n2" src="m9jahq" fileName="component/Result/qiwnj.png" xy="20,17" visible="false">
       <gearDisplay controller="self" pages="0"/>
     </image>
-    <text id="n3_tjnv" name="txt_name" xy="83,26" size="198,34" fontSize="24" color="#f2daaa" vAlign="middle" autoSize="none" text="111"/>
+    <text id="n3_tjnv" name="txt_name" xy="106,6" size="198,44" font="ui://27vd145bilon7ia1" fontSize="32" color="#924e00" vAlign="middle" autoSize="shrink" bold="true" text="111"/>
+    <text id="n23_imp5" name="txt_id" xy="106,50" size="198,44" font="ui://27vd145bilon7ia1" fontSize="32" color="#924e00" vAlign="middle" autoSize="shrink" bold="true" text="111"/>
     <text id="n4_tjnv" name="txt_reserve_hp" xy="83,60" size="196,34" visible="false" fontSize="22" color="#f2daaa" vAlign="middle" autoSize="none" text="111"/>
-    <component id="n6_tjnv" name="head" src="m9jahv" fileName="component/Result/result_head.xml" xy="24,29"/>
+    <component id="n6_tjnv" name="head" src="m9jahv" fileName="component/Result/result_head.xml" xy="0,0" size="96,96"/>
     <image id="n5_tjnv" name="n5" src="m9jahr" fileName="component/Result/dyj.png" xy="0,0">
       <gearDisplay controller="big_win" pages="1"/>
     </image>
     <image id="n7_tjnv" name="n7" src="m9jahs" fileName="component/Result/fgx.png" xy="42,114" visible="false">
       <gearXY controller="have_flag" pages="0" values="42,114" default="42,147"/>
     </image>
-    <image id="n8_tjnv" name="n8" src="m9jahs" fileName="component/Result/fgx.png" xy="41,376" visible="false"/>
+    <image id="n8_tjnv" name="n8" src="m9jahs" fileName="component/Result/fgx.png" xy="41,356" visible="false"/>
-    <list id="n9_tjnv" name="list_param" xy="19,146" size="269,209" overflow="scroll" defaultItem="ui://9n9stu2ea3ztcgq" align="center" vAlign="middle">
+    <list id="n9_tjnv" name="list_param" xy="25,170" size="269,178" overflow="scroll" defaultItem="ui://9n9stu2ea3ztcgq" align="center" vAlign="middle">
-      <gearXY controller="have_flag" pages="0,1" values="19,146|18,146"/>
+      <gearXY controller="have_flag" pages="0,1" values="25,170|18,146"/>
       <item/>
       <item/>
       <item/>
@@ -34,19 +38,31 @@
       <item/>
       <item/>
     </list>
-    <image id="n10_tjnv" name="n10" src="m9jahu" fileName="component/Result/font/win/zjxz.png" xy="26,393"/>
+    <image id="n10_tjnv" name="n10" src="m9jahu" fileName="component/Result/font/win/zjxz.png" xy="-68,545" visible="false"/>
     <text id="n11_tjnv" name="txt_positive" xy="106,379" size="178,64" font="ui://9n9stu2enauecht" fontSize="20" color="#ffff33" align="center" vAlign="middle" autoSize="shrink" bold="true" text="222.2">
       <gearDisplay controller="pn" pages="1"/>
     </text>
-    <text id="n12_tjnv" name="txt_navigate" xy="106,378" size="193,64" font="ui://9n9stu2enaueci9" fontSize="20" color="#999999" align="center" vAlign="middle" autoSize="shrink" bold="true" text="2342">
+    <text id="n12_tjnv" name="txt_navigate--" xy="126,532" size="193,64" visible="false" font="ui://9n9stu2enaueci9" fontSize="20" color="#999999" align="center" vAlign="middle" autoSize="shrink" bold="true" text="2342">
+      <gearDisplay controller="pn" pages="0"/>
+    </text>
+    <text id="n29_imp5" name="txt_navigate" xy="63,394" size="193,64" font="ui://27vd145bilon7ia1" fontSize="36" color="#ff1212" align="center" vAlign="middle" autoSize="shrink" bold="true" text="2342">
       <gearDisplay controller="pn" pages="0"/>
     </text>
     <image id="n13_tjnv" name="n13" src="m9jaht" fileName="component/Result/tgz.png" xy="135,276">
       <gearDisplay controller="entrust" pages="1"/>
     </image>
-    <list id="n18_n12b" name="flag" xy="21,111" size="265,25" layout="row" overflow="scroll" colGap="10" defaultItem="ui://27vd145bn12bcge" align="center" vAlign="middle"/>
+    <list id="n18_n12b" name="flag" xy="21,111" size="265,25" visible="false" layout="row" overflow="scroll" colGap="10" defaultItem="ui://27vd145bn12bcge" align="center" vAlign="middle"/>
-    <image id="n22_naue" name="n22" src="nauechv" fileName="component/Result/font/lose/lose_zj.png" xy="26,393">
+    <image id="n22_naue" name="n22" src="nauechv" fileName="component/Result/font/lose/lose_zj.png" xy="9,554" visible="false">
       <gearDisplay controller="pn" pages="0"/>
     </image>
+    <text id="n27_imp5" name="n27" xy="25,120" size="79,34" font="ui://27vd145bilon7ia1" fontSize="24" color="#fff5d5" bold="true" text="总积分">
+      <relation target="" sidePair="left-left"/>
+    </text>
+    <text id="n28_imp5" name="text_zongjifen" xy="215,120" size="79,34" font="ui://27vd145bilon7ia1" fontSize="24" color="#fff5d5" bold="true" text="总积分">
+      <relation target="" sidePair="right-right"/>
+    </text>
+    <text id="n30_imp5" name="txt_daniao" xy="63,354" size="193,46" font="ui://27vd145bilon7ia1" fontSize="26" color="#924e00" align="center" vAlign="middle" autoSize="shrink" bold="true" text="打鸟  +30">
+      <gearDisplay controller="pn" pages="0"/>
+    </text>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/clearing.xml

@@ -1,49 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750">
   <controller name="sdk" pages="0,,1," selected="1"/>
-  <controller name="result" pages="0,,1," selected="0"/>
+  <controller name="result" pages="0,,1," selected="1"/>
-  <controller name="xipai" pages="0,,1," selected="1"/>
+  <controller name="xipai" pages="0,,1," selected="0"/>
   <displayList>
     <graph id="n42_ndir" name="n42" xy="-427,-182" size="2189,1114" alpha="0.65" type="rect" fillColor="#ff000000">
       <gearDisplay controller="sdk" pages="1"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <image id="n30_j7ij" name="n30" src="nauechf" fileName="component/Result/image/bg_xjs.png" xy="0,137" size="1334,524" group="n39_j7ij">
+    <image id="n32_j7ij" name="biaoti" src="imp5cj4" fileName="component/Result/Group 725.png" xy="418,0" group="n63_imp5">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </image>
-    <image id="n32_j7ij" name="biaoti" src="m9jahc" fileName="component/Result/sb.png" xy="389,63" size="540,89" group="n39_j7ij">
       <gearDisplay controller="result" pages="0"/>
     </image>
-    <image id="n50_naue" name="n50" src="m9jahd" fileName="component/Result/sl.png" xy="390,63" size="538,83" group="n39_j7ij">
+    <image id="n30_j7ij" name="n30" src="imp5cj1" fileName="component/Result/Group 721.png" xy="-4,147" group="n63_imp5">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <group id="n63_imp5" name="n63" xy="-4,0" size="1342,611" group="n39_j7ij" advanced="true">
+      <gearDisplay controller="result" pages="0"/>
+    </group>
+    <image id="n50_naue" name="n50" src="imp5cj3" fileName="component/Result/Group 724.png" xy="418,0" group="n64_imp5">
       <gearDisplay controller="result" pages="1"/>
     </image>
-    <text id="n33_j7ij" name="n33" xy="67,198" size="122,41" group="n39_j7ij" fontSize="30" color="#c3e5e5" text="玩家昵称"/>
+    <image id="n62_imp5" name="n62" src="imp5cj2" fileName="component/Result/Group 722.png" xy="-4,147" group="n64_imp5">
-    <text id="n34_j7ij" name="n34" xy="267,198" size="63,41" group="n39_j7ij" fontSize="30" color="#c3e5e5" text="剩牌"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
-    <text id="n35_j7ij" name="n35" xy="382,198" size="63,41" group="n39_j7ij" fontSize="30" color="#c3e5e5" text="炸弹"/>
+    </image>
-    <text id="n45_i3h6" name="n45" xy="477,198" size="63,41" group="n39_j7ij" fontSize="30" color="#c3e5e5" text="飘分"/>
+    <group id="n64_imp5" name="n64" xy="-4,0" size="1342,611" group="n39_j7ij" advanced="true">
-    <text id="n36_j7ij" name="n36" xy="586,198" size="63,41" group="n39_j7ij" fontSize="30" color="#c3e5e5" text="积分"/>
+      <gearDisplay controller="result" pages="1"/>
-    <group id="n39_j7ij" name="n39" xy="0,63" size="1334,598" group="n47_m5rj" advanced="true">
+    </group>
+    <text id="n33_j7ij" name="n33" xy="227,198" size="104,34" group="n39_j7ij" font="ui://27vd145bilon7ia1" fontSize="24" color="#9c471f" bold="true" text="玩家昵称"/>
+    <text id="n34_j7ij" name="n34" xy="417,198" size="54,34" group="n39_j7ij" font="ui://27vd145bilon7ia1" fontSize="24" color="#9c471f" bold="true" text="剩牌"/>
+    <text id="n35_j7ij" name="n35" xy="505,198" size="58,36" group="n39_j7ij" font="ui://27vd145bilon7ia1" fontSize="26" color="#9c471f" bold="true" text="炸弹"/>
+    <text id="n45_i3h6" name="n45" xy="592,198" size="58,36" group="n39_j7ij" font="ui://27vd145bilon7ia1" fontSize="26" color="#9c471f" bold="true" text="飘分"/>
+    <text id="n36_j7ij" name="n36" xy="684,198" size="58,36" group="n39_j7ij" font="ui://27vd145bilon7ia1" fontSize="26" color="#9c471f" bold="true" text="积分"/>
+    <group id="n39_j7ij" name="n39" xy="-4,0" size="1342,611" group="n47_m5rj" advanced="true">
       <gearDisplay controller="sdk" pages="1"/>
     </group>
-    <list id="n38_j7ij" name="player_list_1" xy="4,250" size="1316,276" group="n47_m5rj" overflow="hidden" lineGap="-17" colGap="50" defaultItem="ui://9n9stu2eprgzei" align="center">
+    <list id="n38_j7ij" name="player_list_1" xy="186,250" size="992,276" group="n47_m5rj" colGap="50" defaultItem="ui://9n9stu2eprgzei" align="center">
       <gearDisplay controller="sdk" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>
-      <item/>
     </list>
-    <component id="n44_p0nj" name="btn_confirm" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="537,680" size="288,85" group="n18_fmkv">
+    <list id="n60_in2f" name="leftCardHand" xy="339,563" size="1984,181" group="n47_m5rj" scale="0.5,0.433" layout="flow_hz" colGap="-85" defaultItem="ui://9n9stu2eprgzb4" vAlign="middle" autoClearItems="true">
-      <gearDisplay controller="sdk" pages="1"/>
-      <gearXY controller="sdk" pages="0,1" values="590,641|537,680"/>
-      <Button icon="ui://9n9stu2em9jacgn"/>
-    </component>
-    <component id="n51_hxjc" name="btn_xipai" src="hxjccif" fileName="component/clearing/room/btn_invite(1).xml" xy="794,663" size="304,105" group="n18_fmkv">
-      <gearDisplay controller="xipai" pages="1"/>
-      <relation target="" sidePair="center-center"/>
-      <Button titleColor="#000000" titleFontSize="30" icon="ui://27vd145bf40a7i6a"/>
-    </component>
-    <group id="n18_fmkv" name="n18" xy="537,663" size="561,105" group="n47_m5rj" advanced="true"/>
-    <list id="n60_in2f" name="leftCardHand" xy="4,577" size="2636,181" group="n47_m5rj" scale="0.5,0.433" layout="flow_hz" colGap="-85" defaultItem="ui://9n9stu2eprgzb4" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>
@@ -51,11 +48,48 @@
       <item/>
       <item/>
       <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
-    <text id="n61_in2f" name="n61" xy="10,526" size="152,41" group="n47_m5rj" fontSize="30" color="#c3e5e5" text="剩余的牌：">
+    <text id="n61_in2f" name="n61" xy="186,559" size="139,36" group="n47_m5rj" font="ui://27vd145bilon7ia1" fontSize="26" color="#9c471f" bold="true" text="剩余的牌：">
       <relation target="" sidePair="left-left%"/>
     </text>
-    <group id="n47_m5rj" name="n47" xy="0,63" size="2640,705" advanced="true"/>
+    <component id="n44_p0nj" name="btn_confirm" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="523,468" size="288,85" group="n47_m5rj">
+      <gearDisplay controller="sdk" pages="1"/>
+      <gearXY controller="xipai" pages="0,1" values="523,468|347,477"/>
+      <Button icon="ui://9n9stu2eimp5ciy"/>
+    </component>
+    <component id="n51_hxjc" name="btn_xipai" src="hxjccif" fileName="component/clearing/room/btn_invite(1).xml" xy="709,475" size="304,105" group="n47_m5rj">
+      <gearDisplay controller="xipai" pages="1"/>
+      <relation target="" sidePair="center-center"/>
+      <Button titleColor="#000000" titleFontSize="30" icon="ui://9n9stu2eimp5cjg"/>
+    </component>
+    <group id="n47_m5rj" name="n47" xy="-4,0" size="2327,744" advanced="true"/>
     <component id="n46_tjnv" name="big_result" src="m9jahb" fileName="component/Result/result_main.xml" xy="0,0">
       <gearDisplay controller="sdk" pages="0"/>
     </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/clearing_item_1.xml

@@ -1,14 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,105" designImageAlpha="100" designImageLayer="1">
+<component size="992,114" designImageAlpha="100" designImageLayer="1">
   <controller name="win" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n13_hog1" name="n13" xy="0,10" size="1332,85" type="rect" lineSize="0" fillColor="#4d000000"/>
+    <image id="n13_hog1" name="n13" src="imp5cje" fileName="component/Result/Rectangle 410.png" xy="0,10" size="992,85">
-    <text id="n14_j7ij" name="shengpai" xy="254,20" size="95,60" fontSize="30" color="#c3e5e5" align="center" vAlign="middle" autoSize="shrink" text="15"/>
+      <gearDisplay controller="win" pages="0"/>
-    <text id="n15_j7ij" name="nichen" xy="5,19" size="232,60" fontSize="25" color="#c3e5e5" align="center" vAlign="middle" autoSize="shrink" text="艾泽拉斯。阿尔萨斯"/>
+    </image>
-    <text id="n16_j7ij" name="boom" xy="368,21" size="81,60" fontSize="30" color="#c3e5e5" align="center" vAlign="middle" autoSize="shrink" text="0"/>
+    <image id="n21_imp5" name="n21" src="imp5cjf" fileName="component/Result/Rectangle 420.png" xy="0,10" size="992,85">
-    <text id="n18_i3h6" name="piao" xy="470,21" size="81,60" fontSize="30" color="#c3e5e5" align="center" vAlign="middle" autoSize="shrink" text="0"/>
+      <gearDisplay controller="win" pages="1"/>
-    <text id="n17_j7ij" name="score" xy="564,10" size="133,81" fontSize="25" color="#c3e5e5" align="center" vAlign="middle" autoSize="shrink" text="0"/>
+    </image>
-    <list id="n19_in2f" name="leftCard" xy="714,-6" size="1240,269" scale="0.5,0.433" layout="flow_hz" colGap="-85" defaultItem="ui://9n9stu2eprgzb4" align="center" vAlign="middle" autoClearItems="true">
+    <text id="n14_j7ij" name="shengpai" xy="224,20" size="71,60" font="ui://27vd145bilon7ia1" fontSize="30" color="#9c471f" align="center" vAlign="middle" autoSize="shrink" bold="true" text="15"/>
+    <text id="n15_j7ij" name="nichen" xy="5,19" size="192,60" font="ui://27vd145bilon7ia1" fontSize="22" color="#9c471f" align="center" vAlign="middle" autoSize="shrink" bold="true" text="艾泽拉斯。阿尔萨斯"/>
+    <text id="n16_j7ij" name="boom" xy="318,21" size="57,60" font="ui://27vd145bilon7ia1" fontSize="30" color="#9c471f" align="center" vAlign="middle" autoSize="shrink" bold="true" text="0"/>
+    <text id="n18_i3h6" name="piao" xy="408,21" size="57,60" font="ui://27vd145bilon7ia1" fontSize="30" color="#9c471f" align="center" vAlign="middle" autoSize="shrink" bold="true" text="0"/>
+    <text id="n17_j7ij" name="score" xy="484,10" size="87,81" font="ui://27vd145bilon7ia1" fontSize="25" color="#9c471f" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="0"/>
+    <list id="n19_in2f" name="leftCard" xy="589,13" size="884,188" scale="0.458,0.433" layout="row" colGap="-85" defaultItem="ui://9n9stu2eprgzb4" align="center" vAlign="middle" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/descript_item.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="260,42">
   <displayList>
-    <text id="n1_tjnv" name="txt_value" xy="248,21" pivot="1,0.5" anchor="true" size="134,42" fontSize="30" color="#f2daaa" align="right" vAlign="middle" autoSize="none" text="100"/>
+    <text id="n1_tjnv" name="txt_value" xy="248,21" pivot="1,0.5" anchor="true" size="134,42" font="ui://27vd145bilon7ia1" fontSize="30" color="#924e00" align="right" vAlign="middle" autoSize="none" bold="true" text="100"/>
-    <text id="n0_tjnv" name="txt_key" xy="11,21" pivot="0,0.5" anchor="true" size="178,34" fontSize="30" color="#f2daaa" vAlign="middle" autoSize="none" text="11"/>
+    <text id="n0_tjnv" name="txt_key" xy="11,21" pivot="0,0.5" anchor="true" size="178,42" font="ui://27vd145bilon7ia1" fontSize="30" color="#924e00" vAlign="middle" autoSize="none" bold="true" text="11"/>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/result_head.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="55,55" scroll="both" mask="n3_ejbe">
   <displayList>
-    <loader id="n4_ejbe" name="n4" xy="0,0" size="55,55" restrictSize="55,55,55,55" aspect="true" url="ui://27vd145bklso1c" vAlign="middle" fill="scale" playing="false">
+    <loader id="n4_ejbe" name="n4" xy="0,0" size="55,55" aspect="true" url="ui://27vd145bklso1c" vAlign="middle" fill="scale" playing="false">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <graph id="n3_ejbe" name="n3" xy="0,0" size="55,55" aspect="true" type="rect" lineSize="0">

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/result_main.xml

@@ -5,19 +5,22 @@
   <controller name="share" pages="0,,1," selected="0"/>
   <displayList>
     <graph id="n30_m5rj" name="n30" xy="-427,-182" size="2189,1114" alpha="0.65" type="rect" fillColor="#ff000000"/>
-    <image id="n2_tjnv" name="n2" src="m9jahc" fileName="component/Result/sb.png" xy="403,5" group="n4_tjnv">
+    <image id="n2_tjnv" name="n2" src="m9jahc" fileName="component/Result/sb.png" xy="403,5" group="n4_tjnv" visible="false">
       <gearDisplay controller="result" pages="0"/>
     </image>
-    <image id="n3_tjnv" name="n3" src="m9jahd" fileName="component/Result/sl.png" xy="404,6" group="n4_tjnv">
+    <image id="n3_tjnv" name="n3" src="m9jahd" fileName="component/Result/sl.png" xy="404,6" group="n4_tjnv" visible="false">
       <gearDisplay controller="result" pages="1"/>
     </image>
-    <text id="n28_tjnv" name="n28" xy="463,81" size="409,74" group="n4_tjnv" fontSize="18" color="#ffffff" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
+    <text id="n28_tjnv" name="n28" xy="701,2" size="409,74" group="n4_tjnv" visible="false" fontSize="18" color="#ffffff" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
-    <group id="n4_tjnv" name="title" xy="403,5" size="528,150" advanced="true">
+    <image id="n37_imp5" name="n37" src="imp5cj7" fileName="component/Result/Group 729.png" xy="0,6" group="n4_tjnv"/>
+    <image id="n38_imp5" name="n38" src="imp5cj8" fileName="component/Result/Group 730.png" xy="643,6" group="n4_tjnv"/>
+    <image id="n39_imp5" name="n39" src="imp5cjb" fileName="component/Result/image 145.png" xy="557,279" group="n4_tjnv"/>
+    <group id="n4_tjnv" name="title" xy="0,2" size="1334,661" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
     <component id="n6_tjnv" name="btn_result_share" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="11,642" size="276,85" group="n7_tjnv">
       <relation target="" sidePair="left-left,bottom-bottom"/>
-      <Button icon="ui://9n9stu2em9jahk"/>
+      <Button icon="ui://9n9stu2eimp5cj5"/>
     </component>
     <component id="n5_tjnv" name="btn_result_confirm" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="1041,642" size="276,85" group="n7_tjnv" visible="false">
       <relation target="" sidePair="right-right,bottom-bottom"/>
@@ -39,9 +42,9 @@
       <relation target="" sidePair="left-left,top-top"/>
     </group>
     <text id="n27_tjnv" name="txt_game_name" xy="205,18" size="211,42" fontSize="24" color="#ffffff" vAlign="middle" autoSize="none" text="游戏名字"/>
-    <text id="n29_tjnv" name="txt_game_data" xy="938,98" size="280,42" fontSize="24" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="2019-12-12 18:28"/>
+    <text id="n29_tjnv" name="txt_game_data" xy="417,15" size="280,42" fontSize="24" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="2019-12-12 18:28"/>
     <text id="n15_tjnv" name="txt_room_id" xy="7,19" size="211,42" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="房号：888888"/>
-    <list id="n26_tjnv" name="player_list" xy="8,143" size="1317,498" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://9n9stu2em9jahn" align="center" vAlign="middle">
+    <list id="n26_tjnv" name="player_list" xy="-50,1029" size="1317,498" visible="false" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://9n9stu2em9jahn" align="center" vAlign="middle">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>
@@ -52,7 +55,7 @@
       <item/>
       <item/>
     </list>
-    <image id="n16_tjnv" name="n16" src="m0eibt" fileName="images/win/tkd.png" pkg="27vd145b" xy="160,190" size="1012,370" group="n17_tjnv"/>
+    <image id="n16_tjnv" name="n16" src="m0eibt" fileName="font/images/win/tkd.png" pkg="27vd145b" xy="160,190" size="1012,370" group="n17_tjnv"/>
     <component id="n18_tjnv" name="btn_close_share" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1132,208" group="n17_tjnv" controller="style,0"/>
     <component id="n22_tjnv" name="btn_share_copy" src="tjnvcg8" fileName="component/result/component/btn_share_method.xml" pkg="27vd145b" xy="588,277" group="n25_tjnv">
       <Button icon="ui://9n9stu2em9jahg"/>
@@ -68,7 +71,10 @@
       <gearDisplay controller="share" pages="1"/>
     </group>
     <component id="n36_kx91" name="btn_continue_game" src="kx91ch6" fileName="component/Result/Btn_Agran.xml" xy="1076,637" visible="false">
-      <Button icon="ui://9n9stu2ekx91ch5"/>
+      <Button icon="ui://9n9stu2eimp5cj0"/>
     </component>
+    <component id="n40_imp5" name="play_win" src="m9jahn" fileName="component/Result/big_result_item.xml" xy="166,134"/>
+    <component id="n41_imp5" name="play_lose" src="m9jahn" fileName="component/Result/big_result_item.xml" xy="886,136"/>
+    <text id="n42_imp5" name="flag_tempNew" xy="629,-522" size="1204,42" visible="false" fontSize="30" text="为了临时新界面弄的标志位，防止代码不小心被复用后报错，请及时绝对临时界面是否需要"/>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml

@@ -437,6 +437,27 @@
     <component id="thxkciv" name="btn_xipai.xml" path="/component/Result/"/>
     <image id="thxkciw" name="Group 643.png" path="/component/Result/"/>
     <image id="thxkcix" name="Group 646.png" path="/component/Result/"/>
+    <image id="imp5ciy" name="Group 715.png" path="/component/Result/"/>
+    <image id="imp5ciz" name="Group 716.png" path="/component/Result/"/>
+    <image id="imp5cj0" name="Group 720.png" path="/component/Result/"/>
+    <image id="imp5cj1" name="Group 721.png" path="/component/Result/"/>
+    <image id="imp5cj2" name="Group 722.png" path="/component/Result/"/>
+    <image id="imp5cj3" name="Group 724.png" path="/component/Result/"/>
+    <image id="imp5cj4" name="Group 725.png" path="/component/Result/"/>
+    <image id="imp5cj5" name="Group 726.png" path="/component/Result/"/>
+    <image id="imp5cj6" name="Group 727.png" path="/component/Result/"/>
+    <image id="imp5cj7" name="Group 729.png" path="/component/Result/"/>
+    <image id="imp5cj8" name="Group 730.png" path="/component/Result/"/>
+    <image id="imp5cj9" name="Group 731.png" path="/component/Result/"/>
+    <image id="imp5cja" name="Group 732.png" path="/component/Result/"/>
+    <image id="imp5cjb" name="image 145.png" path="/component/Result/"/>
+    <image id="imp5cjc" name="Rectangle 413.png" path="/component/Result/"/>
+    <image id="imp5cjd" name="Rectangle 414.png" path="/component/Result/"/>
+    <image id="imp5cje" name="Rectangle 410.png" path="/component/Result/"/>
+    <image id="imp5cjf" name="Rectangle 420.png" path="/component/Result/"/>
+    <image id="imp5cjg" name="Group 7216.png" path="/component/Result/"/>
+    <image id="imp5cji" name="Group 737.png" path="/component/Result/"/>
+    <image id="imp5cjj" name="Line 26.png" path="/component/Result/"/>
   </resources>
   <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Hotupdate/Version.xml

@@ -3,7 +3,7 @@
   <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n7_rtsl" name="n7" src="lwclq" fileName="denglu_bg_01.png" xy="-142,0">
-      <relation target="" sidePair="center-center,middle-middle"/>
+      <relation target="" sidePair="width-width,height-height%,center-center,middle-middle"/>
     </image>
     <image id="n24_xn94" name="n24" src="xn9417" fileName="hall_girl_bg@2x.png" xy="355,106" visible="false">
       <relation target="" sidePair="center-center"/>

wb_new_ui/assets/Lobby/component/group/group.xml

@@ -4,12 +4,12 @@
   <controller name="agent" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n133_lk2r" name="n133" src="m16m7dr2" fileName="images/image 91.png" xy="-142,-1">
-      <relation target="" sidePair="height-height%,center-center,middle-middle"/>
+      <relation target="" sidePair="width-width,height-height%,center-center,middle-middle"/>
     </image>
     <image id="n137_csp4" name="n137" src="csp47cn8" fileName="component/group/images/shangdi.png" xy="-40,0" size="1422,80" visible="false">
       <relation target="" sidePair="width-width,top-top"/>
     </image>
-    <image id="n138_m16m" name="n138" src="m16m7dr0" fileName="component/group/component/Group 699.png" xy="443,-6">
+    <image id="n138_m16m" name="n138" src="m16m7dr0" fileName="component/group/component/Group 699.png" xy="455,-6">
       <relation target="" sidePair="center-center,top-top"/>
     </image>
     <image id="n112_ker3" name="n112" src="ker3ji" fileName="images/fall_dialog_head_bg.png" xy="0,0" visible="false">
@@ -27,7 +27,7 @@
     <group id="n119_naup" name="n119" xy="376,88" size="476,579" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <list id="n106_nlwc" name="lst_group" xy="111,101" size="1112,517" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" scrollBarFlags="2" lineGap="5" colGap="22" defaultItem="ui://2d9xdj6znlwcgk" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n106_nlwc" name="lst_group" xy="122,147" size="1112,517" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" scrollBarFlags="2" lineGap="5" colGap="22" defaultItem="ui://2d9xdj6znlwcgk" align="center" vAlign="middle" autoClearItems="true">
       <gearDisplay controller="empty_group" pages="0"/>
       <relation target="" sidePair="width-width,height-height%,top-top%"/>
       <item/>
@@ -39,9 +39,9 @@
       <relation target="" sidePair="center-center,top-top"/>
       <Button icon="ui://2d9xdj6znlwcgr"/>
     </component>
-    <component id="n135_csp4" name="btn_creategroup" src="csp47cn5" fileName="component/group/Button9.xml" xy="503,624">
+    <component id="n135_csp4" name="btn_creategroup" src="csp47cn5" fileName="component/group/Button9.xml" xy="1006,624">
       <gearDisplay controller="agent" pages="1"/>
-      <relation target="" sidePair="center-center"/>
+      <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
   </displayList>
 </component>

wb_new_ui/assets/Login/Main.xml

@@ -3,10 +3,10 @@
   <controller name="test" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n31_lwcl" name="n31" src="lwclq" fileName="denglu_bg_01.png" pkg="0khx14ar" xy="-216,0" size="1751,750">
-      <relation target="" sidePair="center-center,middle-middle"/>
+      <relation target="" sidePair="width-width,height-height%,center-center,middle-middle"/>
     </image>
     <loader id="n79_thxk" name="clip_xuehua" xy="0,0" size="1334,750" url="ui://2zlli80mthxk7cja" align="center" vAlign="middle">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <loader id="n80_thxk" name="clip_yueque" xy="311,96" size="602,425" scale="1.2,1.2" url="ui://2zlli80mthxk7cms" align="center" vAlign="middle">
       <relation target="" sidePair="center-center,middle-middle"/>

wb_new_ui/assets/NewGroup/Main_GroupInfo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" designImageOffsetX="-208" bgColor="#000000">
-  <controller name="manager" pages="0,普通玩家,1,圈主,2,副圈主,3,合伙人" selected="3"/>
+  <controller name="manager" pages="0,普通玩家,1,圈主,2,副圈主,3,合伙人" selected="0"/>
   <controller name="null" pages="0,,1," selected="0"/>
   <controller name="fag" pages="0,,1," selected="0"/>
   <controller name="floors" pages="0,,1,,2,,3,,4,,5," selected="0"/>
@@ -43,13 +43,13 @@
       <relation target="" sidePair="right-right,top-top%"/>
       <Button icon="ui://m7iejg46iaes7icv"/>
     </component>
-    <component id="n243_n6w8" name="btn_match" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="850,22" size="59,79" visible="false">
+    <component id="n243_n6w8" name="btn_match" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="931,22" size="59,79" visible="false">
       <gearDisplay controller="manager" pages="0,1,2,3"/>
       <gearXY controller="manager" pages="0,1,2,3" values="931,22|682,22|688,23|850,22"/>
       <relation target="" sidePair="right-right,top-top%"/>
       <Button icon="ui://m7iejg46iaes7icx"/>
     </component>
-    <component id="n139_cioe" name="btn_stat" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1253,22" size="59,76">
+    <component id="n139_cioe" name="btn_stat" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1245,22" size="59,76">
       <gearXY controller="manager" pages="0,1,2,3" values="1245,22|1249,22|1253,22|1253,22"/>
       <relation target="" sidePair="right-right,top-top%"/>
       <Button icon="ui://m7iejg46iaes7ict"/>
@@ -58,13 +58,13 @@
       <gearDisplay controller="manager" pages="1,2,3"/>
       <relation target="" sidePair="right-right,top-top%"/>
     </component>
-    <component id="n242_n6w8" name="btn_hp" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="991,22" size="59,66">
+    <component id="n242_n6w8" name="btn_hp" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1154,21" size="59,66">
       <gearDisplay controller="manager" pages="0,1,2,3"/>
       <gearXY controller="manager" pages="0,1,2,3" values="1154,21|917,22|915,22|991,22"/>
       <relation target="" sidePair="right-right,top-top%"/>
       <Button icon="ui://m7iejg46iaes7icz"/>
     </component>
-    <component id="n138_cioe" name="btn_partner" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1173,22" size="60,76">
+    <component id="n138_cioe" name="btn_partner" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1169,22" size="60,76">
       <gearDisplay controller="manager" pages="1,2,3"/>
       <gearXY controller="manager" pages="2,3" values="1173,22|1173,22" default="1169,22"/>
       <relation target="" sidePair="right-right,top-top%"/>
@@ -74,15 +74,15 @@
       <gearDisplay controller="manager" pages="1,2,3"/>
       <relation target="" sidePair="right-right,top-top%"/>
     </image>
-    <component id="n241_n6w8" name="btn_share" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="966,16" size="59,76" visible="false">
+    <component id="n241_n6w8" name="btn_share" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1111,21" size="59,76" visible="false">
       <gearDisplay controller="manager" pages="0,1,2"/>
       <gearXY controller="manager" pages="0,1,2" values="1111,21|940,22|946,21" default="966,16"/>
       <relation target="" sidePair="right-right,top-top%"/>
       <Button icon="ui://m7iejg46iaes7icn"/>
     </component>
-    <component id="n256_iaes" name="btn_bxx" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="548,11" size="71,71">
+    <component id="n256_iaes" name="btn_bxx" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1060,23" size="71,71">
-      <gearDisplay controller="manager" pages="0,1,2"/>
+      <gearDisplay controller="manager" pages="0,1,2,3"/>
-      <gearXY controller="manager" pages="0,1,2" values="1060,23|824,23|822,24" default="548,11"/>
+      <gearXY controller="manager" pages="0,1,2,3" values="1060,23|824,23|822,24|899,25"/>
       <relation target="" sidePair="right-right,top-top"/>
       <Button icon="ui://m7iejg46iaes7idn"/>
     </component>
@@ -105,6 +105,41 @@
     <component id="n203_jvvo" name="btn_close" src="t1hqhy9" fileName="component/nav/Btn_.xml" xy="16,30" aspect="true">
       <relation target="" sidePair="left-left%,top-top%"/>
     </component>
+    <text id="n252_ilon" name="tex_name" xy="90,10" size="154,34" group="n78_i7lq" font="ui://27vd145bilon7ia1" fontSize="24" color="#ffffff" vAlign="middle" bold="true" text="老司机带带我">
+      <relation target="" sidePair="left-left,top-top"/>
+    </text>
+    <group id="n206_jvvo" name="n206" xy="221,-77" size="252,192" group="n176_mn85"/>
+    <image id="n248_ilon" name="n248" src="ilon7i9j" fileName="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="273,49" size="81,32" group="n206_jvvo" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" align="center" vAlign="middle" bold="true" text="疲劳值:">
+      <relation target="" sidePair="left-left,top-top"/>
+    </text>
+    <text id="n250_ilon" name="tex_fag" xy="355,49" size="113,32" group="n206_jvvo" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="A79B17">
+      <relation target="" sidePair="left-left,top-top"/>
+    </text>
+    <text id="n249_ilon" name="tex_fag_title" xy="273,80" size="80,32" group="n206_jvvo" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" align="right" vAlign="middle" letterSpacing="6" autoSize="none" bold="true" text="房卡:">
+      <relation target="" sidePair="left-left,top-top"/>
+    </text>
+    <loader id="n204_jvvo" name="icon" xy="398,-54" size="0,47" group="n206_jvvo" visible="false" url="ui://m7iejg46uybihvj" vAlign="middle">
+      <relation target="" sidePair="left-left,middle-middle"/>
+    </loader>
+    <text id="n205_jvvo" name="tex_hp" xy="355,80" size="113,32" group="n206_jvvo" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="7">
+      <relation target="" sidePair="left-left,top-top"/>
+    </text>
+    <text id="n216_ovii" name="n216" xy="221,-77" size="94,42" group="n206_jvvo" visible="false" font="FZDaBiaoSong-B06S" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
+      <relation target="" sidePair="left-left,top-top"/>
+    </text>
+    <image id="n229_csp4" name="n229" src="csp47i3u" fileName="images/room/jifen.png" xy="237,-61" group="n206_jvvo" visible="false"/>
+    <image id="n228_csp4" name="n228" src="oviicm5" fileName="images/index/bg_07.png" pkg="2d9xdj6z" xy="252,-58" size="178,38" group="n206_jvvo" visible="false"/>
+    <text id="n253_ilon" name="tex_id" xy="90,48" size="118,26" group="n78_i7lq" font="ui://27vd145bilon7ia1" fontSize="18" color="#ffffff" vAlign="middle" bold="true" text="老司机带带我">
+      <relation target="" sidePair="left-left,top-top"/>
+    </text>
+    <text id="n254_ilon" name="tex_tableNum" xy="90,75" size="130,29" group="n78_i7lq" font="ui://27vd145bilon7ia1" fontSize="20" color="#ffffff" vAlign="middle" bold="true" text="老司机带带我">
+      <relation target="" sidePair="left-left,top-top"/>
+    </text>
+    <group id="n78_i7lq" name="title" xy="90,10" size="154,94" group="n176_mn85" advanced="true"/>
+    <group id="n176_mn85" name="top" xy="90,-77" size="383,192" advanced="true"/>
     <component id="n153_cioe" name="btn_invite--" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="1293,7" size="123,0" group="n191_xsk4" visible="false" controller="tip,0">
       <gearDisplay controller="manager" pages="1,2,3"/>
       <Button icon="ui://m7iejg46cioehok"/>
@@ -121,39 +156,6 @@
       <Button icon="ui://m7iejg46cioehoj"/>
     </component>
     <group id="n175_mn85" name="n175" xy="858,4" size="54,55"/>
-    <text id="n252_ilon" name="tex_name" xy="90,10" size="154,34" group="n78_i7lq" font="ui://27vd145bilon7ia1" fontSize="24" color="#ffffff" vAlign="middle" bold="true" strokeColor="#a79b17" text="老司机带带我">
-      <relation target="" sidePair="left-left,top-top"/>
-    </text>
-    <text id="n253_ilon" name="tex_id" xy="90,48" size="118,26" group="n78_i7lq" font="ui://27vd145bilon7ia1" fontSize="18" color="#ffffff" vAlign="middle" bold="true" strokeColor="#a79b17" text="老司机带带我">
-      <relation target="" sidePair="left-left,top-top"/>
-    </text>
-    <text id="n254_ilon" name="tex_tableNum" xy="90,75" size="130,29" group="n78_i7lq" font="ui://27vd145bilon7ia1" fontSize="20" color="#ffffff" vAlign="middle" bold="true" strokeColor="#a79b17" text="老司机带带我">
-      <relation target="" sidePair="left-left,top-top"/>
-    </text>
-    <group id="n78_i7lq" name="title" xy="90,10" size="154,94" group="n176_mn85" advanced="true"/>
-    <image id="n228_csp4" name="n228" src="oviicm5" fileName="images/index/bg_07.png" pkg="2d9xdj6z" xy="252,-80" size="178,38" group="n206_jvvo" visible="false"/>
-    <image id="n248_ilon" name="n248" src="ilon7i9j" fileName="Rectangle 13.png" xy="261,15" size="202,87" group="n206_jvvo"/>
-    <image id="n229_csp4" name="n229" src="csp47i3u" fileName="images/room/jifen.png" xy="237,-83" group="n206_jvvo" visible="false"/>
-    <text id="n216_ovii" name="n216" xy="221,-99" size="94,42" group="n206_jvvo" visible="false" font="FZDaBiaoSong-B06S" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
-      <relation target="" sidePair="left-left,top-top"/>
-    </text>
-    <text id="n205_jvvo" name="tex_hp" xy="355,58" size="113,32" group="n206_jvvo" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" bold="true" strokeColor="#a79b17" text="A79B17">
-      <relation target="" sidePair="left-left,top-top"/>
-    </text>
-    <loader id="n204_jvvo" name="icon" xy="398,-76" size="0,47" group="n206_jvvo" visible="false" url="ui://m7iejg46uybihvj" vAlign="middle">
-      <relation target="" sidePair="left-left,middle-middle"/>
-    </loader>
-    <text id="n249_ilon" name="tex_fag_title" xy="295,58" size="58,32" group="n206_jvvo" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#a79b17" text="房卡:">
-      <relation target="" sidePair="left-left,top-top"/>
-    </text>
-    <text id="n250_ilon" name="tex_fag" xy="355,27" size="113,32" group="n206_jvvo" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" bold="true" strokeColor="#a79b17" text="A79B17">
-      <relation target="" sidePair="left-left,top-top"/>
-    </text>
-    <text id="n251_ilon" name="tex_hp_title" xy="273,27" size="81,32" group="n206_jvvo" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#a79b17" text="疲劳值:">
-      <relation target="" sidePair="left-left,top-top"/>
-    </text>
-    <group id="n206_jvvo" name="n206" xy="221,-99" size="247,201" group="n176_mn85"/>
-    <group id="n176_mn85" name="top" xy="90,-99" size="378,203" advanced="true"/>
     <list id="n45_l0s4" name="lst_room" xy="72,144" size="1190,487" layout="flow_hz" selectionMode="none" overflow="scroll" scrollBarFlags="2" lineGap="26" colGap="60" defaultItem="ui://m7iejg46ilon7i9l" autoClearItems="true">
       <gearDisplay controller="null" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -212,7 +214,7 @@
       <relation target="" sidePair="left-left,top-bottom"/>
     </component>
     <group id="n74_i7lq" name="bottom" xy="-70,656" size="1404,320" advanced="true"/>
-    <component id="n159_lnha" name="com_notice" src="lnhahsf" fileName="component/notice/Cgm_message.xml" xy="262,107" size="900,35">
+    <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"/>
     </component>

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="0"/>
+  <controller name="type" pages="0,,1,,2,,3," selected="3"/>
   <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">
@@ -40,13 +40,13 @@
       <Button title=" " icon="ui://m7iejg46ruljhmn"/>
     </component>
     <group id="n70_tqi8" name="group_relation" xy="390,154" size="561,202" visible="false" advanced="true"/>
-    <image id="n62_tqi8" name="n62" src="kwi0hl0" fileName="mgr/imgs/member/glybz.png" xy="334,144" group="n64_tqi8">
+    <image id="n62_tqi8" name="n62" src="kwi0hl0" fileName="mgr/imgs/member/glybz.png" xy="294,104" group="n64_tqi8">
       <gearDisplay controller="type" pages="1,2"/>
     </image>
-    <image id="n63_tqi8" name="n63" src="kwi0hl6" fileName="mgr/imgs/member/hhr.png" xy="334,144" group="n64_tqi8">
+    <image id="n63_tqi8" name="n63" src="kwi0hl6" fileName="mgr/imgs/member/hhr.png" xy="294,104" group="n64_tqi8">
       <gearDisplay controller="type" pages="3"/>
     </image>
-    <group id="n64_tqi8" name="group_role" xy="334,144" size="36,36"/>
+    <group id="n64_tqi8" name="group_role" xy="294,104" size="36,36"/>
     <list id="n73_tqi8" name="lst_mng" xy="94,267" size="776,328" layout="flow_hz" overflow="scroll" lineGap="23" colGap="1" defaultItem="ui://m7iejg46kwi0hlb" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>

wb_new_ui/assets/NewGroup/Win_Takelog.xml

@@ -28,7 +28,7 @@
     <component id="n32_p747" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="98,513" group="n31_kk3u"/>
     <text id="n33_p747" name="n33" xy="404,527" size="24,29" group="n31_kk3u" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" text="至"/>
     <component id="n34_p747" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="446,513" group="n31_kk3u"/>
-    <component id="n35_p747" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="762,513" group="n31_kk3u"/>
+    <component id="n35_p747" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="762,513" group="n31_kk3u" visible="false"/>
-    <group id="n31_kk3u" name="n31" xy="98,513" size="801,60" advanced="true"/>
+    <group id="n31_kk3u" name="n31" xy="98,513" size="802,74" advanced="true"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_cancel.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="232,84" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_imp5" name="n3" src="imp57igj" fileName="component/Btn/date_set/Group 713.png" xy="-12,-12"/>
+  </displayList>
+  <Button downEffect="scale" downEffectValue=".8"/>
+</component>

wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_ok.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="232,84" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_imp5" name="n3" src="imp57igk" fileName="component/Btn/date_set/Group 714.png" xy="-12,-12"/>
+  </displayList>
+  <Button downEffect="scale" downEffectValue=".8"/>
+</component>

wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_timeTog_child.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="300,50" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <text id="n3_imp5" name="title" xy="80,3" size="140,44" fontSize="32" color="#ffedcf" bold="true" text="12月31日"/>
+    <image id="n4_imp5" name="n4" src="imp57ige" fileName="component/Btn/date_set/Line 24.png" xy="8,0" group="n7_imp5"/>
+    <image id="n5_imp5" name="n5" src="imp57ige" fileName="component/Btn/date_set/Line 24.png" xy="8,49" group="n7_imp5"/>
+    <image id="n6_imp5" name="n6" src="imp57igh" fileName="component/Btn/date_set/Vector.png" xy="238,9" group="n7_imp5"/>
+    <group id="n7_imp5" name="down" xy="8,0" size="284,50" advanced="true">
+      <gearDisplay controller="button" pages="1"/>
+    </group>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/NewGroup/component/Btn/date_set/com_set_time_together.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,423">
+<component size="1334,750">
-  <displayList/>
+  <displayList>
+    <graph id="n11_imp5" name="n11" xy="0,0" size="1334,750" type="rect" lineSize="0" lineColor="#99000000" fillColor="#99000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <image id="n0_imp5" name="n0" src="imp57igg" fileName="component/Btn/date_set/Rectangle 420.png" xy="230,120" group="n3_imp5"/>
+    <image id="n1_imp5" name="n1" src="imp57igg" fileName="component/Btn/date_set/Rectangle 420.png" xy="814,120" group="n3_imp5"/>
+    <text id="n4_imp5" name="n4" xy="304,130" size="152,49" group="n3_imp5" font="ui://27vd145bilon7ia1" fontSize="36" color="#ffedcf" bold="true" text="开始时间"/>
+    <image id="n2_imp5" name="n2" src="imp57igf" fileName="component/Btn/date_set/Polygon 3(1).png" xy="631,275" group="n3_imp5"/>
+    <text id="n5_imp5" name="n5" xy="888,130" size="152,49" group="n3_imp5" font="ui://27vd145bilon7ia1" fontSize="36" color="#ffedcf" bold="true" text="结束时间"/>
+    <group id="n3_imp5" name="bg" xy="230,120" size="884,400"/>
+    <list id="n6_imp5" name="list_start" xy="232,185" size="296,333" overflow="scroll" defaultItem="ui://m7iejg46imp57igi">
+      <item/>
+    </list>
+    <list id="n7_imp5" name="list_end" xy="816,185" size="296,333" overflow="scroll" defaultItem="ui://m7iejg46imp57igi">
+      <item/>
+    </list>
+    <component id="n9_imp5" name="btn_ok" src="imp57igl" fileName="component/Btn/date_set/btn_ok.xml" xy="712,566"/>
+    <component id="n10_imp5" name="btn_cancel" src="imp57ign" fileName="component/Btn/date_set/btn_cancel.xml" xy="399,566"/>
+  </displayList>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_detail_info(1).xml

@@ -5,13 +5,13 @@
     <image id="n10_hp03" name="n10" src="a6k77i7r" fileName="component/nav/tj_bg_07.png" xy="0,0" size="1236,93">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n4_irlq" name="tex_num" xy="287,20" size="129,37" font="Microsoft YaHei" fontSize="20" color="#9c5c36" align="center" autoSize="none" bold="true" text="22222222">
+    <text id="n4_irlq" name="tex_num" xy="351,20" size="129,37" font="ui://27vd145bilon7ia1" fontSize="26" color="#ff8000" align="center" autoSize="none" bold="true" text="22222222">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n7_irlq" name="tex_time" xy="801,8" size="187,61" font="Microsoft YaHei" fontSize="20" color="#9c5c36" align="center" vAlign="middle" leading="-5" autoSize="none" bold="true" text="2018-10-14&#xA;14:00">
+    <text id="n7_irlq" name="tex_time" xy="801,8" size="187,61" font="ui://27vd145bilon7ia1" fontSize="24" color="#9c5c36" align="center" vAlign="middle" leading="-5" autoSize="none" bold="true" text="2018-10-14&#xA;14:00">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n8_task" name="tex_reason" xy="472,3" size="322,67" font="Microsoft YaHei" fontSize="20" color="#9c5c36" align="center" vAlign="middle" ubb="true" autoSize="none" bold="true" autoClearText="true" text="[color=#8D1235]某某电[/color] 操作增加">
+    <text id="n8_task" name="tex_reason" xy="472,3" size="322,67" font="ui://27vd145bilon7ia1" fontSize="22" color="#9c5c36" align="center" vAlign="middle" ubb="true" autoSize="none" bold="true" autoClearText="true" text="[color=#8D1235]某某电[/color] 操作增加">
       <relation target="" sidePair="center-center%"/>
     </text>
   </displayList>

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

@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1236,93">
+<component size="1193,105">
-  <controller name="add" pages="0,,1," selected="0"/>
+  <controller name="add" pages="0,,1," selected="1"/>
-  <controller name="show_check" pages="0,,1," selected="0"/>
+  <controller name="show_check" pages="0,,1," selected="1"/>
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n49_hp03" name="n49" src="a6k77i7r" fileName="component/nav/tj_bg_07.png" xy="0,0" size="1236,93">
+    <image id="n49_hp03" name="n49" src="m16m7igd" fileName="component/nav/Rectangle 408.png" xy="0,0" size="1193,105">
       <relation target="" sidePair="width-width"/>
     </image>
     <image id="n14_l0s4" name="n14" src="lwcl2m" fileName="font/images/head/index_bg_01.png" pkg="27vd145b" xy="2,9" size="75,74" aspect="true" visible="false"/>
-    <component id="n15_l0s4" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="3,7" aspect="true">
+    <component id="n15_l0s4" name="btn_head" src="ltr0hqw" fileName="component/Lst_room/Head.xml" xy="26,12" size="74,74" aspect="true">
-      <relation target="" sidePair="center-center%"/>
+      <relation target="" sidePair="left-left%,top-top"/>
     </component>
-    <text id="n16_l0s4" name="tex_name" xy="84,12" size="113,68" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" autoSize="none" bold="true" autoClearText="true" text="我的点点滴滴">
+    <text id="n16_l0s4" name="tex_name" xy="107,16" size="184,32" font="ui://27vd145bilon7ia1" fontSize="20" color="#444444" autoSize="none" bold="true" autoClearText="true" text="我的点点滴滴">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n17_l0s4" name="tex_num" xy="279,27" size="129,37" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" align="center" autoSize="none" bold="true" autoClearText="true" text="22222222">
+    <text id="n17_l0s4" name="tex_num" xy="337,34" size="129,37" font="ui://27vd145bilon7ia1" fontSize="26" color="#663300" align="center" autoSize="none" bold="true" autoClearText="true" text="22222222">
-      <gearColor controller="add" pages="0,1" values="#495f55,#000000|#663300,#000000"/>
+      <gearColor controller="add" pages="0,1" values="#444444,#000000|#663300,#000000"/>
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n22_r96t" name="tex_reason" xy="512,6" size="259,83" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="none" bold="true" autoClearText="true" text="[color=#8D1235]某某电[/color] 操作增加">
+    <text id="n22_r96t" name="tex_reason" xy="489,6" size="259,83" font="ui://27vd145bilon7ia1" fontSize="26" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="shrink" bold="true" autoClearText="true" text="[color=#8D1235]某某电[/color] 操作增加">
       <gearDisplay controller="show_check" pages="0"/>
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n33_fk7k" name="tex_fag" xy="1047,25" size="125,37" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" align="center" autoSize="none" bold="true" autoClearText="true" text="33">
+    <text id="n33_fk7k" name="tex_fag" xy="1008,25" size="125,37" font="ui://27vd145bilon7ia1" fontSize="24" color="#444444" align="center" autoSize="none" bold="true" autoClearText="true" text="33">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n42_gltd" name="tex_time" xy="807,14" size="187,61" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" align="center" vAlign="middle" leading="-5" autoSize="none" bold="true" autoClearText="true" text="2018-10-14&#xA;14:00">
+    <text id="n42_gltd" name="tex_time" xy="775,16" size="187,61" font="ui://27vd145bilon7ia1" fontSize="24" color="#444444" align="center" vAlign="middle" leading="-5" autoSize="none" bold="true" autoClearText="true" text="2018-10-14&#xA;14:00">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <component id="n43_irlq" name="btn_check" src="irlqi01" fileName="component/Lst_fag/Btn_lst_fag.xml" xy="528,6">
+    <component id="n43_irlq" name="btn_check" src="irlqi01" fileName="component/Lst_fag/Btn_lst_fag.xml" xy="506,6">
       <gearDisplay controller="show_check" pages="1"/>
       <relation target="" sidePair="center-center%"/>
-      <Button icon="ui://m7iejg46oj7khwf" controller="c1" page="1"/>
+      <Button checked="true" icon="ui://m7iejg46iaes7icg" controller="c1" page="1"/>
     </component>
-    <list id="n44_irlq" name="lst" xy="0,95" size="1236,278" overflow="scroll" lineGap="1" defaultItem="ui://m7iejg46irlqi02" autoClearItems="true">
+    <list id="n44_irlq" name="lst" xy="0,99" size="1193,278" overflow="scroll" lineGap="1" defaultItem="ui://m7iejg46irlqi02" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -45,9 +45,12 @@
       <item/>
       <item/>
     </list>
-    <text id="n45_task" name="tex_game" xy="534,-1" size="175,78" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="shrink" bold="true" autoClearText="true" text="常德跑胡子">
+    <text id="n45_task" name="tex_game" xy="512,-1" size="175,78" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="shrink" bold="true" autoClearText="true" text="常德跑胡子">
       <gearDisplay controller="show_check" pages="1"/>
       <relation target="" sidePair="center-center%"/>
     </text>
+    <text id="n50_m16m" name="tex_id" xy="107,49" size="184,34" font="ui://27vd145bilon7ia1" fontSize="24" color="#444444" autoSize="none" bold="true" autoClearText="true" text="我的点点滴滴">
+      <relation target="" sidePair="center-center%"/>
+    </text>
   </displayList>
 </component>

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

@@ -7,7 +7,7 @@
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46h60mhyq"/>
     </component>
-    <text id="n53_n96g" name="tex_round" xy="107,83" size="39,30" font="ui://27vd145bilon7ia1" fontSize="21" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" strokeColor="#a79b17" autoClearText="true" text="8/1">
+    <text id="n53_n96g" name="tex_round" xy="106,82" size="41,32" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <text id="n52_n96g" name="tex_gamename" xy="62,52" size="129,35" font="ui://27vd145bilon7ia1" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="shrink" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">

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

@@ -7,7 +7,7 @@
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46h60mhyq"/>
     </component>
-    <text id="n53_n96g" name="tex_round" xy="107,83" size="39,30" font="ui://27vd145bilon7ia1" fontSize="21" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" strokeColor="#a79b17" autoClearText="true" text="8/1">
+    <text id="n53_n96g" name="tex_round" xy="106,82" size="41,32" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <text id="n52_n96g" name="tex_gamename" xy="62,52" size="129,35" font="ui://27vd145bilon7ia1" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="shrink" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">

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

@@ -7,7 +7,7 @@
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46h60mhyq"/>
     </component>
-    <text id="n53_n96g" name="tex_round" xy="107,83" size="39,30" font="ui://27vd145bilon7ia1" fontSize="21" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" strokeColor="#a79b17" autoClearText="true" text="8/1">
+    <text id="n53_n96g" name="tex_round" xy="106,82" size="41,32" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <text id="n52_n96g" name="tex_gamename" xy="62,52" size="129,35" font="ui://27vd145bilon7ia1" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="shrink" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">

wb_new_ui/assets/NewGroup/mgr/View_GroupMemberHpList.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1396,690">
   <controller name="search" pages="0,,1," selected="1"/>
-  <controller name="page" pages="0,,1,,2," selected="1"/>
+  <controller name="page" pages="0,,1,,2," selected="0"/>
   <controller name="mng" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n133_ilon" name="n133" src="ilon7iaz" fileName="mgr/imgs/numberHpAlone/Group 545.png" xy="0,0"/>
+    <image id="n133_ilon" name="n133" src="ilon7iaz" fileName="mgr/imgs/numberHpAlone/Group 545.png" xy="0,1" size="1396,692"/>
-    <component id="n20_kwi0" name="btn_back" src="ilon7ibk" fileName="mgr/component/numberHpAlone/Btn_back1.xml" xy="1273,146" size="71,54" group="n49_jd7v">
+    <component id="n20_kwi0" name="btn_back" src="ilon7ibk" fileName="mgr/component/numberHpAlone/Btn_back1.xml" xy="1273,138" size="71,54" group="n49_jd7v">
       <gearDisplay controller="search" pages="1"/>
     </component>
-    <list id="n2_kwi0" name="lst_member" xy="41,296" size="1320,374" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="12" colGap="5" defaultItem="ui://m7iejg46ilon7ibc" autoClearItems="true">
+    <list id="n2_kwi0" name="lst_member" xy="41,247" size="1320,355" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="-32" colGap="5" defaultItem="ui://m7iejg46ilon7ibc" autoClearItems="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -18,7 +18,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n90_tyis" name="lst_member_find" xy="41,296" size="1320,374" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="12" colGap="5" defaultItem="ui://m7iejg46ilon7ibc" autoClearItems="true">
+    <list id="n90_tyis" name="lst_member_find" xy="41,266" size="1320,399" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="-32" colGap="5" defaultItem="ui://m7iejg46ilon7ibc" autoClearItems="true">
       <gearDisplay controller="search" pages="1"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -28,35 +28,45 @@
       <item/>
       <item/>
     </list>
-    <image id="n135_ilon" name="n135" src="ilon7ib6" fileName="mgr/imgs/numberHpAlone/Group 553.png" xy="38,226" group="n45_tqi8"/>
+    <image id="n135_ilon" name="n135" src="ilon7ib6" fileName="mgr/imgs/numberHpAlone/Group 553.png" xy="38,196" group="n45_tqi8"/>
-    <group id="n45_tqi8" name="n45" xy="38,226" size="1323,444" group="n49_jd7v"/>
+    <component id="n137_imp5" name="btn_less" src="imp57igq" fileName="mgr/component/numberHpAlone/btn_less.xml" xy="426,603" group="n45_tqi8">
-    <text id="n21_cioe" name="n21" xy="1074,-87" size="87,35" group="n33_rpaz" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" vAlign="middle" autoSize="none" text="总人数:"/>
+      <gearDisplay controller="search" pages="0"/>
-    <text id="n22_cioe" name="tex_memb_num" xy="1166,-86" size="130,35" group="n33_rpaz" font="ui://27vd145bqz637ij2" fontSize="25" color="#367256" vAlign="middle" autoSize="shrink" text="0"/>
+    </component>
-    <group id="n33_rpaz" name="n33" xy="1074,-87" size="221,36" group="n46_tqi8" visible="false" advanced="true">
+    <component id="n138_imp5" name="btn_add" src="imp57igr" fileName="mgr/component/numberHpAlone/btn_add.xml" xy="806,602" group="n45_tqi8">
+      <gearDisplay controller="search" pages="0"/>
+    </component>
+    <text id="n139_imp5" name="text_ye" xy="629,612" size="136,62" group="n45_tqi8" font="ui://27vd145bilon7ia1" fontSize="36" color="#c07d00" align="center" vAlign="middle" autoSize="shrink" bold="true" text="99/99">
+      <gearDisplay controller="search" pages="0"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n45_tqi8" name="n45" xy="38,196" size="1323,481" group="n49_jd7v"/>
+    <text id="n21_cioe" name="n21" xy="1074,-95" size="87,35" group="n33_rpaz" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" vAlign="middle" autoSize="none" text="总人数:"/>
+    <text id="n22_cioe" name="tex_memb_num" xy="1166,-94" size="130,35" group="n33_rpaz" font="ui://27vd145bqz637ij2" fontSize="25" color="#367256" vAlign="middle" autoSize="shrink" text="0"/>
+    <group id="n33_rpaz" name="n33" xy="1074,-95" size="221,36" group="n46_tqi8" visible="false" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <text id="n27_cioe" name="n27" xy="1075,-56" size="87,35" group="n35_rpaz" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" vAlign="middle" autoSize="none" text="总积分:"/>
+    <text id="n27_cioe" name="n27" xy="1075,-64" size="87,35" group="n35_rpaz" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" vAlign="middle" autoSize="none" text="总积分:"/>
-    <text id="n28_cioe" name="tex_total_hp" xy="1166,-56" size="130,35" group="n35_rpaz" font="ui://27vd145bqz637ij2" fontSize="25" color="#367256" vAlign="middle" autoSize="shrink" text="000000000"/>
+    <text id="n28_cioe" name="tex_total_hp" xy="1166,-64" size="130,35" group="n35_rpaz" font="ui://27vd145bqz637ij2" fontSize="25" color="#367256" vAlign="middle" autoSize="shrink" text="000000000"/>
-    <group id="n35_rpaz" name="n35" xy="1075,-56" size="221,35" group="n46_tqi8" visible="false" advanced="true">
+    <group id="n35_rpaz" name="n35" xy="1075,-64" size="221,35" group="n46_tqi8" visible="false" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <image id="n130_vyn3" name="n130" src="ilon7ib5" fileName="mgr/imgs/numberHpAlone/Group 551.png" xy="162,124" group="n7_kwi0"/>
+    <image id="n130_vyn3" name="n130" src="ilon7ib5" fileName="mgr/imgs/numberHpAlone/Group 551.png" xy="162,116" group="n7_kwi0"/>
-    <text id="n6_kwi0" name="tex_id" xy="162,124" size="220,72" group="n7_kwi0" font="ui://27vd145bilon7ia1" fontSize="24" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" singleLine="true" autoClearText="true" text="123456" input="true" prompt="[COLOR=#999999]请输入玩家ID[/COLOR]" maxLength="8"/>
+    <text id="n6_kwi0" name="tex_id" xy="162,116" size="220,72" group="n7_kwi0" font="ui://27vd145bilon7ia1" fontSize="24" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" singleLine="true" autoClearText="true" text="123456" input="true" prompt="[COLOR=#999999]请输入玩家ID[/COLOR]" maxLength="8"/>
-    <group id="n7_kwi0" name="n7" xy="162,124" size="220,72" group="n47_tqi8" advanced="true"/>
+    <group id="n7_kwi0" name="n7" xy="162,116" size="220,72" group="n47_tqi8" advanced="true"/>
-    <component id="n8_kwi0" name="btn_search" src="ilon7iba" fileName="mgr/component/numberHpAlone/btn_req.xml" xy="396,124" group="n47_tqi8"/>
+    <component id="n8_kwi0" name="btn_search" src="ilon7iba" fileName="mgr/component/numberHpAlone/btn_req.xml" xy="396,116" group="n47_tqi8"/>
-    <component id="n136_ilon" name="n136" src="ilon7ibb" fileName="mgr/component/numberHpAlone/btn_ref.xml" xy="52,120" group="n47_tqi8"/>
+    <component id="n136_ilon" name="n136" src="ilon7ibb" fileName="mgr/component/numberHpAlone/btn_ref.xml" xy="52,112" group="n47_tqi8"/>
-    <group id="n47_tqi8" name="n47" xy="52,120" size="495,76" group="n46_tqi8" advanced="true">
+    <group id="n47_tqi8" name="n47" xy="52,112" size="495,76" group="n46_tqi8" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <component id="n132_z384" name="n132" src="z3847i6n" fileName="component/Btn/ComboBox3.xml" xy="57,-86" group="n46_tqi8" visible="false">
+    <component id="n132_z384" name="n132" src="z3847i6n" fileName="component/Btn/ComboBox3.xml" xy="57,-94" group="n46_tqi8" visible="false">
       <ComboBox visibleItemCount="10">
         <item title="全部成员" value="2"/>
         <item title="在线状态" value="1"/>
         <item title="离线状态" value="0"/>
       </ComboBox>
     </component>
-    <group id="n46_tqi8" name="n46" xy="52,-87" size="1244,283" group="n49_jd7v"/>
+    <group id="n46_tqi8" name="n46" xy="52,-95" size="1244,283" group="n49_jd7v"/>
-    <group id="n49_jd7v" name="n49" xy="38,-87" size="1323,757" advanced="true">
+    <group id="n49_jd7v" name="n49" xy="38,-95" size="1323,772" advanced="true">
       <gearDisplay controller="page" pages="0,1"/>
     </group>
     <list id="n69_jd7v" name="lst_joins" xy="13,3" size="973,618" visible="false" layout="flow_hz" selectionMode="none" overflow="scroll" lineGap="26" colGap="43" defaultItem="ui://m7iejg46l0s41z" autoClearItems="true">

wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml

@@ -18,27 +18,27 @@
       <gearDisplay controller="mng" pages="1"/>
       <Button title="全部队员" controller="page" page="1"/>
     </component>
-    <image id="n115_csp4" name="n115" src="yscl7ic3" fileName="images/allNumber/Group 586.png" xy="26,23" size="1093,56" group="n89_t1hq">
+    <image id="n115_csp4" name="n115" src="csp47i44" fileName="component/nav/sd.png" xy="19,4" size="1093,56" group="n89_t1hq">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n83_t1hq" name="n83" xy="12,14" size="145,175" group="n88_t1hq" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" autoSize="shrink" text="玩家昵称">
+    <text id="n83_t1hq" name="n83" xy="12,6" size="166,42" group="n88_t1hq" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" text="玩家昵称">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n91_task" name="n91" xy="220,13" size="113,175" group="n88_t1hq" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" autoSize="none" text="总场次">
+    <text id="n91_task" name="n91" xy="251,7" size="166,42" group="n88_t1hq" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" text="总场次">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n85_t1hq" name="n85" xy="401,13" size="164,175" group="n88_t1hq" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" autoSize="none" text="赛分">
+    <text id="n85_t1hq" name="n85" xy="401,11" size="164,42" group="n88_t1hq" visible="false" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" autoSize="none" text="赛分">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n87_t1hq" name="n87" xy="614,13" size="166,175" group="n88_t1hq" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" autoSize="none" text="入会时间">
+    <text id="n87_t1hq" name="n87" xy="474,6" size="166,42" group="n88_t1hq" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" text="入会时间">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n86_t1hq" name="n86" xy="766,13" size="133,175" group="n88_t1hq" visible="false" font="ui://27vd145bqz637ij2" fontSize="26" color="#367256" align="center" autoSize="none" text="状态">
+    <text id="n86_t1hq" name="n86" xy="766,11" size="133,42" group="n88_t1hq" visible="false" font="ui://27vd145bqz637ij2" fontSize="26" color="#367256" align="center" autoSize="none" text="状态">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <group id="n88_t1hq" name="n88" xy="12,13" size="886,176" group="n89_t1hq" visible="false" advanced="true"/>
+    <group id="n88_t1hq" name="n88" xy="12,6" size="887,47" group="n89_t1hq" advanced="true"/>
-    <group id="n89_t1hq" name="col" xy="12,13" size="1106,176" group="n45_tqi8"/>
+    <group id="n89_t1hq" name="col" xy="12,4" size="1100,56" group="n45_tqi8"/>
-    <list id="n2_kwi0" name="lst_member" xy="26,85" size="1091,455" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="22" colGap="5" defaultItem="ui://m7iejg46z3847i6q" autoClearItems="true">
+    <list id="n2_kwi0" name="lst_member" xy="20,65" size="1091,471" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="7" colGap="5" defaultItem="ui://m7iejg46z3847i6q" autoClearItems="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -48,7 +48,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n90_tyis" name="lst_member_find" xy="26,85" size="1091,455" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="22" colGap="5" defaultItem="ui://m7iejg46z3847i6q" autoClearItems="true">
+    <list id="n90_tyis" name="lst_member_find" xy="26,83" size="1091,455" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="22" colGap="5" defaultItem="ui://m7iejg46z3847i6q" autoClearItems="true">
       <gearDisplay controller="search" pages="1"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -58,7 +58,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n45_tqi8" name="n45" xy="12,13" size="1106,527" group="n49_jd7v"/>
+    <group id="n45_tqi8" name="n45" xy="12,4" size="1105,534" group="n49_jd7v"/>
     <component id="n20_kwi0" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="866,19" size="71,54" group="n49_jd7v">
       <gearDisplay controller="search" pages="1"/>
       <Button controller="search" page="0"/>
@@ -91,7 +91,7 @@
       <relation target="" sidePair="center-center%,top-top%"/>
     </image>
     <group id="n46_tqi8" name="n46" xy="286,-110" size="853,158" group="n49_jd7v"/>
-    <group id="n49_jd7v" name="n49" xy="12,-110" size="1127,650" advanced="true">
+    <group id="n49_jd7v" name="n49" xy="12,-110" size="1127,648" 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_GroupPartnerList.xml

@@ -6,7 +6,7 @@
     <image id="n150_iaes" name="n150" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1132,550">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n134_b8zx" name="n134" src="iaes7icj" fileName="images/allNumber/Group 618.png" xy="15,2" size="1097,58">
+    <image id="n134_b8zx" name="n134" src="csp47i44" fileName="component/nav/sd.png" xy="15,2" size="1097,58">
       <relation target="" sidePair="width-width%"/>
     </image>
     <component id="n78_nk4v" name="n78" src="eeqmch0" fileName="buttons/Btn_menu_v.xml" pkg="27vd145b" xy="13,-110" visible="false">
@@ -15,27 +15,27 @@
     <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="n98_yetw" name="n98" src="ivzcchb" fileName="font/images/win/dbt.png" pkg="27vd145b" xy="-33,-21" size="1114,51" group="n20_gls1" visible="false"/>
+    <image id="n98_yetw" name="n98" src="ivzcchb" fileName="font/images/win/dbt.png" pkg="27vd145b" xy="-32,-21" size="1114,51" group="n20_gls1" visible="false"/>
-    <text id="n99_sbng" name="n99" xy="62,14" size="98,34" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" text="玩家昵称">
+    <text id="n99_sbng" name="n99" xy="63,14" size="98,34" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" text="玩家昵称">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n101_sbng" name="n101" xy="269,15" size="28,34" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" text="ID">
+    <text id="n101_sbng" name="n101" xy="300,15" size="28,34" group="n108_sbng" visible="false" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" text="ID">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n103_sbng" name="n103" xy="422,14" size="51,34" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" text="成员">
+    <text id="n103_sbng" name="n103" xy="363,14" size="51,34" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" text="成员">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n105_sbng" name="n105" xy="621,14" size="51,34" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" text="积分">
+    <text id="n105_sbng" name="n105" xy="622,14" size="51,34" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" text="积分">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n107_sbng" name="n107" xy="801,14" size="51,34" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" text="奖励">
+    <text id="n107_sbng" name="n107" xy="802,14" size="51,34" group="n108_sbng" visible="false" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" text="奖励">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n110_hkvh" name="n110" xy="879,14" size="124,42" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" autoSize="none" text="备注">
+    <text id="n110_hkvh" name="n110" xy="920,14" size="124,42" group="n108_sbng" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" autoSize="none" text="备注">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <group id="n108_sbng" name="n108" xy="62,14" size="940,42" group="n20_gls1" visible="false" advanced="true"/>
+    <group id="n108_sbng" name="n108" xy="63,14" size="981,42" group="n20_gls1" advanced="true"/>
-    <group id="n20_gls1" name="col" xy="-33,-21" size="1114,77" group="n77_nk4v"/>
+    <group id="n20_gls1" name="col" xy="-32,-21" size="1114,77" group="n77_nk4v"/>
     <list id="n21_gls1" name="lst_partner" xy="15,66" size="1096,469" group="n77_nk4v" overflow="scroll" lineGap="23" defaultItem="ui://m7iejg46cioehoa" autoClearItems="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="width-width"/>
@@ -93,7 +93,7 @@
       <relation target="" sidePair="center-center%,top-top%"/>
     </image>
     <group id="n149_iaes" name="n149" xy="306,-109" size="852,178" group="n77_nk4v"/>
-    <group id="n77_nk4v" name="n77" xy="-33,-109" size="1191,644" advanced="true">
+    <group id="n77_nk4v" name="n77" xy="-32,-109" size="1190,644" 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="168,408" group="n126_yre9">

wb_new_ui/assets/NewGroup/mgr/View_GroupPersonStat.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1132,550">
-  <controller name="record" pages="0,,1," selected="1"/>
+  <controller name="record" pages="0,,1," selected="0"/>
   <controller name="type" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n142_m16m" name="n142" src="yscl7ic1" fileName="images/allNumber/Rectangle 377.png" xy="0,0" size="1132,550">
@@ -11,14 +11,14 @@
       <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="331,487" size="232,51" group="n104_kwi0"/>
+    <component id="n117_l679" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="305,487" size="232,51" group="n104_kwi0"/>
-    <text id="n123_omkm" name="n123" xy="626,503" size="24,29" group="n104_kwi0" font="ui://27vd145bqz637ij2" fontSize="20" color="#367256" align="center" vAlign="middle" text="至"/>
+    <text id="n123_omkm" name="n123" xy="600,503" size="24,29" group="n104_kwi0" font="ui://27vd145bqz637ij2" 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="656,487" size="232,51" group="n104_kwi0"/>
+    <component id="n119_l679" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="630,487" size="232,51" group="n104_kwi0"/>
-    <component id="n86_kwi0" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="967,484" size="80,67" group="n104_kwi0"/>
+    <component id="n86_kwi0" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="941,484" size="129,67" group="n104_kwi0" visible="false"/>
-    <group id="n104_kwi0" name="panel_search" xy="331,484" size="739,62" group="n83_kwi0" advanced="true">
+    <group id="n104_kwi0" name="panel_search" xy="305,484" size="765,67" group="n83_kwi0" advanced="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <group id="n83_kwi0" name="index2" xy="-17,-89" size="1087,635" advanced="true">
+    <group id="n83_kwi0" name="index2" xy="-17,-89" size="1087,640" advanced="true">
       <gearDisplay controller="record" pages="0"/>
     </group>
     <list id="n82_kwi0" name="lst_record" xy="24,8" size="1079,466" group="n121_l679" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmc" autoClearItems="true">

wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml

@@ -34,7 +34,7 @@
     <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"/>
+    <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"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/View_GroupRank.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1132,550" designImageLayer="1">
-  <controller name="page" pages="0,,1,,2," selected="1"/>
+  <controller name="page" pages="0,,1,,2," selected="2"/>
   <controller name="hide" pages="0,,1," selected="0"/>
-  <controller name="mng" pages="0,,1," selected="1">
+  <controller name="mng" pages="0,,1," selected="0">
     <action type="change_page" fromPage="" toPage="1" objectId="n133_n6cm" controller="mng" targetPage="1"/>
     <action type="change_page" fromPage="" toPage="0" objectId="n133_n6cm" controller="mng" targetPage="0"/>
   </controller>
@@ -15,13 +15,13 @@
     </text>
     <component id="n22_hoxh" name="n22" src="eany7iec" fileName="images/rank/btn_l.xml" xy="-11,-90" size="179,78" group="n119_kwi0">
       <gearText controller="mng" pages="0" values="局数排名" default="积分局数排名"/>
-      <Button title="积分局数排名" titleFontSize="27" controller="page" page="0"/>
+      <Button title="局数排名" titleFontSize="27" controller="page" page="0"/>
     </component>
     <component id="n57_hoxh" name="btn_round" src="eany7ied" fileName="images/rank/btn_r.xml" xy="327,-90" size="179,78" group="n119_kwi0">
-      <Button checked="true" title="局数统计" titleFontSize="27" controller="page" page="1"/>
+      <Button title="局数统计" titleFontSize="27" controller="page" page="1"/>
     </component>
     <component id="n164_rt3g" name="n164" src="eany7ieb" fileName="images/rank/btn_v.xml" xy="158,-90" size="179,78" group="n119_kwi0">
-      <Button title="总输赢排行" controller="page" page="2"/>
+      <Button checked="true" title="总输赢排行" controller="page" page="2"/>
     </component>
     <group id="n119_kwi0" name="n119" xy="-11,-90" size="517,78" group="n29_hoxh" advanced="true">
       <gearDisplay controller="mng" pages="1"/>
@@ -69,7 +69,7 @@
     <component id="n88_dzx8" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="121,483" size="290,54" group="n102_dzx8"/>
     <text id="n93_dzx8" name="n93" xy="413,494" size="34,38" group="n102_dzx8" font="Microsoft YaHei" fontSize="20" color="#367256" align="center" vAlign="middle" autoSize="none" bold="true" text="至"/>
     <component id="n94_dzx8" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="446,483" size="290,54" group="n102_dzx8"/>
-    <component id="n100_dzx8" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="757,479" size="138,70" group="n102_dzx8"/>
+    <component id="n100_dzx8" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="757,479" size="138,70" group="n102_dzx8" visible="false"/>
     <group id="n102_dzx8" name="n102" xy="121,479" size="774,70" group="n64_hoxh" advanced="true"/>
     <group id="n64_hoxh" name="p0" xy="13,3" size="1096,546" group="n76_vy2m" advanced="true">
       <gearDisplay controller="page" pages="0"/>
@@ -80,7 +80,7 @@
     <text id="n105_kqm0" name="n105" xy="169,14" size="79,36" group="n110_kqm0" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" autoSize="none" text="时间">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n106_kqm0" name="n106" xy="764,13" size="104,97" group="n110_kqm0" font="ui://27vd145bilon7ia1" fontSize="24" color="#aa3300" align="center" vars="true" bold="true" text="参与局数">
+    <text id="n106_kqm0" name="n106" xy="764,13" size="104,34" group="n110_kqm0" font="ui://27vd145bilon7ia1" fontSize="24" color="#aa3300" align="center" vars="true" bold="true" text="参与局数">
       <relation target="" sidePair="center-center%"/>
     </text>
     <group id="n110_kqm0" name="col1" xy="169,13" size="699,97" group="n112_kqm0"/>
@@ -106,16 +106,16 @@
     <image id="n150_rt3g" name="n150" src="csp47i44" fileName="component/nav/sd.png" xy="10,3" size="1110,63" group="n156_rt3g">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n151_rt3g" name="n151" xy="91,9" size="32,36" group="n155_rt3g" font="ui://27vd145bilon7ia1" fontSize="24" color="#aa3300" align="center" vAlign="middle" bold="true" text="排名">
+    <text id="n151_rt3g" name="n151" xy="91,9" size="54,34" group="n155_rt3g" font="ui://27vd145bilon7ia1" fontSize="24" color="#aa3300" align="center" vAlign="middle" bold="true" text="排名">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n152_rt3g" name="n152" xy="373,9" size="29,36" group="n155_rt3g" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" text="昵称">
+    <text id="n152_rt3g" name="n152" xy="373,9" size="51,34" group="n155_rt3g" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" text="昵称">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n153_rt3g" name="n153" xy="661,10" size="53,36" group="n155_rt3g" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" text="总输赢">
+    <text id="n153_rt3g" name="n153" xy="661,10" size="75,34" group="n155_rt3g" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" text="总输赢">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n154_rt3g" name="n154" xy="943,10" size="29,36" group="n155_rt3g" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" text="局数">
+    <text id="n154_rt3g" name="n154" xy="943,10" size="51,34" group="n155_rt3g" font="ui://27vd145bqz637ij2" fontSize="24" color="#aa3300" align="center" text="局数">
       <relation target="" sidePair="center-center%"/>
     </text>
     <group id="n155_rt3g" name="n155" xy="91,9" size="881,37" group="n156_rt3g"/>
@@ -139,7 +139,7 @@
     <component id="n158_rt3g" name="btndate1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="116,489" size="290,50" group="n162_rt3g"/>
     <text id="n159_rt3g" name="n159" xy="408,500" size="34,34" group="n162_rt3g" font="ui://27vd145bqz637ij2" fontSize="20" color="#367256" align="center" vAlign="middle" autoSize="none" text="至"/>
     <component id="n160_rt3g" name="btndate2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="441,489" size="290,50" group="n162_rt3g"/>
-    <component id="n161_rt3g" name="btn_search1" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="752,485" size="138,66" group="n162_rt3g"/>
+    <component id="n161_rt3g" name="btn_search1" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="752,485" size="138,66" group="n162_rt3g" visible="false"/>
     <group id="n162_rt3g" name="n162" xy="116,485" size="774,66" group="n163_rt3g" advanced="true"/>
     <group id="n163_rt3g" name="p2" xy="10,3" size="1110,548" group="n76_vy2m" advanced="true">
       <gearDisplay controller="page" pages="2"/>

wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml

@@ -3,11 +3,11 @@
   <controller name="manager" pages="0,,1," selected="0"/>
   <controller name="index" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n84_b8zx" name="n84" src="oviii10" fileName="images/bg_tk_02.png" xy="18,37" size="1298,675">
+    <image id="n84_b8zx" name="n84" src="m16m7igc" fileName="images/Group 551.png" xy="36,20">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n86_vyn3" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1261,46" controller="style,0">
+    <component id="n86_vyn3" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1218,28" controller="style,0">
-      <relation target="" sidePair="right-right,top-top"/>
+      <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">
       <relation target="" sidePair=""/>
@@ -17,27 +17,32 @@
     <group id="n48_kkrh" name="n48" xy="59,123" size="271,175" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <image id="n87_vyn3" name="n87" src="csp47i44" fileName="component/nav/sd.png" xy="52,137" size="1230,56" group="n34_gltd">
+    <image id="n87_vyn3" name="n87" src="m16m7igd" fileName="component/nav/Rectangle 408.png" xy="67,145" group="n34_gltd"/>
-      <relation target="" sidePair="width-width"/>
+    <text id="n29_gltd" name="n29" xy="110,153" size="80,61" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="玩家名">
-    </image>
+      <relation target="" sidePair=""/>
-    <text id="n29_gltd" name="n29" xy="110,149" size="80,52" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" autoSize="none" bold="true" text="玩家名">
+      <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
-      <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n30_gltd" name="n30" xy="337,149" size="127,52" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" autoSize="none" bold="true" text="积分变化">
+    <text id="n30_gltd" name="n30" xy="397,147" size="127,61" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="积分变化">
-      <relation target="" sidePair="center-center%"/>
+      <relation target="" sidePair=""/>
+      <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <text id="n31_gltd" name="n31" xy="548,149" size="244,52" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" autoSize="none" bold="true" text="原因">
+    <text id="n31_gltd" name="n31" xy="558,147" size="244,61" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="原因">
-      <relation target="" sidePair="center-center%"/>
+      <relation target="" sidePair=""/>
+      <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <text id="n32_gltd" name="n32" xy="866,149" size="155,52" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" autoSize="none" bold="true" text="操作时间">
+    <text id="n32_gltd" name="n32" xy="866,147" size="155,61" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="操作时间">
-      <relation target="" sidePair="center-center%"/>
+      <relation target="" sidePair=""/>
+      <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <text id="n33_gltd" name="n33" xy="1088,149" size="142,52" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" autoSize="none" bold="true" text="当前积分">
+    <text id="n33_gltd" name="n33" xy="1078,147" size="142,61" group="n34_gltd" font="ui://27vd145bqz637ij2" fontSize="24" color="#884f00" align="center" vAlign="middle" autoSize="none" bold="true" text="当前积分">
-      <relation target="" sidePair="center-center%"/>
+      <relation target="" sidePair=""/>
+      <relation target="n87_vyn3" sidePair="left-left%,top-top%"/>
     </text>
-    <group id="n34_gltd" name="n34" xy="52,137" size="1230,64" group="n45_kkrh" advanced="true"/>
+    <group id="n34_gltd" name="n34" xy="67,145" size="1198,82" group="n45_kkrh" advanced="true">
-    <list id="n4_l0s4" name="lst_fag" xy="49,210" size="1236,344" group="n45_kkrh" overflow="scroll" lineGap="18" colGap="43" defaultItem="ui://m7iejg46gltdhc9" autoClearItems="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
-      <relation target="" sidePair="width-width"/>
+    </group>
+    <list id="n4_l0s4" name="lst_fag" xy="71,226" size="1193,377" group="n45_kkrh" overflow="scroll" lineGap="18" colGap="43" defaultItem="ui://m7iejg46gltdhc9" autoClearItems="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
       <item/>
       <item/>
       <item/>
@@ -48,64 +53,66 @@
       <item/>
       <item/>
     </list>
-    <text id="n39_gltd" name="n39" xy="56,575" size="52,34" group="n40_gltd" visible="false" font="STSong" fontSize="24" color="#f7ffff" text="筛选"/>
+    <text id="n39_gltd" name="n39" xy="80,608" size="52,34" group="n40_gltd" visible="false" font="STSong" fontSize="24" color="#f7ffff" text="筛选"/>
-    <component id="n36_gltd" name="btn_filter1" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="46,570" size="159,42" group="n40_gltd">
+    <component id="n36_gltd" name="btn_filter1" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="74,669" size="159,68" group="n40_gltd">
       <gearDisplay controller="manager" pages="0,1"/>
-      <gearXY controller="manager" pages="0,1" values="46,570|22,570"/>
+      <gearXY controller="manager" pages="0,1" values="74,669|69,659"/>
       <relation target="" sidePair="center-center%"/>
-      <Button title="积分变化"/>
+      <Button checked="true" title="积分变化"/>
     </component>
-    <component id="n37_gltd" name="btn_filter2" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="232,570" size="158,42" group="n40_gltd">
+    <component id="n37_gltd" name="btn_filter2" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="260,669" size="158,68" group="n40_gltd">
-      <gearXY controller="manager" pages="0,1" values="232,570|209,570"/>
+      <gearXY controller="manager" pages="0,1" values="260,669|256,659"/>
       <relation target="" sidePair="center-center%"/>
       <Button checked="true" title="操作增减" titleFontSize="24"/>
     </component>
-    <component id="n41_nyna" name="btn_filter8" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="943,570" size="174,42" group="n40_gltd" visible="false">
+    <component id="n41_nyna" name="btn_filter8" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="1014,662" size="174,68" group="n40_gltd" visible="false">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="center-center%"/>
       <Button title="系统衰减" titleFontSize="26"/>
     </component>
-    <component id="n42_gls1" name="btn_filter16" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="412,570" size="154,42" group="n40_gltd">
+    <component id="n42_gls1" name="btn_filter16" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="483,662" size="154,68" group="n40_gltd">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="center-center%"/>
       <Button title="推广奖励" titleFontSize="26"/>
     </component>
-    <component id="n43_hsbh" name="btn_filter32" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="425,570" size="122,42" group="n40_gltd">
+    <component id="n43_hsbh" name="btn_filter32" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="453,669" size="122,68" group="n40_gltd">
-      <gearXY controller="manager" pages="0,1" values="425,570|649,570"/>
+      <gearXY controller="manager" pages="0,1" values="453,669|696,659"/>
       <relation target="" sidePair="center-center%"/>
       <Button checked="true" title="转账" titleFontSize="26"/>
     </component>
-    <component id="n44_qlxi" name="btn_filter64" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="820,570" size="110,42" group="n40_gltd">
+    <component id="n44_qlxi" name="btn_filter64" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="891,662" size="110,68" group="n40_gltd">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="center-center%"/>
       <Button title="提取" titleFontSize="26"/>
     </component>
-    <component id="n89_j68v" name="btn_filter128" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="941,570" size="110,42" group="n40_gltd" visible="false">
+    <component id="n89_j68v" name="btn_filter128" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="1012,662" size="110,68" group="n40_gltd" visible="false">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="center-center%"/>
       <Button title="洗牌" titleFontSize="26"/>
     </component>
-    <group id="n40_gltd" name="n40" xy="46,570" size="1071,42" group="n45_kkrh" advanced="true"/>
+    <group id="n40_gltd" name="n40" xy="74,608" size="1114,129" group="n45_kkrh" advanced="true">
-    <component id="n73_s9vt" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="841,626" group="n75_s9vt"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
-    <text id="n88_vyn3" name="n88" xy="798,639" size="24,29" group="n75_s9vt" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" align="center" vAlign="middle" bold="true" text="至"/>
-    <component id="n71_s9vt" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="490,627" group="n75_s9vt"/>
-    <component id="n74_s9vt" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="1151,629" group="n75_s9vt"/>
-    <group id="n75_s9vt" name="n75" xy="490,626" size="798,63" group="n45_kkrh" advanced="true">
-      <relation target="" sidePair="center-center%"/>
     </group>
-    <image id="n81_7b4q" name="n81" pkg="m7iejg46" src="7b4q7i20" fileName="images/main/img_xian.png" xy="327,656" size="945,2" group="n45_kkrh" visible="false"/>
+    <component id="n73_s9vt" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="426,607" size="290,59" group="n75_s9vt"/>
-    <group id="n45_kkrh" name="index0" xy="46,137" size="1242,552" advanced="true">
+    <text id="n88_vyn3" name="n88" xy="383,620" size="25,29" group="n75_s9vt" font="ui://27vd145bqz637ij2" fontSize="20" color="#495f55" align="center" vAlign="middle" bold="true" text="至"/>
+    <component id="n71_s9vt" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="75,608" size="290,59" group="n75_s9vt"/>
+    <component id="n74_s9vt" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="735,599" size="138,75" group="n75_s9vt" visible="false"/>
+    <group id="n75_s9vt" name="n75" xy="75,599" size="798,75" group="n45_kkrh" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <image id="n81_7b4q" name="n81" pkg="m7iejg46" src="7b4q7i20" fileName="images/main/img_xian.png" xy="327,656" size="945,28" group="n45_kkrh" visible="false"/>
+    <group id="n45_kkrh" name="index0" xy="67,145" size="1205,592" advanced="true">
       <gearDisplay controller="index" pages="0"/>
     </group>
-    <image id="n49_kkrh" name="n49" src="ivzcchb" fileName="font/images/win/dbt.png" pkg="27vd145b" xy="322,101" size="1111,51" group="n55_kkrh" visible="false"/>
+    <image id="n49_kkrh" name="n49" src="ivzcchb" fileName="font/images/win/dbt.png" pkg="27vd145b" xy="322,137" size="1111,15" group="n55_kkrh" visible="false"/>
-    <text id="n50_kkrh" name="n50" xy="486,114" size="117,42" group="n55_kkrh" font="STSong" fontSize="24" color="#756c67" autoSize="none" text="日期">
+    <text id="n50_kkrh" name="n50" xy="486,168" size="117,6" group="n55_kkrh" font="STSong" fontSize="24" color="#756c67" autoSize="none" text="日期">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n53_kkrh" name="n53" xy="971,114" size="207,42" group="n55_kkrh" font="STSong" fontSize="24" color="#756c67" align="center" autoSize="none" text="输赢分数">
+    <text id="n53_kkrh" name="n53" xy="971,168" size="207,6" group="n55_kkrh" font="STSong" fontSize="24" color="#756c67" align="center" autoSize="none" text="输赢分数">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <group id="n55_kkrh" name="n55" xy="322,101" size="1111,55" group="n67_kkrh"/>
+    <group id="n55_kkrh" name="n55" xy="322,137" size="1111,19" group="n67_kkrh"/>
-    <list id="n56_kkrh" name="lst_daily_count" xy="326,123" size="977,573" group="n67_kkrh" selectionMode="none" overflow="scroll" lineGap="1" colGap="43" defaultItem="ui://m7iejg46kkrhhss" autoClearItems="true">
+    <list id="n56_kkrh" name="lst_daily_count" xy="326,159" size="977,537" group="n67_kkrh" selectionMode="none" overflow="scroll" lineGap="1" colGap="43" defaultItem="ui://m7iejg46kkrhhss" autoClearItems="true">
       <relation target="" sidePair="width-width"/>
       <item/>
       <item/>
@@ -117,7 +124,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n67_kkrh" name="index1" xy="322,101" size="1111,595" advanced="true">
+    <group id="n67_kkrh" name="index1" xy="322,137" size="1111,559" advanced="true">
       <gearDisplay controller="index" pages="1"/>
     </group>
     <text id="n80_7b4q" name="n80" xy="145,6" size="151,42" visible="false" font="FZDaBiaoSong-B06S" fontSize="30" color="#ffffff" autoSize="none" text="积分记录">

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

@@ -5,65 +5,65 @@
     <action type="change_page" fromPage="" toPage="3" controller="partner" targetPage="1"/>
   </controller>
   <controller name="fag" pages="0,,1," selected="0"/>
-  <controller name="mng" pages="0,,1," selected="1"/>
+  <controller name="mng" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n71_a6k7" name="n71" src="yscl7ic5" fileName="images/allNumber/Rectangle 376.png" xy="0,0" size="1091,96">
+    <image id="n71_a6k7" name="n71" src="yscl7ic5" fileName="images/allNumber/Rectangle 376.png" xy="0,0" size="1091,85">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n5_kwi0" name="tex_name" xy="92,1" size="117,39" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="23" color="#444444" vAlign="middle" autoSize="shrink" bold="true" text="玩家">
+    <text id="n5_kwi0" name="tex_name" xy="92,7" size="117,39" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="23" color="#444444" vAlign="middle" autoSize="shrink" bold="true" text="玩家">
       <relation target="" sidePair="left-left%"/>
     </text>
-    <image id="n79_iaes" name="n79" src="ilon7ib7" fileName="mgr/imgs/numberHpAlone/image.png" xy="19,11" size="66,66" group="n46_rpaz"/>
+    <image id="n79_iaes" name="n79" src="ilon7ib7" fileName="mgr/imgs/numberHpAlone/image.png" xy="17,6" size="70,72" group="n46_rpaz"/>
-    <component id="n4_kwi0" name="btn_head" src="ilon7ibj" fileName="mgr/component/numberHpAlone/Head2.xml" xy="22,14" size="61,61" group="n46_rpaz" aspect="true" touchable="false">
+    <component id="n4_kwi0" name="btn_head" src="ilon7ibj" fileName="mgr/component/numberHpAlone/Head2.xml" xy="22,12" size="61,61" group="n46_rpaz" aspect="true" touchable="false">
       <relation target="" sidePair="center-center%"/>
     </component>
-    <image id="n1_kwi0" name="n1" src="kwi0hl0" fileName="mgr/imgs/member/glybz.png" xy="8,1" group="n44_rpaz">
+    <image id="n1_kwi0" name="n1" src="kwi0hl0" fileName="mgr/imgs/member/glybz.png" xy="8,3" size="36,36" group="n44_rpaz">
       <gearDisplay controller="type" pages="1,2"/>
     </image>
-    <image id="n2_kwi0" name="n2" src="kwi0hl6" fileName="mgr/imgs/member/hhr.png" xy="8,1" group="n44_rpaz">
+    <image id="n2_kwi0" name="n2" src="kwi0hl6" fileName="mgr/imgs/member/hhr.png" xy="8,3" size="36,36" group="n44_rpaz">
       <gearDisplay controller="type" pages="3"/>
     </image>
-    <group id="n44_rpaz" name="group_role" xy="8,1" size="36,36" group="n46_rpaz" advanced="true">
+    <group id="n44_rpaz" name="group_role" xy="8,3" size="36,36" group="n46_rpaz" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <text id="n17_kwi0" name="tex_id" xy="100,41" size="117,39" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="20" color="#444444" vAlign="middle" autoSize="shrink" bold="true" text="100000">
+    <text id="n17_kwi0" name="tex_id" xy="92,42" size="117,39" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="20" color="#444444" vAlign="middle" autoSize="shrink" bold="true" text="100000">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n67_z384" name="tex_ruhui" xy="529,9" size="216,29" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="20" color="#444444" align="center" vAlign="middle" bold="true" singleLine="true" autoClearText="true" text="2025-04-06  15:20:21">
+    <text id="n67_z384" name="tex_ruhui" xy="421,15" size="216,29" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="20" color="#444444" align="center" vAlign="middle" bold="true" singleLine="true" autoClearText="true" text="2025-04-06  15:20:21">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <component id="n72_mtk5" name="super_btn" src="mtk57i94" fileName="mgr/component/member/superior_btn.xml" xy="641,38" group="n46_rpaz" visible="false">
+    <component id="n72_mtk5" name="super_btn" src="mtk57i94" fileName="mgr/component/member/superior_btn.xml" xy="641,40" size="76,38" group="n46_rpaz" visible="false">
       <relation target="" sidePair="center-center%"/>
     </component>
-    <text id="n41_utix" name="tex_last_login" xy="539,47" size="196,29" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="20" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="11时前&#xA;两行撒旦撒撒大大">
+    <text id="n41_utix" name="tex_last_login" xy="441,44" size="196,29" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="20" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="11时前&#xA;两行撒旦撒撒大大">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n68_z384" name="tex_zongchangci" xy="259,26" size="32,33" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="23" color="#444444" align="center" vAlign="middle" bold="true" text="88">
+    <text id="n68_z384" name="tex_zongchangci" xy="299,28" size="32,33" group="n46_rpaz" font="ui://27vd145bilon7ia1" fontSize="23" color="#444444" align="center" vAlign="middle" bold="true" text="88">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <image id="n73_iaes" name="n73" src="ilon7ibh" fileName="mgr/imgs/numberHpAlone/Rectangle 371.png" xy="355,24" size="142,36" group="n77_iaes">
+    <image id="n73_iaes" name="n73" src="ilon7ibh" fileName="mgr/imgs/numberHpAlone/Rectangle 371.png" xy="355,26" size="142,36" group="n77_iaes">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n74_iaes" name="btn_fag_add" src="ilon7ibi" fileName="mgr/component/numberHpAlone/Button4.xml" xy="497,24" size="36,36" group="n77_iaes"/>
+    <component id="n74_iaes" name="btn_fag_add" src="ilon7ibi" fileName="mgr/component/numberHpAlone/Button4.xml" xy="497,26" size="36,36" group="n77_iaes"/>
-    <component id="n75_iaes" name="btn_fag_minus" src="ilon7ibe" fileName="mgr/component/numberHpAlone/Button5.xml" xy="318,24" size="36,36" group="n77_iaes"/>
+    <component id="n75_iaes" name="btn_fag_minus" src="ilon7ibe" fileName="mgr/component/numberHpAlone/Button5.xml" xy="318,26" size="36,36" group="n77_iaes"/>
-    <text id="n76_iaes" name="tex_fag" xy="354,25" size="142,34" group="n77_iaes" font="ui://27vd145bilon7ia1" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" autoClearText="true" text="1234567890"/>
+    <text id="n76_iaes" name="tex_fag" xy="354,27" size="142,34" group="n77_iaes" font="ui://27vd145bilon7ia1" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" autoClearText="true" text="1234567890"/>
-    <group id="n77_iaes" name="n77" xy="318,24" size="215,36" group="n78_iaes" advanced="true">
+    <group id="n77_iaes" name="n77" xy="318,26" size="215,36" group="n78_iaes" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <group id="n78_iaes" name="group_score" xy="318,24" size="215,36" group="n46_rpaz"/>
+    <group id="n78_iaes" name="group_score" xy="318,26" size="215,36" group="n46_rpaz" visible="false" advanced="true"/>
-    <text id="n57_ocx0" name="tex_shangjiName" xy="529,8" size="118,39" group="n46_rpaz" visible="false" font="Arial" fontSize="25" color="#845e3b" align="center" vAlign="middle" autoSize="none" text="昵称"/>
+    <text id="n57_ocx0" name="tex_shangjiName" xy="529,10" size="118,39" group="n46_rpaz" visible="false" font="Arial" fontSize="25" color="#845e3b" align="center" vAlign="middle" autoSize="none" text="昵称"/>
-    <text id="n58_ocx0" name="tex_shangjiID" xy="529,40" size="122,39" group="n46_rpaz" visible="false" font="Arial" fontSize="25" color="#845e3b" align="center" vAlign="middle" autoSize="none" text="123456"/>
+    <text id="n58_ocx0" name="tex_shangjiID" xy="529,42" size="122,39" group="n46_rpaz" visible="false" font="Arial" fontSize="25" color="#845e3b" align="center" vAlign="middle" autoSize="none" text="123456"/>
-    <group id="n46_rpaz" name="group_player" xy="8,1" size="737,79"/>
+    <group id="n46_rpaz" name="group_player" xy="8,3" size="709,78"/>
-    <component id="n49_tqi8" name="btn_operate" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="879,1" size="80,82" group="n51_t1hq">
+    <component id="n49_tqi8" name="btn_operate" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="826,1" size="100,82" group="n51_t1hq">
       <Button title="   " icon="ui://m7iejg46yscl7ic2"/>
     </component>
-    <component id="n69_z384" name="btn_score_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="961,1" size="110,82" group="n51_t1hq">
+    <component id="n69_z384" name="btn_score_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="938,1" size="142,82" group="n51_t1hq">
       <Button title="   " titleColor="#805133" titleFontSize="28" icon="ui://m7iejg46yscl7ic4"/>
     </component>
-    <component id="n70_k5m9" name="btn_bxx" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="789,15" size="119,55" group="n51_t1hq" scale="0.8,1">
+    <component id="n70_k5m9" name="btn_bxx" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="698,15" size="116,55" group="n51_t1hq">
       <Button title="  " titleColor="#805133" titleFontSize="28" icon="ui://m7iejg46k5m97i78"/>
     </component>
-    <group id="n51_t1hq" name="n51" xy="789,1" size="282,82" advanced="true">
+    <group id="n51_t1hq" name="n51" xy="698,1" size="382,82" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
   </displayList>

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

@@ -8,39 +8,39 @@
       <relation target="" sidePair="width-width"/>
     </image>
     <image id="n59_iaes" name="n59" src="ilon7ib7" fileName="mgr/imgs/numberHpAlone/image.png" xy="16,14" size="66,66" group="n20_oj7k"/>
-    <text id="n19_oj7k" name="tex_name" xy="105,9" size="133,39" group="n20_oj7k" font="ui://27vd145bilon7ia1" fontSize="23" color="#444444" vAlign="middle" autoSize="shrink" text="玩家名字">
+    <text id="n19_oj7k" name="tex_name" xy="105,9" size="133,39" group="n20_oj7k" font="ui://27vd145bilon7ia1" fontSize="23" color="#444444" vAlign="middle" autoSize="shrink" bold="true" text="玩家名字">
       <relation target="" sidePair="center-center%"/>
     </text>
     <group id="n20_oj7k" name="n20" xy="16,9" size="222,71"/>
     <component id="n21_oj7k" name="btn_head" src="ilon7ibj" fileName="mgr/component/numberHpAlone/Head2.xml" xy="21,17" size="61,61" aspect="true" touchable="false">
       <relation target="" sidePair="left-left%"/>
     </component>
-    <text id="n25_oj7k" name="tex_id" xy="102,43" size="91,37" font="ui://27vd145bilon7ia1" fontSize="20" color="#444444" align="center" vAlign="middle" autoSize="shrink" text="100000">
+    <text id="n25_oj7k" name="tex_id" xy="102,43" size="91,37" font="ui://27vd145bilon7ia1" fontSize="20" color="#444444" align="center" vAlign="middle" autoSize="shrink" bold="true" text="100000">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n35_oj7k" name="tex_member_count" xy="278,34" size="45,33" group="n36_oj7k" font="ui://27vd145bilon7ia1" fontSize="23" color="#444444" align="center" vAlign="middle" singleLine="true" autoClearText="true" text="11111">
+    <text id="n35_oj7k" name="tex_member_count" xy="355,34" size="50,33" group="n36_oj7k" font="ui://27vd145bilon7ia1" fontSize="23" color="#444444" align="center" vAlign="middle" bold="true" singleLine="true" autoClearText="true" text="11111">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <group id="n36_oj7k" name="n36" xy="278,34" size="45,33"/>
+    <group id="n36_oj7k" name="n36" xy="355,34" size="50,33"/>
-    <component id="n42_ozaz" name="btn_percent" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="654,23" size="77,56" group="n40_oj7k">
+    <component id="n42_ozaz" name="btn_percent" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="654,23" size="77,56" group="n40_oj7k" visible="false">
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46iaes7icg"/>
     </component>
     <group id="n40_oj7k" name="n40" xy="654,23" size="77,56"/>
-    <component id="n49_et16" name="btn_tag" src="j1207i2r" fileName="images/Button10.xml" xy="823,35" size="66,30">
+    <component id="n49_et16" name="btn_tag" src="j1207i2r" fileName="images/Button10.xml" xy="933,35" size="66,30">
       <relation target="" sidePair="center-center%"/>
     </component>
-    <component id="n51_k5m9" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="984,25" size="84,54">
+    <component id="n51_k5m9" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="984,25" size="84,54" visible="false">
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46iaes7ich"/>
     </component>
-    <image id="n60_m16m" name="n60" src="ilon7ibh" fileName="mgr/imgs/numberHpAlone/Rectangle 371.png" xy="413,29" size="166,38" group="n64_m16m"/>
+    <image id="n60_m16m" name="n60" src="ilon7ibh" fileName="mgr/imgs/numberHpAlone/Rectangle 371.png" xy="553,29" size="166,38" group="n64_m16m"/>
-    <component id="n61_m16m" name="btn_fag_add" src="ilon7ibi" fileName="mgr/component/numberHpAlone/Button4.xml" xy="581,27" size="42,42" group="n64_m16m"/>
+    <component id="n61_m16m" name="btn_fag_add" src="ilon7ibi" fileName="mgr/component/numberHpAlone/Button4.xml" xy="721,27" size="42,42" group="n64_m16m"/>
-    <component id="n62_m16m" name="btn_fag_minus" src="ilon7ibe" fileName="mgr/component/numberHpAlone/Button5.xml" xy="371,27" size="42,42" group="n64_m16m"/>
+    <component id="n62_m16m" name="btn_fag_minus" src="ilon7ibe" fileName="mgr/component/numberHpAlone/Button5.xml" xy="511,27" size="42,42" group="n64_m16m"/>
-    <text id="n63_m16m" name="tex_fag" xy="413,30" size="166,36" group="n64_m16m" font="ui://27vd145bilon7ia1" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" autoClearText="true" text="1234567890"/>
+    <text id="n63_m16m" name="tex_fag" xy="553,30" size="166,36" group="n64_m16m" font="ui://27vd145bilon7ia1" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" autoClearText="true" text="1234567890"/>
-    <group id="n64_m16m" name="n64" xy="371,27" size="252,42" group="n65_m16m" advanced="true">
+    <group id="n64_m16m" name="n64" xy="511,27" size="252,42" group="n65_m16m" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <group id="n65_m16m" name="group_score" xy="371,27" size="251,42"/>
+    <group id="n65_m16m" name="group_score" xy="511,27" size="251,42"/>
   </displayList>
 </component>