将疲劳值管理和门槛放在成员操作里面

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

@@ -1248,18 +1248,18 @@ function M:InitView(url)
     -- self:__loadLastData()
 
     --设置门槛和提成放置外面
-    self._view:GetChild('btn_menkan').onClick:Set(function()
+    -- self._view:GetChild('btn_menkan').onClick:Set(function()
-        -- if not self.mng_view_menkan then
+    --     -- if not self.mng_view_menkan then
-        self.mng_view_menkan = GroupMngMenKangView.new(self.curGroup.id)
+    --     self.mng_view_menkan = GroupMngMenKangView.new(self.curGroup.id)
-        -- end
+    --     -- end
-        self.mng_view_menkan:Show()
+    --     self.mng_view_menkan:Show()
-    end)
+    -- end)
-    self._view:GetChild('btn_pilaozhi').onClick:Set(function()
+    -- self._view:GetChild('btn_pilaozhi').onClick:Set(function()
-        -- if not self.mng_view_pilao then
+    --     -- if not self.mng_view_pilao then
-        self.mng_view_pilao = GroupMngPiLaoZhi.new(self.curGroup.id)
+    --     self.mng_view_pilao = GroupMngPiLaoZhi.new(self.curGroup.id)
-        -- end
+    --     -- end
-        self.mng_view_pilao:Show()
+    --     self.mng_view_pilao:Show()
-    end)
+    -- end)
     self._view:GetChild('btn_gerenxinxi').onClick:Set(function()
         -- if not self.mng_view_Player then
         self.mng_view_Player = GroupShowMemberInfoView.new(self.curGroup.id, self.curGroup)

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

@@ -8,7 +8,8 @@ local GroupSetMemberInfoDiaoduView = import('.GroupSetMemberInfoDiaoduView')
 local GroupPartnerBanPlaysView = import(".GroupPartnerBanPlaysView")
 local GroupPartnerRewardsView = import(".GroupPartnerRewardsView")
 local GourpIDPasswordAlone = import(".GourpIDPasswordAlone")
-
+local GroupMngMenKangView = import(".GroupMngMenKangView")
+local GroupMngPiLaoZhi = import(".GroupMngPiLaoZhi")
 
 -- 牌友圈成员体力值记录
 local GroupMemberOperateView = {}
@@ -135,7 +136,7 @@ function M:init(url)
                     end)
                 end
             end)
-        end, 0,{com = "ui://NewGroup/Win_AddFriend"})
+        end, 0, { com = "ui://NewGroup/Win_AddFriend" })
         gniv:Show()
     end)
     local vipbtn = self._view:GetChild("btn_vip")
@@ -273,15 +274,16 @@ function M:init(url)
         -- end
     end
 
