From 7b168e02afbd9d9418b831f18d3335125475ba55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Fri, 6 Jun 2025 22:27:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=8C=89=E9=92=AE=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4=EF=BC=8C=E7=A7=AF=E5=88=86=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8A=BD=E6=B0=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MngView/GroupMemberFagLogView.lua | 6 +++ .../MngView/GroupMngMemberHpListView.lua | 16 +++--- .../MngView/GroupMngMemberListView1.lua | 2 +- .../NewGroup/MngView/GroupMngMenKangView.lua | 19 ++++--- .../NewGroup/MngView/GroupMngPiLaoZhi.lua | 20 +++---- .../MngView/GroupPartnerRewardsView.lua | 13 +++-- wb_new_ui/.objs/metas/m7iejg46/gltdhc9.info | 3 ++ wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info | 3 -- wb_new_ui/assets/NewGroup/Main_GroupInfo.xml | 37 ++++++------- .../Lst_fag/Item_fag_detail_info(1).xml | 6 +-- .../component/Lst_fag/Item_fag_info.xml | 26 ++++++---- .../assets/NewGroup/mgr/Win_MemberFagLog.xml | 52 +++++++++++-------- 12 files changed, 120 insertions(+), 83 deletions(-) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua index fc9c92ea..fb9c767c 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua @@ -229,6 +229,10 @@ end -- 填充体力值详情对象 function M:OnRenderItem(index, obj) local data = self.hp_log[index + 1] + print("lingmeng render", self.group_id, data.pid, DataManager.groups:get(self.group_id), + DataManager.groups:get(self.group_id):getPlay(data.pid)) + pt(DataManager.groups:get(self.group_id).playList) + local play = DataManager.groups:get(self.group_id):getPlay(data.pid) 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) @@ -237,6 +241,8 @@ function M:OnRenderItem(index, obj) obj:GetChild("tex_fag").text = d2ad(data.cur_hp) obj:GetChild("tex_reason").text = __getReason(data) obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M", data.time) + obj:GetChild("tex_roomID").text = data.roomid + obj:GetChild("tex_playName").text = data.roomid == "" and "" or (play and play.name or "玩法已删除") local btn_head = obj:GetChild("btn_head") btn_head.icon = "ui://Common/Head0" ImageLoad.Load(self.member.portrait, btn_head._iconObject) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua index 8e8f8a39..c8c25ae9 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -95,12 +95,12 @@ function M:FillView() self.lst_member.itemRenderer = function(index, obj) self:OnRenderItem(index, obj) end - -- self.lst_member.scrollPane.onPullUpRelease:Set( - -- function() - -- --printlog("aaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbb ",self.lst_member.numItems) - -- self:GetMemberData(self.lst_member.numItems) - -- end - -- ) + self.lst_member.scrollPane.onPullUpRelease:Set( + function() + --printlog("aaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbb ",self.lst_member.numItems) + self:GetMemberData(self.lst_member.numItems) + end + ) -- 初始化搜索成员列表 self.lst_member_find = self._view:GetChild('lst_member_find') @@ -220,12 +220,12 @@ function M:GetMemberData(index) group:clearMember() end - ViewUtil.ShowModalWait(nil) + ViewUtil.ShowModalWait(nil, "亲友圈成员较多，请稍后") local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GroupMembers12( self.group_id, index, - 6, + self.curGroup.total_member_num, self.stype, self.online, function(res) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua index 0073812b..9dbd610a 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua @@ -231,7 +231,7 @@ function M:GetMemberData(index) fgCtr:FG_GroupMembers12( self.group_id, index, - 6, + self.pageNum or 6, self.stype, self.online, function(res) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua index 7f5c028e..74c53347 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua @@ -218,12 +218,12 @@ function M:GetMemberData(index) group:clearMember() end - ViewUtil.ShowModalWait(nil) + ViewUtil.ShowModalWait(nil, "亲友圈成员较多，请稍后") local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GroupMembers12( self.group_id, index, - 6, + self.curGroup.total_member_num, self.stype, self.online, function(res) @@ -233,19 +233,26 @@ function M:GetMemberData(index) else local allmembers = group.members self.member_data = {} - ViewUtil.ShowModalWait("正在加载预警值") + ViewUtil.ShowModalWait(nil, "正在加载预警值") + local sendRequest = 0 + local allFlag = false for i = 1, #allmembers do local member = allmembers[i] + if i == #allmembers then + allFlag = true + end pt(member) - if member.lev > 0 then + if member.lev < 3 or member.partnerLev ~= 0 then table.insert(self.member_data, member) + sendRequest = sendRequest + 1 fgCtr:FG_GetBanMemberHB(self.group_id, member.uid, function(res) --pt(res) + sendRequest = sendRequest - 1 if res.ReturnCode == 0 then -- local diaoduView = GroupSetMemberInfoDiaoduView.new(self.group_id, member.uid) -- diaoduView:SetCurrentState(res.Data.group_black + 1, res.Data) member.banInfo = res.Data - if i == #allmembers then + if allFlag and sendRequest == 0 then -- coroutine.wait(0.5) ViewUtil.CloseModalWait() self.page = math.ceil(#self.member_data / self.pageNum) @@ -254,7 +261,7 @@ function M:GetMemberData(index) end else ViewUtil.ErrorTip(res.ReturnCode, "获取整组调度失败！") - if i == #allmembers then + if allFlag and sendRequest == 0 then -- coroutine.wait(0.5) ViewUtil.CloseModalWait() self.page = math.ceil(#self.member_data / self.pageNum) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua index 71052117..1788f37d 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua @@ -256,12 +256,12 @@ function M:GetMemberData(index) group:clearMember() end - ViewUtil.ShowModalWait(nil) + ViewUtil.ShowModalWait(nil, "亲友圈成员较多，请稍后") local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GroupMembers12( self.group_id, index, - 6, + self.curGroup.total_member_num, self.stype, self.online, function(res) @@ -270,13 +270,13 @@ function M:GetMemberData(index) ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') else local members = group.members - 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 + -- 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 = members 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) @@ -552,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 = d2ad(member.cur_value) + obj:GetChild('tex_lev').text = group.lev == 1 and d2ad(member.cur_value / 2) or d2ad(member.cur_value) end function M:OnRenderItem(index, obj) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua index 4b144efb..928704a3 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua @@ -34,6 +34,7 @@ end -- 获取奖励设置数据 function M:GetRewardsData() + local group = DataManager.groups:get(self.group_id) local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GetRewards(self.group_id, self.partner_id, self.partner_lev, function(res) ViewUtil.CloseModalWait() @@ -58,13 +59,15 @@ function M:GetRewardsData() -- end for i = 1, #rewards do self.rewards_data[i] = rewards[i] + self.rewards_data[i].max_value = group.lev == 1 and self.rewards_data[i].max_value / 2 or + self.rewards_data[i].max_value end self.lst_rewards.numItems = #self.rewards_data self.fandianControl.selectedIndex = self.showxipai self._view:GetChild('btn_piliang').onClick:Set(function() local gfiv = GroupNumberInputView.new(self._root_view, function(num) - local tem = num + local tem = num * 1000 local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s？", num), MsgWindow.MsgMode.OkAndCancel, nil, false) @@ -132,7 +135,8 @@ function M:OnRenderRewardsItem(index, obj) 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_max").text = d2ad(data.max_value) + obj:GetChild("tex_rewards_max").text = string.format("%s/%s", d2ad(data.max_value), + d2ad(data.max_value) - d2ad(data.cur_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) @@ -145,10 +149,11 @@ function M:OnRenderRewardsItem(index, obj) local input_type = data.rewardValueType == 1 and 0 or 3 obj:GetChild("btn_set").onClick:Set(function() local gfiv = GroupNumberInputView.new(self._root_view, function(num) - local tem = num * 1000 + local tem = num if data.rewardValueType == 2 then tem = ad2d(tem) end + print("lingmeng setpilai", tem, data.max_value) if tem > data.max_value then ViewUtil.ErrorTip(nil, "输入值超过上限") return @@ -166,6 +171,8 @@ function M:OnRenderRewardsItem(index, obj) else data.cur_value = tem obj:GetChild("tex_rewards").text = d2ad(data.cur_value) + obj:GetChild("tex_rewards_max").text = string.format("%s/%s", d2ad(data.max_value), + d2ad(data.max_value) - d2ad(data.cur_value)) end end) end, 3) diff --git a/wb_new_ui/.objs/metas/m7iejg46/gltdhc9.info b/wb_new_ui/.objs/metas/m7iejg46/gltdhc9.info index e76527a3..784698b7 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/gltdhc9.info +++ b/wb_new_ui/.objs/metas/m7iejg46/gltdhc9.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n45_task": { + "hidden": true + }, "n14_l0s4": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info index 7e8240a0..5d53d48a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info @@ -18,9 +18,6 @@ "n39_gltd": { "hidden": true }, - "n40_gltd": { - "collapsed": true - }, "n74_s9vt": { "hidden": true }, diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml index 1ab91411..222e984b 100644 --- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml +++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + @@ -38,14 +38,14 @@