疲劳值修改，门槛修复

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

@@ -80,7 +80,7 @@ function M:FillView()
         --printlog("aaaaaaaa222222222222222222222222222222")
     end)
 
-    local rtype = self._view:GetChild("n136")
+    local rtype = self._view:GetChild("btn_search")
 
     rtype.onClick:Set(function()
         self:GetMemberData(0)
@@ -236,6 +236,7 @@ function M:GetMemberData(index)
                 ViewUtil.ShowModalWait("正在加载预警值")
                 for i = 1, #allmembers do
                     local member = allmembers[i]
+                    pt(member)
                     if member.lev > 0 then
                         table.insert(self.member_data, member)
                         fgCtr:FG_GetBanMemberHB(self.group_id, member.uid, function(res)

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

@@ -32,7 +32,7 @@ function GroupMngPiLaoZhi.new(group_id, blur_view)
     self.curGroup = DataManager.groups:get(self.group_id)
     self.member_data = {}
     self.online = 2
-    self.stype = 2
+    self.stype = 1
     self:FillView()
     return self
 end
@@ -200,7 +200,8 @@ function M:FillView()
 
     self._view:GetChild('btn_piLaoZhi1').onClick:Set(function()
         local fgCtr = ControllerManager.GetController(NewGroupController)
-        fgCtr:FG_GetRewards(self.group_id, group.owner, group.partnerLev, function(res)
+        fgCtr:FG_GetRewards(self.group_id, DataManager.SelfUser.account_id, group.lev,
+            function(res)
                 ViewUtil.CloseModalWait()
                 if self._is_destroy then
                     return
@@ -218,7 +219,8 @@ function M:FillView()
     end)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetRewards(self.group_id, group.owner, group.partnerLev, function(res)
+    fgCtr:FG_GetRewards(self.group_id, DataManager.SelfUser.account_id, group.lev,
+        function(res)
             ViewUtil.CloseModalWait()
             if self._is_destroy then
                 return
@@ -267,9 +269,16 @@ function M:GetMemberData(index)
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
             else
-                self.member_data = group.members
+                local members = group.members
-                self.lst_member.numItems = self:GetChildNumForPage()
+                local tempNumberList = {}
+                for i = 1, #members do
+                    if members[i].lev < 3 or members[i].partnerLev ~= 0 then
+                        table.insert(tempNumberList, members[i])
+                    end
+                end
+                self.member_data = tempNumberList
                 self.page = math.ceil(#group.members / self.pageNum)
+                self.lst_member.numItems = self:GetChildNumForPage()
                 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
@@ -508,9 +517,13 @@ function M:FillItem(obj, member, refresh, index)
     local superBtnUp = obj:GetChild('superior_btn_up')
     obj:GetChild("btn_zeng").onClick:Set(
         function()
-            local prv = GroupPartnerRewardsView.new(self.group_id, member.uid, member.partnerLev)
+            if member.uid == DataManager.SelfUser.account_id then
+                self._view:GetController('page').selectedIndex = 0
+            else
+                local prv = GroupPartnerRewardsView.new(self.group_id, member.uid, member.lev)
                 prv:Show()
             end
+        end
     )
     obj:GetChild("super_btn").onClick:Set(
         function()
@@ -539,7 +552,7 @@ end
 
 function M:FillItem2(obj, group, member, refresh, index)
     obj:GetChild('tex_childId').text = group:getPlayName(member.pid)
-    obj:GetChild('tex_lev').text = member.max_value
+    obj:GetChild('tex_lev').text = member.cur_value
 end
 
 function M:OnRenderItem(index, obj)

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

@@ -64,7 +64,7 @@ function M:GetRewardsData()
 
             self._view:GetChild('btn_piliang').onClick:Set(function()
                 local gfiv = GroupNumberInputView.new(self._root_view, function(num)
-                    local tem = num * 1000
+                    local tem = num
                     local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s？", num),
                         MsgWindow.MsgMode.OkAndCancel, nil, false)
 
@@ -72,10 +72,9 @@ function M:GetRewardsData()
                         local single = msg_win.btnCheck.selected and 1 or 0
                         local fgCtr = ControllerManager.GetController(NewGroupController)
                         ViewUtil.ShowModalWait()
-                        local successNum = 0
                         for i = 1, #rewards do
-                            fgCtr:FG_SetRewards(self.group_id, rewards[i].pid, self.partner_lev, self.partner_id, true,
+                            fgCtr:FG_SetRewards(self.group_id, rewards[i].pid, self.partner_lev, self.partner_id, false,
-                                rewards[i].max_value - tem, single,
+                                rewards[i].max_value - tem < 0 and 0 or rewards[i].max_value - tem, single,
                                 function(res)
                                     ViewUtil.CloseModalWait()
                                     if res.ReturnCode ~= 0 then
@@ -90,10 +89,10 @@ function M:GetRewardsData()
                                         -- end
                                         -- self.lst_rewards.numItems = #self.rewards_data
                                     end
-                                end)
                                     if i == #rewards then
                                         self:GetRewardsData()
                                     end
+                                end)
                         end
                     end)
                     msg_win:Show()
@@ -132,8 +131,8 @@ function M:OnRenderRewardsItem(index, obj)
     --printlog("aaaaaaaaaaaaaaaaaaaaa  ",__showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1))
     obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data
         .xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1)
-    obj:GetChild("tex_rewards").text = d2ad(data.cur_value)
+    obj:GetChild("tex_rewards").text = data.cur_value
-    obj:GetChild("tex_rewards_max").text = d2ad(data.max_value)
+    obj:GetChild("tex_rewards_max").text = data.max_value
     obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value,
         data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1)
     local play_name = group:getPlayName(data.pid)

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="0"/>
+  <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"/>
@@ -38,13 +38,13 @@
       <relation target="" sidePair="right-right,top-top"/>
       <Button icon="ui://m7iejg46qlxihsk"/>
     </component>
-    <component id="n243_n6w8" name="btn_match" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="931,22" size="59,79" visible="false">
+    <component id="n243_n6w8" name="btn_match" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="850,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="1184,23" size="65,77">
+    <component id="n139_cioe" name="btn_stat" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1185,22" size="65,77">
       <gearXY controller="manager" pages="0,1,2,3" values="1184,23|1187,22|1183,22|1185,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="1092,23" size="85,81">
+    <component id="n242_n6w8" name="btn_hp" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="863,22" size="85,81">
       <gearDisplay controller="manager" pages="0,1,2,3"/>
       <gearXY controller="manager" pages="0,1,2,3" values="1092,23|855,22|845,22|863,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="1169,22" size="65,76">
+    <component id="n138_cioe" name="btn_partner" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="1105,22" size="65,76">
       <gearDisplay controller="manager" pages="1,2,3"/>
       <gearXY controller="manager" pages="1,2,3" values="1107,22|1103,22|1105,22" default="1169,22"/>
       <relation target="" sidePair="right-right,top-top%"/>
@@ -74,13 +74,13 @@
       <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="1111,21" size="59,76" visible="false">
+    <component id="n241_n6w8" name="btn_share" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="966,16" 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="928,26" size="83,71">
+    <component id="n256_iaes" name="btn_bxx" src="hsbhhj2" fileName="component/Lst_info/Btn_Icon.xml" xy="771,27" size="83,71">
       <gearDisplay controller="manager" pages="0,1,2,3"/>
       <gearXY controller="manager" pages="0,1,2,3" values="928,26|762,25|752,26|771,27"/>
       <relation target="" sidePair="right-right,top-top"/>
@@ -96,7 +96,7 @@
       <relation target="" sidePair="right-right,top-top"/>
       <Button icon="ui://m7iejg46lf2qhjs"/>
     </component>
-    <component id="n172_mpll" name="btn_mail" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="1019,22" size="65,76" controller="tip,0">
+    <component id="n172_mpll" name="btn_mail" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="957,22" size="65,76" controller="tip,0">
       <gearDisplay controller="manager" pages="0,1,2,3"/>
       <gearXY controller="manager" pages="0,1,3" values="1019,22|949,22|957,22" default="949,22"/>
       <relation target="" sidePair="right-right,top-top%"/>
@@ -218,8 +218,8 @@
       <gearDisplay controller="show_search" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <image id="n258_imp5" name="n258" src="imp57igx" fileName="images/info/Union.png" xy="1025,96" size="302,124" group="n259_imp5">
+    <image id="n258_imp5" name="n258" src="imp57igx" fileName="images/info/Union.png" xy="1025,96" size="302,346" group="n259_imp5">
-      <gearSize controller="manager" pages="0,1" values="302,124,1,1|302,346,1,1" default="199,266,1,1"/>
+      <gearSize controller="manager" pages="0,1,2,3" values="302,124,1,1|302,346,1,1|302,346,1,1|302,346,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="1352,750" group="n259_imp5">

wb_new_ui/assets/NewGroup/mgr/View_GroupMenKang.xml

@@ -2,8 +2,8 @@
 <component size="1396,690">
   <controller name="search" pages="0,,1," selected="0"/>
   <controller name="page" pages="0,,1,,2," selected="0"/>
-  <controller name="mng" pages="0,,1," selected="0"/>
+  <controller name="mng" pages="0,,1," selected="1"/>
-  <controller name="set" pages="0,,1," selected="0"/>
+  <controller name="set" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n133_ilon" name="n133" src="imp57igz" fileName="images/Group 759.png" xy="0,-3" size="1396,694"/>
     <component id="n20_kwi0" name="btn_back" src="ilon7ibk" fileName="mgr/component/numberHpAlone/Btn_back1.xml" xy="1273,105" size="71,54" group="n49_jd7v">
@@ -91,7 +91,9 @@
     <graph id="n153_imp5" name="n153" xy="362,109" size="672,472" group="n151_imp5" type="rect" lineSize="0" fillColor="#00ffffff"/>
     <image id="n145_imp5" name="n145" src="imp57ihi" fileName="images/menkang/Group 774.png" xy="361,108" group="n151_imp5"/>
     <image id="n146_imp5" name="n146" src="imp57ihj" fileName="images/menkang/Rectangle 423.png" xy="640,311" group="n151_imp5"/>
-    <component id="n147_imp5" name="n147" src="imp57ihk" fileName="images/menkang/btn_cancel.xml" xy="501,452" group="n151_imp5"/>
+    <component id="n147_imp5" name="n147" src="imp57ihk" fileName="images/menkang/btn_cancel.xml" xy="501,452" group="n151_imp5">
+      <Button controller="set" page="0"/>
+    </component>
     <component id="n148_imp5" name="btn_sendMenkang" src="imp57ihl" fileName="images/menkang/btn_ok.xml" xy="711,452" group="n151_imp5"/>
     <text id="n149_imp5" name="input_value" xy="649,313" size="199,58" group="n151_imp5" fontSize="36" color="#884f00" vAlign="middle" autoSize="none" bold="true" text="1000" input="true" prompt="设置门槛" keyboardType="4"/>
     <text id="n150_imp5" name="n150" xy="532,315" size="84,54" group="n151_imp5" font="Microsoft YaHei" fontSize="40" color="#884f00" bold="true" text="门槛"/>