-        --解除绑定
+    --解除绑定
     if group.lev == 1 then
         local btn_disbing = lst_mng:AddItemFromPool()
         btn_disbing.icon = "ui://NewGroup/mng_disbing"
         btn_disbing.onClick:Set(function()
-            local msg_tip = MsgWindow.new(self._root_view, string.format("是否要取消用户【%s(%d)】?",member.nick,member.uid), MsgWindow.MsgMode.OkAndCancel)
+            local msg_tip = MsgWindow.new(self._root_view, string.format("是否要取消用户【%s(%d)】?", member.nick, member.uid),
+                MsgWindow.MsgMode.OkAndCancel)
             msg_tip.onOk:Add(function(...)
                 ViewUtil.ShowModalWait()
-                fgCtr:FG_Reset_Lock(self.group_id, member.uid,0, function(res)
+                fgCtr:FG_Reset_Lock(self.group_id, member.uid, 0, function(res)
                     ViewUtil.CloseModalWait()
                     if self._is_destroy then
                         return
@@ -436,6 +438,21 @@ function M:init(url)
         local mflv = GroupMemberFagLogView.new(self.group_id, member)
         mflv:Show()
     end)
+    if (group.lev >= 1) then
+        local btn_mng_gerenxinxi = lst_mng:AddItemFromPool()
+        btn_mng_gerenxinxi.icon = "ui://NewGroup/mng_menkan"
+        btn_mng_gerenxinxi.onClick:Set(function()
+            local mflv1 = GroupMngMenKangView.new(self.group_id)
+            mflv1:Show()
+        end)
+        local btn_mng_pilaozhi = lst_mng:AddItemFromPool()
+        btn_mng_pilaozhi.icon = "ui://NewGroup/mng_pilaozhi"
+        btn_mng_pilaozhi.onClick:Set(function()
+            local mflv2 = GroupMngPiLaoZhi.new(self.group_id, member)
+            mflv2:Show()
+        end)
+    end
+
 
     if group.lev == 1 and group.type == 2 then
         local btn_move = lst_mng:AddItemFromPool()
@@ -469,7 +486,7 @@ function M:init(url)
                         self:MovePartner(parent_id, member, self._view)
                     end
                 end)
-            end, 0,{com = "ui://NewGroup/Win_AddFriend"})
+            end, 0, { com = "ui://NewGroup/Win_AddFriend" })
             gniv:Show()
         end)
     end
@@ -552,8 +569,6 @@ function M:init(url)
             IDPasswordAlone:Show()
         end)
     end
-
-
 end
 
 function M:MovePartner(parent_id, member, obj)

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

@@ -3,7 +3,7 @@ local GroupNumberInputView = import('.GroupNumberInputView')
 local GroupMemberFagLogView = import('.GroupMemberFagLogView')
 local GroupSetPermissionView = import('.GroupSetPermissionView')
 local GroupBanSameTableView = import('.GroupBanSameTableView')
-local GroupMemberOperateView = import('.GroupMemberOperateView')
+--local GroupMemberOperateView = import('.GroupMemberOperateView')
 local GroupAddMemberInfoView = import('.GroupAddMemberInfoView')
 local GroupStatMember = import('.GroupStatMember')
 local GroupMngFagPackView = import('../GroupMngFagPackView')
@@ -470,34 +470,34 @@ function M:FillItem(obj, member, refresh, index)
         end
     )
 
-    obj:GetChild('btn_operate').onClick:Set(
+    -- obj:GetChild('btn_operate').onClick:Set(
-        function()
+    --     function()
-            local mflv =
+    --         local mflv =
-                GroupMemberOperateView.new(
+    --             GroupMemberOperateView.new(
-                    self.group_id,
+    --                 self.group_id,
-                    member,
+    --                 member,
-                    function(delete)
+    --                 function(delete)
-                        if delete ~= nil and delete == true then
+    --                     if delete ~= nil and delete == true then
-                            local group = DataManager.groups:get(self.group_id)
+    --                         local group = DataManager.groups:get(self.group_id)
-                            self.member_data = group.members
+    --                         self.member_data = group.members
-                            print('btn_operate')
+    --                         print('btn_operate')
-                            self.lst_member.numItems = self:GetChildNumForPage()
+    --                         self.lst_member.numItems = self:GetChildNumForPage()
-                            self._view:GetController('search').selectedIndex = 0
+    --                         self._view:GetController('search').selectedIndex = 0
-                        else
+    --                     else
-                            print('btn_operate')
+    --                         print('btn_operate')
-                            self.lst_member.numItems = self:GetChildNumForPage()
+    --                         self.lst_member.numItems = self:GetChildNumForPage()
-                            if refresh then
+    --                         if refresh then
-                                self:FillItem(obj, member)
+    --                             self:FillItem(obj, member)
-                            end
+    --                         end
-                        end
+    --                     end
-                    end,
+    --                 end,
-                    function()
+    --                 function()
-                        self:GetMemberData(0)
+    --                     self:GetMemberData(0)
-                    end
+    --                 end
-                )
+    --             )
-            mflv:Show()
+    --         mflv:Show()
-        end
+    --     end
-    )
+    -- )
 
     local btnBxx = obj:GetChild('btn_bxx')
     btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and

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

