对接比赛分管理，分成，数据

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -1514,3 +1514,28 @@ function M:FG_UpdatePlay(group_id, game_id, config_data, name, hpData, hpOnOff,
 		callback(res)
 	end)
 end
+
+function M:FG_GetUnderMembers(groupId, limit, num, tagId, callback)
+	local _client = ControllerManager.GroupClient
+	local _data = {}
+	_data.id = groupId
+	_data.limit = limit
+	_data.num = num
+	_data.tagId = tagId
+	_client:send(Protocol.GET_UNDER_MEMBERS, _data, function(res)
+		callback(res)
+	end)
+end
+
+function M:FG_GetOptHp(groupId, limit, num, tagId,optType, callback)
+	local _client = ControllerManager.GroupClient
+	local _data = {}
+	_data.id = groupId
+	_data.limit = limit
+	_data.num = num
+	_data.tagId = tagId
+	_data.optType = optType
+	_client:send(Protocol.Get_Opt_Hp, _data, function(res)
+		callback(res)
+	end)
+end

lua_probject/base_project/Game/Protocol.lua

@@ -266,6 +266,11 @@ Protocol = {
 	GET_BANK_HP = "group/get_bank_hp",	--获取银行信息
 	TAKE_BANK_HP  = "group/take_bank_hp",	
 	SAVE_BANK_HP  = "group/save_bake_hp",
+-------------- group-static---------------------
+    GET_UNDER_MEMBERS  = "group/static/get_under_members",
+    Get_Opt_Hp  = "group/static/get_opt_hp",
+-------------- group-static---------------------
+---
     -------------- group-log---------------------
     -- 获取奖励日志
     WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log",

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

@@ -20,7 +20,6 @@ function GroupMngMatchFagListView.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_GroupMatchFagList")
     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
@@ -125,7 +121,13 @@ function M:GetFagData(index)
         type = type + 2
     end
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetMngHpLog(self.group_id, index, num, type, qid, qName, function(res)
+    fgCtr:FG_GetOptHp(
+        self.group_id,
+        index,
+        6,
+        -1,
+        0,
+        function(res)
             ViewUtil.CloseModalWait()
             if self._is_destroy then
                 return
@@ -133,8 +135,10 @@ function M:GetFagData(index)
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败")
             else
-            if res.Data.hp_logs ~= nil then
+                printlog("----------------2222222222---------")
-                local data = res.Data.hp_logs
+                pt(res.Data )
+                if res.Data.members ~= nil then
+                    local data = res.Data.members
                     -- if #data == 0 then return end
                     local local_data = self.fag_data
                     local lst = self.lst_fag

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

@@ -20,6 +20,7 @@ function GroupMngMemberListView.new(group_id, blur_view)
     self.class = 'GroupMngMemberListView'
     self.group_id = group_id
     self.member_data = {}
+    self.total_data = {}
     self:FillView()
     return self
 end
@@ -58,6 +59,7 @@ function M:FillView()
     -- 初始化成员列表
     self.lst_member = self._view:GetChild('lst_member')
     self.lst_member:SetVirtual()
+
     self.lst_member.itemRenderer = function(index, obj)
         self:OnRenderItem(index, obj)
     end
@@ -75,6 +77,11 @@ function M:FillView()
             gniv1:Show()
         end)
     end
+
+
+
+
+
     --local n50=self._view:GetChild('n50')
     --print(n50)
     --n50.displayObject.gameObject.transform.localPosition.x=214
@@ -92,10 +99,14 @@ function M:FillView()
                 return
             end
             qid = tonumber(text) or 0
+            printlog("sssssssssssssssaaaaaaaaaaaaaa", qid)
+
             qnick = text
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            fgCtr:FG_FindMember(
+            fgCtr:FG_GetUnderMembers(
                 self.group_id,
+                0,
+                6,
                 qid,
                 function(res)
                     ViewUtil.CloseModalWait()
@@ -105,7 +116,7 @@ function M:FillView()
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
                     else
-                        self._view:GetChild('tex_id').text = ''
+                        
                         ctr_search.selectedIndex = 1
                         local item_result = self._view:GetChild('lst_member_find')
                         item_result:RemoveChildrenToPool()
@@ -180,9 +191,6 @@ function M:FillView()
             self:initData()
         end
     )
-
-    
-	
 end
 
 -- 快速访问
@@ -193,8 +201,6 @@ end
 
 -- 获取成员数据
 function M:GetMemberData(index)
-	--print("11111111111111111111")
-	--print(debug.traceback())
     local group = DataManager.groups:get(self.group_id)
     if index == 0 then
         group:clearMember()
@@ -202,22 +208,38 @@ function M:GetMemberData(index)
 
     ViewUtil.ShowModalWait(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GroupMembers11(
+    fgCtr:FG_GetUnderMembers(
         self.group_id,
         index,
         6,
-        false,
+        -1,
-        1,
         function(res)
             ViewUtil.CloseModalWait()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
             else
-                self.member_data = group.members
+                local newMembers = res.Data.members
-                self.lst_member.numItems = group.member_num
+                
+                -- 实现先清空，后拼接逻辑
                 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)
+                    self.member_data = newMembers
+                else
+                    -- 加载更多：将新数据拼接到现有数据后面
+                    for i = 1, #newMembers do
+                        table.insert(self.member_data, newMembers[i])
+                    end
+                end
+                
+                self.lst_member.numItems = #self.member_data
+
+                self.total_data = res.Data.total
+                local total = self.total_data[1]
+                if total then
+                    local tex_name_hp = self._view:GetChild('tex_name_hp')
+                    tex_name_hp.text = total.sumHp
+                    local tex_total_hp = self._view:GetChild('tex_total_hp')
+                    tex_total_hp.text = total.t_hp1
                 end
             end
         end
@@ -226,7 +248,6 @@ end
 
 -- 修改体力值
 local function __change_fag(gid, pid, is_add, cur_hp, member, callback)
-    
     local gniv =
         GroupNumberInputView.new(
             member,
@@ -240,7 +261,6 @@ local function __change_fag(gid, pid, is_add, cur_hp,member, callback)
                     num,
 
                     function(res1)
-                     
                         ViewUtil.CloseModalWait()
                         -- if gniv._is_destroy then
                         --     return
@@ -264,9 +284,11 @@ end
 -- 填充成员对象
 function M:FillItem(obj, member, refresh)
     local group = DataManager.groups:get(self.group_id)
+
     obj:GetChild('tex_name').text = ViewUtil.stringEllipsis(member.nick)
     obj:GetChild('btn_head').icon = 'ui://Common/Head0'
     ImageLoad.Load(member.portrait, obj:GetChild('btn_head')._iconObject, self.class)
+
     -- obj.data = member.id
     -- 显示玩家标签，合伙人、管理员
     local ctr_type = obj:GetController('type')
@@ -282,29 +304,15 @@ function M:FillItem(obj, member, refresh)
     local tex_fag = obj:GetChild('tex_fag')
     tex_fag.text = d2ad(member.hp)
 
+    local tex_Safecompartment = obj:GetChild('tex_Safecompartment')
+    tex_Safecompartment.text = d2ad(member.bank_hp)
+
+    local tex_Numberofsuboinates = obj:GetChild('tex_Numberofsuboinates')
+    tex_Numberofsuboinates.text = member.underCount
+
+
+
     obj:GetChild('tex_id').text = '' .. member.uid
-    --obj:GetChild("tex_cost_count").text = d2ad(member.last_hp_cost)
-
-    -- if member.online == 1 then
-    --     obj:GetChild('tex_last_login').text = '在线'
-    -- else
-    --     if member.last_time ~= 0 then
-    --         obj:GetChild('tex_last_login').text = '最近登录\n' .. os.date('%Y/%m/%d', member.last_time)
-    --     else
-    --         obj:GetChild('tex_last_login').text = '加入时间\n' .. os.date('%Y/%m/%d', member.join_time)
-    --     end
-    -- end
-	
-	
-        -- --上级
-        -- obj:GetChild('tex_shangjiName').text=member.parentId_nick or ""
-        -- if member.parentId==0 then
-        -- 	obj:GetChild('tex_shangjiID').text=""
-        -- else
-        -- 	obj:GetChild('tex_shangjiID').text=member.parentId 
-        -- end
-	
-
     local perm_array = MngPermission.getPermData(group.permission)
     -- 体力值操作按钮事件
     if group.lev < 3 or member.parentId == DataManager.SelfUser.account_id then
@@ -320,7 +328,6 @@ function M:FillItem(obj, member, refresh)
     local mp = group:getMember(DataManager.SelfUser.account_id)
     obj:GetChild('btn_fag_add').onClick:Set(
         function()
-            
             if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
                 return
             end
@@ -379,38 +386,6 @@ function M:FillItem(obj, member, refresh)
             )
         end
     )
-
-    -- obj:GetChild('btn_score_detail').onClick:Set(
-    --     function()
-    --         local mflv = GroupMemberFagLogView.new(self.group_id, member)
-    --         mflv:Show()
-    --     end
-    -- )
-
-    -- obj:GetChild('btn_operate').onClick:Set(
-    --     function()
-    --         local mflv =
-    --             GroupMemberOperateView.new(
-    --             self.group_id,
-    --             member,
-    --             function(delete)
-    --                 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._view:GetController('search').selectedIndex = 0
-    --                 else
-    --                     self.lst_member.numItems = self.lst_member.numItems
-    --                     if refresh then
-    --                         self:FillItem(obj, member)
-    --                     end
-    --                 end
-    --             end
-    --         )
-    --         mflv:Show()
-    --     end
-    -- )
-
 end
 
 function M:OnRenderItem(index, obj)

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

@@ -19,6 +19,7 @@ function GroupMngPartnerListView.new(gid, blur_view)
     self.group_id = gid
     self.blur_view = blur_view
     self.partner_data = {}
+    self.total_data = {}
     self:InitView()
     return self
 end
@@ -68,7 +69,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 +85,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,43 +124,59 @@ 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 = {}
     end
     ViewUtil.ShowModalWait(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetPartnerList(self.group_id, 0, index, 10, function(res)
+    fgCtr:FG_GetUnderMembers(
-
+        self.group_id,
+        index,
+        6,
+        -1,
+        function(res)
             ViewUtil.CloseModalWait()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
             else
-        	local partners = res.Data.members
+                local newMembers = res.Data.members
-        	for i = 1, #partners do
+                
-                self.partner_data[#self.partner_data + 1] = partners[i]
+                -- 实现先清空，后拼接逻辑
+                if index == 0 then
+                    -- 第一页：清空旧数据，直接赋值新数据
+                    self.partner_data = newMembers
+                else
+                    -- 加载更多：将新数据拼接到现有数据后面
+                    for i = 1, #newMembers do
+                        table.insert(self.partner_data, newMembers[i])
+                    end
                 end
                 self.lst_partner.numItems = #self.partner_data
+
+                self.total_data = res.Data.total
+                local total = self.total_data[1]
+                if total then
+                    local tex_name_hp = self._view:GetChild('tex_name_hp')
+                    tex_name_hp.text = total.sumHp
+                    local tex_total_hp = self._view:GetChild('tex_total_hp')
+                    tex_total_hp.text = total.t_hp1
+                end
             end
         end)
 end
 
 -- 获取合伙人数据
 function M:QueryPartnerData(query_id, query_nick)
-
     query_nick = query_nick or ""
     query_id = query_id or 0
 
@@ -170,12 +185,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 +256,6 @@ end
 
 -- 填充合伙人对象
 function M:FillItem(obj, partner)
-
     local group = DataManager.groups:get(self.group_id)
     local perm_array = MngPermission.getPermData(group.permission)
 
@@ -252,62 +264,80 @@ function M:FillItem(obj, partner)
     obj:GetChild("btn_head").icon = "ui://Common/Head0"
     ImageLoad.Load(partner.portrait, obj:GetChild("btn_head")._iconObject, self.class)
     -- 体力值操作按钮事件
-    if group.lev == 1 or group.lev < 3  or (partner.uid ~= DataManager.SelfUser.account_id and group.partnerLev > 0) then
+    -- if group.lev == 1 or group.lev < 3 or (partner.uid ~= DataManager.SelfUser.account_id and group.partnerLev > 0) then
-        obj:GetController("fag").selectedIndex = 1
+    --     obj:GetController("fag").selectedIndex = 1
+    -- else
+    --     obj:GetController("fag").selectedIndex = 0
+    -- end
+
+    -- 显示玩家标签，合伙人、管理员
+    local ctr_type = obj:GetController('type')
+    if partner.lev < 3 then
+        ctr_type.selectedIndex = partner.lev
+    elseif partner.partnerLev ~= 0 then
+        ctr_type.selectedIndex = 3
     else
-        obj:GetController("fag").selectedIndex = 0
+        ctr_type.selectedIndex = 0
     end
 
-    local fgCtr = ControllerManager.GetController(NewGroupController)
-    local p = group:getMember(partner.uid)
-    local mp = group:getMember(DataManager.SelfUser.account_id)
-    obj:GetChild("btn_fag_add").onClick:Set(function()
-        if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then 
-            return
-        end
-        __change_fag(self.group_id, partner.uid, true, nil, function(data)
-            local hp = data.hp
-            partner.hp = hp
-            if p then
-                p.hp = hp
-                if mp and mp ~= p then
-                    local mhp = data.mhp
-                    mp.hp = mhp
-                end
-            end
-            self.lst_partner.numItems = #self.partner_data
-            -- 搜索出的玩家显示
-            if self._view:GetController("search").selectedIndex == 1 then
-                obj:GetChild("tex_fag").text = d2ad(hp)
-            end
-        end)
-    end)
-    obj:GetChild("btn_fag_minus").onClick:Set(function()
-
-        if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then 
-            return
-        end
-        __change_fag(self.group_id, partner.uid, false, partner.hp, function(data)
-            local hp = data.hp
-            partner.hp = hp
-            if p then
-                p.hp = hp
-                if mp and mp ~= p then
-                    local mhp = data.mhp
-                    mp.hp = mhp
-                end
-            end
-            self.lst_partner.numItems = #self.partner_data
-            -- 搜索出的玩家显示
-            if self._view:GetController("search").selectedIndex == 1 then
-                obj:GetChild("tex_fag").text = d2ad(hp)
-            end
-        end)
-    end)
-
     obj:GetChild("tex_fag").text = d2ad(partner.hp)
 
-    obj:GetChild("tex_member_count").text = ""..partner.total
+    local tex_Safecompartment = obj:GetChild('tex_Safecompartment')
+    tex_Safecompartment.text = d2ad(partner.bank_hp)
+
+
+    local tex_Numberofsuboinates = obj:GetChild('tex_Numberofsuboinates')
+    tex_Numberofsuboinates.text = partner.underCount
+
+
+
+
+    -- local fgCtr = ControllerManager.GetController(NewGroupController)
+    -- local p = group:getMember(partner.uid)
+    -- local mp = group:getMember(DataManager.SelfUser.account_id)
+    -- obj:GetChild("btn_fag_add").onClick:Set(function()
+    --     if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
+    --         return
+    --     end
+    --     __change_fag(self.group_id, partner.uid, true, nil, function(data)
+    --         local hp = data.hp
+    --         partner.hp = hp
+    --         if p then
+    --             p.hp = hp
+    --             if mp and mp ~= p then
+    --                 local mhp = data.mhp
+    --                 mp.hp = mhp
+    --             end
+    --         end
+    --         self.lst_partner.numItems = #self.partner_data
+    --         -- 搜索出的玩家显示
+    --         if self._view:GetController("search").selectedIndex == 1 then
+    --             obj:GetChild("tex_fag").text = d2ad(hp)
+    --         end
+    --     end)
+    -- end)
+    -- obj:GetChild("btn_fag_minus").onClick:Set(function()
+    --     if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
+    --         return
+    --     end
+    --     __change_fag(self.group_id, partner.uid, false, partner.hp, function(data)
+    --         local hp = data.hp
+    --         partner.hp = hp
+    --         if p then
+    --             p.hp = hp
+    --             if mp and mp ~= p then
+    --                 local mhp = data.mhp
+    --                 mp.hp = mhp
+    --             end
+    --         end
+    --         self.lst_partner.numItems = #self.partner_data
+    --         -- 搜索出的玩家显示
+    --         if self._view:GetController("search").selectedIndex == 1 then
+    --             obj:GetChild("tex_fag").text = d2ad(hp)
+    --         end
+    --     end)
+    -- end)
+
 
 
     obj:GetChild("btn_percent").onClick:Set(function()
@@ -331,13 +361,8 @@ function M:FillItem(obj, partner)
         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]

wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info

@@ -1,11 +1,3 @@
 {
-  "objectStatus": {
-    "n44_rpaz": {
-      "collapsed": true
-    },
-    "n26_kwi0": {
-      "collapsed": true
-    }
-  },
   "fitScreen": "FitSize"
 }

wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info

@@ -3,6 +3,9 @@
     "n136_ex3l": {
       "hidden": true
     },
+    "n129_omkm": {
+      "hidden": true
+    },
     "n84_kwi0": {
       "hidden": true
     },

wb_new_ui/.objs/workspace.json

@@ -2,20 +2,20 @@
   "libview.firstColumnWidth": 398,
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://3z9lj55vjokmft",
+    "ui://m7iejg46kwi0hkr",
-    "ui://3n2top74kpmgq4",
+    "ui://m7iejg46cioeho9",
-    "ui://egnzysm7ffp36a",
+    "ui://m7iejg46tkv17ii9",
-    "ui://ypulwxjhl9mn14",
+    "ui://m7iejg46tkv17iia"
-    "ui://4ismcalcndxj36",
-    "ui://442j0uepygxga",
-    "ui://niy3ldiwl9mn14"
   ],
   "test.device": "1080p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://niy3ldiwl9mn14",
+  "doc.activeDoc": "ui://m7iejg46tkv17ii9",
   "libview.twoColumn": false,
-  "libview.expandedNodes": [],
+  "libview.expandedNodes": [
+    "m7iejg46",
+    "/"
+  ],
   "auxline1": true,
   "snapToGrid": true,
   "test.orientation": "landscape",

wb_new_ui/assets/NewGroup/mgr/View_GroupMatchFagList.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1815,1118">
   <controller name="page" pages="0,,1,,2," selected="0"/>
-  <controller name="search" pages="0,,1," selected="0"/>
+  <controller name="search" pages="0,,1," selected="1"/>
   <controller name="mng" pages="0,,1," selected="0"/>
-  <controller name="fenleixing" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="fenleixing" pages="0,,1,,2,,3," selected="1"/>
   <displayList>
     <image id="n133_ex3l" name="n133" src="otck7iev" fileName="images/NGXiangTangMui/Rectangle 749.png" xy="-54,160" size="1815,795"/>
     <image id="n126_b8zx" name="n126" src="otck7iew" fileName="images/NGXiangTangMui/Rectangle 750.png" xy="-47,165" size="1802,90" group="n60_kwi0">
@@ -40,7 +40,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n129_omkm" name="lst_mgr_data" xy="-36,269" size="1761,491" selectionMode="none" overflow="scroll" lineGap="5" colGap="43" defaultItem="ui://m7iejg46tkv17iia" autoClearItems="true">
+    <list id="n129_omkm" name="lst_mgr_data" xy="-36,269" size="1761,491" visible="false" selectionMode="none" overflow="scroll" lineGap="5" colGap="43" defaultItem="ui://m7iejg46tkv17iia" autoClearItems="true">
       <gearDisplay controller="page" pages="2"/>
       <relation target="" sidePair="width-width"/>
       <item/>
@@ -53,7 +53,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n90_kwi0" name="lst_fag_result" xy="-37,269" size="1761,397" group="n91_kwi0" selectionMode="none" overflow="scroll" lineGap="5" colGap="43" defaultItem="ui://m7iejg46giw8hf7" autoClearItems="true">
+    <list id="n90_kwi0" name="lst_fag_result" xy="22,1187" size="1761,397" group="n91_kwi0" selectionMode="none" overflow="scroll" lineGap="5" colGap="43" defaultItem="ui://m7iejg46giw8hf7" autoClearItems="true">
       <gearDisplay controller="page" pages="0,1"/>
       <relation target="n133_ex3l" sidePair="width-width,top-top"/>
       <item/>
@@ -66,7 +66,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n91_kwi0" name="n91" xy="-37,269" size="1761,397" visible="false" advanced="true">
+    <group id="n91_kwi0" name="n91" xy="22,1187" size="1761,397" visible="false" advanced="true">
       <gearDisplay controller="search" pages="1"/>
     </group>
     <component id="n70_kwi0" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="779,729" size="452,96" group="n73_kwi0" visible="false"/>
@@ -124,10 +124,10 @@
     </list>
     <group id="n65_kwi0" name="n65" xy="-56,-349" size="951,150" visible="false" advanced="true"/>
     <component id="n145_eh0o" name="n145" src="ex3l7iga" fileName="component/Btn/Btn(1)(1).xml" xy="73,983" size="244,92" group="n150_eh0o">
-      <Button checked="true" icon="ui://m7iejg46eh0o7iki" selectedIcon="ui://m7iejg46eh0o7ike" controller="fenleixing" page="0"/>
+      <Button icon="ui://m7iejg46eh0o7iki" selectedIcon="ui://m7iejg46eh0o7ike" controller="fenleixing" page="0"/>
     </component>
     <component id="n146_eh0o" name="n146" src="ex3l7iga" fileName="component/Btn/Btn(1)(1).xml" xy="372,983" size="244,92" group="n150_eh0o">
-      <Button icon="ui://m7iejg46eh0o7ikd" selectedIcon="ui://m7iejg46eh0o7ikh" controller="fenleixing" page="1"/>
+      <Button checked="true" icon="ui://m7iejg46eh0o7ikd" selectedIcon="ui://m7iejg46eh0o7ikh" controller="fenleixing" page="1"/>
     </component>
     <component id="n147_eh0o" name="n147" src="ex3l7iga" fileName="component/Btn/Btn(1)(1).xml" xy="671,983" size="244,92" group="n150_eh0o">
       <Button icon="ui://m7iejg46eh0o7ikc" selectedIcon="ui://m7iejg46eh0o7ikg" controller="fenleixing" page="2"/>

wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1815,1118">
-  <controller name="search" pages="0,,1," selected="0"/>
+  <controller name="search" pages="0,,1," selected="1"/>
   <controller name="mng" pages="0,,1," selected="0"/>
   <controller name="page" pages="0,,1,,2," selected="0"/>
   <displayList>
@@ -35,7 +35,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n90_tyis" name="lst_member_find" xy="-24,269" size="1765,554" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="11" colGap="5" defaultItem="ui://m7iejg46kwi0hks" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n90_tyis" name="lst_member_find" xy="-24,269" size="1765,554" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="11" colGap="5" defaultItem="ui://m7iejg46kwi0hks" align="center" autoClearItems="true">
       <gearDisplay controller="search" pages="1"/>
       <relation target="n115_csp4" sidePair="width-width,top-top"/>
       <item/>

wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml

@@ -50,9 +50,9 @@
       <item/>
       <item/>
     </list>
-    <list id="n109_tyis" name="lst_partner_search" xy="-12,1226" size="1762,780" group="n77_nk4v" overflow="scroll" defaultItem="ui://m7iejg46cioehoa" autoClearItems="true">
+    <list id="n109_tyis" name="lst_partner_search" xy="-24,269" size="1762,554" group="n77_nk4v" overflow="scroll" lineGap="17" defaultItem="ui://m7iejg46cioehoa" autoClearItems="true">
       <gearDisplay controller="search" pages="1"/>
-      <relation target="" sidePair="width-width"/>
+      <relation target="n139_eh0o" sidePair="width-width,top-top"/>
       <item/>
       <item/>
       <item/>
@@ -63,10 +63,10 @@
       <item/>
       <item/>
     </list>
-    <component id="n75_cioe" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="901,-36" group="n77_nk4v">
+    <component id="n75_cioe" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="838,842" group="n77_nk4v">
       <gearDisplay controller="search" pages="1"/>
     </component>
-    <group id="n77_nk4v" name="n77" xy="-48,-36" size="1801,2042" advanced="true">
+    <group id="n77_nk4v" name="n77" xy="-48,53" size="1801,885" 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="394,408" group="n126_yre9">

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

@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1765,125">
-  <controller name="type" pages="0,,1,,2,,3," selected="0">
+  <controller name="type" pages="0,,1,,2,,3," selected="3">
     <action type="change_page" fromPage="" toPage="1,2" controller="mng" targetPage="1"/>
     <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="0"/>
+  <controller name="mng" pages="0,,1," selected="1"/>
   <displayList>
     <text id="n5_kwi0" name="tex_name" xy="432,12" size="280,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="用户名称"/>
     <component id="n4_kwi0" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="258,10" size="105,105" group="n46_rpaz" touchable="false"/>
-    <text id="n1_kwi0" name="n1" xy="82,35" size="124,54" group="n44_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" text="管理员">
+    <text id="n1_kwi0" name="n1" xy="62,35" size="164,54" group="n44_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" text="合伙人">
-      <gearDisplay controller="type" pages="1,2"/>
+      <gearText controller="type" pages="0,2,3" values="普通成员|管理员|合伙人" default="盟主"/>
     </text>
-    <text id="n2_kwi0" name="n2" xy="83,35" size="124,54" group="n44_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" text="合伙人">
+    <group id="n44_rpaz" name="group_role" xy="62,35" size="164,54" group="n46_rpaz" advanced="true"/>
-      <gearDisplay controller="type" pages="3"/>
-    </text>
-    <text id="n67_s8rw" name="n67" xy="83,35" size="124,54" group="n44_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" autoSize="shrink" text="队员">
-      <gearDisplay controller="type" pages="0"/>
-    </text>
-    <group id="n44_rpaz" name="group_role" xy="82,35" size="125,54" group="n46_rpaz" advanced="true"/>
     <text id="n17_kwi0" name="tex_id" xy="432,61" size="279,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#c52b2b" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="100000"/>
     <component id="n59_ovii" name="btn_fag_add" src="dq5u7ifm" fileName="component/Btn/Btn(1).xml" xy="1302,13" size="226,99" group="n47_rpaz" scale="0.9,0.9">
       <Button icon="ui://m7iejg46s8rw7ihm"/>
@@ -31,7 +25,7 @@
     <text id="n68_s8rw" name="tex_fag" xy="722,13" size="379,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="12345678.00"/>
     <text id="n69_s8rw" name="tex_Safecompartment" xy="722,61" size="379,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="12345678.00"/>
     <text id="n72_tkv1" name="tex_Numberofsuboinates" xy="1115,35" size="165,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="9999"/>
-    <group id="n46_rpaz" name="group_player" xy="82,10" size="1682,105" advanced="true"/>
+    <group id="n46_rpaz" name="group_player" xy="62,10" size="1702,105" advanced="true"/>
     <image id="n71_s8rw" name="n71" src="otck7ieu" fileName="images/NGXiangTangMui/Line 65.png" xy="0,123" size="1765,2"/>
   </displayList>
 </component>

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

@@ -3,6 +3,7 @@
   <controller name="mng" pages="0,,1," selected="0"/>
   <controller name="show_total" pages="0,,1," selected="0"/>
   <controller name="fag" pages="0,,1," selected="0"/>
+  <controller name="type" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <image id="n52_hp03" name="n52" src="otck7ieu" fileName="images/NGXiangTangMui/Line 65.png" xy="0,123" size="1765,2">
       <relation target="" sidePair="width-width"/>
@@ -23,10 +24,12 @@
     </component>
     <text id="n29_oj7k" name="tex_fag" xy="722,13" size="379,54" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="11111"/>
     <text id="n54_eh0o" name="tex_Safecompartment" xy="722,61" size="379,54" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="11111"/>
-    <text id="n55_eh0o" name="n55" xy="83,30" size="148,64" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="48" color="#434343" text="合伙人"/>
+    <text id="n56_f2rs" name="n56" xy="62,35" size="164,54" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" text="合伙人">
-    <group id="n30_oj7k" name="n30" xy="83,13" size="1084,102" group="n31_oj7k"/>
+      <gearText controller="type" pages="0,2,3" values="普通成员|管理员|合伙人" default="盟主"/>
-    <group id="n31_oj7k" name="group_score" xy="83,13" size="1084,102" advanced="true"/>
+    </text>
-    <text id="n35_oj7k" name="tex_member_count" xy="1115,35" size="165,54" group="n36_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="23"/>
+    <group id="n30_oj7k" name="n30" xy="62,13" size="1105,102" group="n31_oj7k"/>
+    <group id="n31_oj7k" name="group_score" xy="62,13" size="1105,102" advanced="true"/>
+    <text id="n35_oj7k" name="tex_Numberofsuboinates" xy="1115,35" size="165,54" group="n36_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="23"/>
     <group id="n36_oj7k" name="n36" xy="1115,35" size="165,54"/>
     <component id="n42_ozaz" name="btn_percent" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1459,13" size="226,99" group="n40_oj7k">
       <Button title=" " icon="ui://m7iejg46tkv17ii7"/>