@@ -3,7 +3,7 @@ local GroupNumberInputView = import('.GroupNumberInputView')
 local GroupMemberFagLogView = import('.GroupMemberFagLogView')
 local GroupSetPermissionView = import('.GroupSetPermissionView')
 local GroupBanSameTableView = import('.GroupBanSameTableView')
-local GroupMemberOperateView = import('.GroupMemberOperateView')
+--local GroupMemberOperateView = import('.GroupMemberOperateView')
 local GroupAddMemberInfoView = import('.GroupAddMemberInfoView')
 local GroupStatMember = import('.GroupStatMember')
 local GroupMngFagPackView = import('../GroupMngFagPackView')
@@ -479,32 +479,32 @@ function M:FillItem(obj, member, refresh, index)
         end
     )
 
-    obj:GetChild('btn_operate').onClick:Set(
+    -- obj:GetChild('btn_operate').onClick:Set(
-        function()
+    --     function()
-            local mflv =
+    --         local mflv =
-                GroupMemberOperateView.new(
+    --             GroupMemberOperateView.new(
-                    self.group_id,
+    --                 self.group_id,
-                    member,
+    --                 member,
-                    function(delete)
+    --                 function(delete)
-                        if delete ~= nil and delete == true then
+    --                     if delete ~= nil and delete == true then
-                            local group = DataManager.groups:get(self.group_id)
+    --                         local group = DataManager.groups:get(self.group_id)
-                            self.member_data = group.members
+    --                         self.member_data = group.members
-                            self.lst_member.numItems = self:GetChildNumForPage()
+    --                         self.lst_member.numItems = self:GetChildNumForPage()
-                            self._view:GetController('search').selectedIndex = 0
+    --                         self._view:GetController('search').selectedIndex = 0
-                        else
+    --                     else
-                            self.lst_member.numItems = self:GetChildNumForPage()
+    --                         self.lst_member.numItems = self:GetChildNumForPage()
-                            if refresh then
+    --                         if refresh then
-                                self:FillItem(obj, member)
+    --                             self:FillItem(obj, member)
-                            end
+    --                         end
-                        end
+    --                     end
-                    end,
+    --                 end,
-                    function()
+    --                 function()
-                        self:GetMemberData(0)
+    --                     self:GetMemberData(0)
-                    end
+    --                 end
-                )
+    --             )
-            mflv:Show()
+    --         mflv:Show()
-        end
+    --     end
-    )
+    -- )
 
     local btnBxx = obj:GetChild('btn_bxx')
     btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and

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

@@ -1,19 +1,22 @@
 {
   "objectStatus": {
+    "n240_n6w8": {
+      "hidden": true
+    },
     "n294_ik9v": {
       "collapsed": true
     },
-    "n259_imp5": {
-      "collapsed": true
-    },
-    "n78_i7lq": {
-      "hidden": true
-    },
     "n251_ilon": {
       "hidden": true
     },
+    "n78_i7lq": {
+      "hidden": true
+    },
     "n290_ik9v": {
       "hidden": true
+    },
+    "n260_imp5": {
+      "hidden": true
     }
   },
   "fitScreen": "FitSize"

wb_new_ui/.objs/workspace.json

@@ -2,18 +2,14 @@
   "libview.firstColumnWidth": 384,
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://8onu6pxjremn35",
+    "ui://m7iejg4610snh5j",
-    "ui://8onu6pxjremn3m",
+    "ui://m7iejg46imp57ih3",
-    "ui://8onu6pxjremn3v",
+    "ui://m7iejg46tqi8hwa"
-    "ui://8onu6pxjremn3r",
-    "ui://8onu6pxjremn42",
-    "ui://mzvoz9udm1i335",
-    "ui://mzvoz9udm1i33m"
   ],
   "test.device": "1080p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://8onu6pxjremn35",
+  "doc.activeDoc": "ui://m7iejg4610snh5j",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
@@ -24,64 +20,22 @@
     "/font/font_gameTableName/",
     "27vd145b",
     "/images/",
-    "8onu6pxj",
-    "/",
-    "8onu6pxj",
-    "/component/",
-    "8onu6pxj",
-    "/component/epcwhzHECHIMui/",
-    "1utjt0r2",
-    "/",
-    "1utjt0r2",
-    "/component/",
-    "1utjt0r2",
-    "/component/clearing/",
-    "1utjt0r2",
-    "/component/clearing/image/",
-    "mzvoz9ud",
-    "/",
-    "mzvoz9ud",
-    "/component/",
-    "mzvoz9ud",
-    "/component/EPCDWHZMui/",
-    "mzvoz9ud",
-    "/component/clearing/",
-    "mzvoz9ud",
-    "/component/clearing/image/",
-    "mzvoz9ud",
-    "/component/clearing/images/",
-    "8wph7p8n",
-    "/",
-    "8wph7p8n",
-    "/image/",
     "2d9xdj6z",
     "/",
-    "2d9xdj6z",
-    "/images/",
-    "2d9xdj6z",
-    "/images/LobbyMui/",
-    "v0j9abjy",
-    "/",
-    "v0j9abjy",
-    "/images/",
-    "v0j9abjy",
-    "/images/cards/",
-    "v0j9abjy",
-    "/images/cards/1/",
-    "v0j9abjy",
-    "/images/cards/2/",
-    "lkq9ne9s",
-    "/",
-    "lkq9ne9s",
-    "/buttons/",
-    "lkq9ne9s",
-    "/component/",
-    "lkq9ne9s",
-    "/image/",
-    "lkq9ne9s",
-    "/images/",
     "m7iejg46",
-    "/"
+    "/",
+    "m7iejg46",
+    "/component/",
+    "m7iejg46",
+    "/component/Lst_info/",
+    "m7iejg46",
+    "/component/Lst_info/room_info/",
+    "m7iejg46",
+    "/mgr/",
+    "m7iejg46",
+    "/mgr/imgs/",
+    "m7iejg46",
+    "/mgr/imgs/member/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/NewGroup/Main_GroupInfo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageOffsetX="-208" bgColor="#000000">
-  <controller name="manager" pages="0,普通玩家,1,圈主,2,副圈主,3,合伙人" selected="1"/>
+  <controller name="manager" pages="0,普通玩家,1,圈主,2,副圈主,3,合伙人" selected="3"/>
   <controller name="null" pages="0,,1," selected="0"/>
   <controller name="fag" pages="0,,1," selected="0"/>
   <controller name="floors" pages="0,,1,,2,,3,,4,,5," selected="0"/>
@@ -13,7 +13,7 @@
     <action type="change_page" fromPage="" toPage="1" objectId="n172_mpll" controller="tip" targetPage="1"/>
   </controller>
   <controller name="show_search" pages="0,,1," selected="0"/>
-  <controller name="more" pages="0,,1," selected="0"/>
+  <controller name="more" pages="0,,1," selected="1"/>
   <controller name="bgchange" pages="0,,1,,3,,4," selected="0"/>
   <displayList>
     <image id="n274_ik9v" name="n274" src="u50h7in5" fileName="images/bg2.png" pkg="2d9xdj6z" xy="0,0" size="2532,1170">
@@ -90,7 +90,7 @@
     </component>
     <component id="n283_ik9v" name="btn_more" src="cv577inp" fileName="buttons/Btn_CheckBox.xml" pkg="27vd145b" xy="2361,34" size="114,162" group="n291_ik9v">
       <gearDisplay controller="manager" pages="0,1,2,3"/>
-      <Button icon="ui://m7iejg46sqe0p7iuw" controller="more" page="1"/>
+      <Button checked="true" icon="ui://m7iejg46sqe0p7iuw" controller="more" page="1"/>
     </component>
     <image id="n200_isix" name="member_tips" src="cioehom" fileName="images/info/right_panel/tips.png" xy="1876,34" size="29,31" group="n291_ik9v" visible="false">
       <gearDisplay controller="manager" pages="1,2,3"/>
@@ -144,8 +144,8 @@
     <component id="n290_ik9v" name="btn_ReturnGame" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2358,216" size="124,162" visible="false">
       <Button icon="ui://27vd145bixzr7j75"/>
     </component>
-    <image id="n258_imp5" name="n258" src="cv577ird" fileName="images/bg_groupMore.png" xy="2165,163" size="323,445" group="n259_imp5">
+    <image id="n258_imp5" name="n258" src="cv577ird" fileName="images/bg_groupMore.png" xy="2165,163" size="323,196" group="n259_imp5">
-      <gearSize controller="manager" pages="0,1,2,3" values="323,196,1,1|323,445,1,1|323,445,1,1|323,445,1,1"/>
+      <gearSize controller="manager" pages="0,1,2,3" values="323,196,1,1|323,196,1,1|323,196,1,1|323,196,1,1"/>
       <relation target="" sidePair="right-right%,top-top%"/>
     </image>
     <component id="n264_imp5" name="n264" src="imp57ih2" fileName="btn_bg.xml" xy="-5,0" size="2550,1170" group="n259_imp5">
@@ -153,12 +153,12 @@
       <relation target="" sidePair="width-width,height-height"/>
       <Button controller="more" page="0"/>
     </component>
-    <component id="n240_n6w8" name="btn_pilaozhi" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2184,204" size="287,116" group="n259_imp5">
+    <component id="n240_n6w8" name="btn_pilaozhi" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2184,204" size="287,116" group="n259_imp5" visible="false">
       <gearDisplay controller="manager" pages="1,2,3"/>
       <relation target="" sidePair="right-right%,top-top%"/>
       <Button icon="ui://m7iejg46cv577irh"/>
     </component>
-    <component id="n260_imp5" name="btn_menkan" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2184,335" size="288,116" group="n259_imp5" aspect="true">
+    <component id="n260_imp5" name="btn_menkan" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2184,335" size="288,116" group="n259_imp5" aspect="true" visible="false">
       <gearDisplay controller="manager" pages="1,2,3"/>
       <relation target="" sidePair="right-right%,top-top%"/>
       <Button icon="ui://m7iejg46cv577irf"/>
@@ -168,7 +168,7 @@
       <relation target="" sidePair="right-right%,top-top%"/>
       <Button icon="ui://m7iejg46cv577irg"/>
     </component>
-    <component id="n265_imp5" name="btn_gerenxinxi2" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2184,466" size="285,116" group="n259_imp5" aspect="true">
+    <component id="n265_imp5" name="btn_gerenxinxi2" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2184,204" size="285,116" group="n259_imp5" aspect="true">
       <gearDisplay controller="manager" pages="1,2,3"/>
       <relation target="" sidePair="right-right%,top-top%"/>
       <Button icon="ui://m7iejg46cv577irg"/>

wb_new_ui/assets/NewGroup/package.xml

@@ -1543,6 +1543,8 @@
     <image id="ixzrp7iyi" name="Frame 1302qq.png" path="/NGMui/"/>
     <image id="ixzrp7iyj" name="Frame 1273qq.png" path="/NGMui/"/>
     <image id="ixzrp7iyk" name="Frame 1278qq.png" path="/NGMui/"/>
+    <image id="gnbdp7iyl" name="mng_pilaozhi.png" path="/mgr/imgs/member/" exported="true"/>
+    <image id="gnbdp7iym" name="mng_menkan.png" path="/mgr/imgs/member/" exported="true"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>