diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupSetUpTeamAlertSystemView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupSetUpTeamAlertSystemView.lua index de77c655..dcc2a62c 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupSetUpTeamAlertSystemView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupSetUpTeamAlertSystemView.lua @@ -16,19 +16,19 @@ function GroupSetUpTeamAlertSystemView.new(gid) self._close_destroy = true self.group_id = gid self.record_data = {} - + -- 分页相关变量 self.page_size = 10 -- 每页显示数量 self.current_page = 1 -- 当前页码 self.total_pages = 1 -- 总页数 - + self:init("ui://NewGroup/Win_SetUpTeamAlertSystem") return self end function M:init(url) BaseWindow.init(self, url) - + local group = DataManager.groups:get(self.group_id) self.lst_record = self._view:GetChild("lst_record") @@ -111,11 +111,12 @@ function M:init(url) function() self.quary_id = 0 self.query_nick = "" + self.record_data = {} self.current_page = 1 self:GetRecordData(0) end ) - + -- 分页按钮事件绑定 self._view:GetChild("previouspage").onClick:Set(function() self:OnPreviousPage() @@ -124,7 +125,7 @@ function M:init(url) self._view:GetChild("nextpage").onClick:Set(function() self:OnNextPage() end) - + -- 初始化数据 self:initData() end @@ -132,7 +133,7 @@ end function M:initData() self.lst_record.numItems = 0 self.record_data = {} - + -- 重置分页状态 self.current_page = 1 self.total_pages = 1 @@ -271,7 +272,7 @@ function M:FillRecordItem(data, obj) end) end) end - + local btnMen = obj:GetChild("btnMen") local menControl = obj:GetController("menkan") local texMentext = obj:GetChild("tex_Men_text") diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua index 4de2ed1d..40c9db19 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua @@ -13,7 +13,7 @@ function GroupMngMatchFagListView.new(group_id) -- 体力值查询结果 self.fag_result_data = {} -- 查询id - self.quary_id = 0 + self.quary_id = -1 self.query_nick = "" self:FillView() return self @@ -62,13 +62,13 @@ function M:FillView() self._view:GetController("page").onChanged:Set(function() if self._view:GetController("page").selectedIndex < 2 then if self._view:GetController("search").selectedIndex == 0 then - self.quary_id = 0 + self.quary_id = -1 self.query_nick = "" self.fag_data = {} self:GetFagData(0) else - self.quary_id = 0 + self.quary_id = -1 self.query_nick = "" self.fag_result_data = {} @@ -82,31 +82,61 @@ function M:FillView() self._view:GetChild("btn_search").onClick:Set(function() local qid = self._view:GetChild("tex_id").text qid = tonumber(qid) - self.quary_id = qid or 0 + self.quary_id = qid or -1 self.query_nick = self._view:GetChild("tex_id").text or "" self.fag_result_data = {} self._view:GetChild("tex_id").text = "" self:GetFagData(0) end) self._view:GetChild("btn_back").onClick:Set(function() - self.quary_id = 0 + self.quary_id = -1 self.query_nick = "" + self.fag_data = {} + self.fag_result_data = {} + + -- 确保搜索控制器回到默认状态 + if self._view:GetController("search") then + self._view:GetController("search").selectedIndex = 0 + end + self._view:GetController("fenleixing").selectedIndex = 0 + -- 重新获取第一页数据 + self:GetFagData(0) end) self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, function() - self:GetMngFagInfo() - end) + self:GetMngFagInfo() + end) + + -- 【新增】监听 fenleixing 控制器变化，实现自动刷新 + local fenleixingCtrl = self._view:GetController("fenleixing") + if fenleixingCtrl then + fenleixingCtrl.onChanged:Set(function() + -- 切换分类时，重置搜索状态和数据列表 + self.quary_id = -1 + self.query_nick = "" + self.fag_data = {} + self.fag_result_data = {} + + -- 确保搜索控制器回到默认状态 + if self._view:GetController("search") then + self._view:GetController("search").selectedIndex = 0 + end + + -- 重新获取第一页数据 + self:GetFagData(0) + end) + end end -- 获取上下分数据 local num = 8 function M:GetFagData(index) - qid = self.quary_id or 0 + local qid = self.quary_id or -1 qName = self.query_nick or "" -- 重新获取数据时，清空数据列表 if index == 0 then - if qid == 0 then + if qid == -1 then self.fag_data = {} else self.fag_result_data = {} @@ -120,13 +150,17 @@ function M:GetFagData(index) if group.lev == 3 then type = type + 2 end + + -- 获取 fenleixing 控制器的选中索引作为第5个参数 + local fenleixingIndex = self._view:GetController("fenleixing").selectedIndex local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetOptHp( self.group_id, index, 6, - -1, - 0, + qid, + fenleixingIndex, function(res) ViewUtil.CloseModalWait() if self._is_destroy then @@ -135,16 +169,35 @@ function M:GetFagData(index) if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") else - printlog("----------------2222222222---------") - 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 - if qid ~= 0 or self.query_nick ~= "" then + + if qid ~= -1 or self.query_nick ~= "" then local_data = self.fag_result_data lst = self.lst_fag_result + printlog(1234567897468563) + self._view:GetController("search").selectedIndex = 1 + else + self._view:GetController("search").selectedIndex = 0 + end + for i = 1, #data do + local_data[#local_data + 1] = data[i] + end + lst.numItems = #local_data + end + if res.Data.logs ~= nil then + local data = res.Data.logs + -- if #data == 0 then return end + local local_data = self.fag_data + local lst = self.lst_fag + + if qid ~= -1 or self.query_nick ~= "" then + local_data = self.fag_result_data + lst = self.lst_fag_result + printlog(1234567897468563) self._view:GetController("search").selectedIndex = 1 else self._view:GetController("search").selectedIndex = 0 @@ -215,18 +268,35 @@ end -- 填充对象 function M:OnRenderItem(index, obj) - local local_data = (self.quary_id == 0 and self.query_nick == "") and self.fag_data or self.fag_result_data + local local_data = (self.quary_id == -1 and self.query_nick == "") and self.fag_data or self.fag_result_data local rdata = local_data[index + 1] local num = d2ad(rdata.hp) - obj:GetChild("tex_mgr_name").text = ViewUtil.stringEllipsis(rdata.m_nick) - obj:GetChild("tex_mgr_id").text = rdata.mgr_id - obj:GetChild("tex_obj_name").text = ViewUtil.stringEllipsis(rdata.t_nick) - obj:GetChild("tex_id").text = rdata.uid + --obj:GetChild("tex_mgr_name").text = ViewUtil.stringEllipsis(rdata.nick) + --obj:GetChild("tex_mgr_id").text = rdata.mgr_id + --obj:GetChild("tex_obj_name").text = ViewUtil.stringEllipsis(rdata.nick) + --obj:GetChild("tex_id").text = rdata.uid + obj:GetChild("tex_num").text = num >= 0 and "+" .. num or num obj:GetController("add").selectedIndex = num >= 0 and 1 or 0 obj:GetChild("tex_left").text = d2ad(rdata.cur_hp) - obj:GetChild("tex_reason_name_id").text = "给" .. ViewUtil.stringEllipsis(rdata.t_nick) .. - "(ID:" .. rdata.uid .. ")增加\n" .. num .. "比赛分" + -- obj:GetChild("tex_reason_name_id").text = "给" .. ViewUtil.stringEllipsis(rdata.nick) .. + -- "(ID:" .. rdata.uid .. ")增加\n" .. num .. "比赛分" + + -- 1. 处理显示文本：+号显示“增加”，-号显示“减少” + local action_text = "增加" + if num < 0 then + action_text = "减少" + end + -- 2. 处理数值显示：取绝对值，确保不带 +/- 号 + local display_num = math.abs(num) + -- 3. 拼接字符串，使用 action_text 和 display_num + local nick = rdata.nick or "" + local uid = rdata.uid or "" + + obj:GetChild("tex_reason_name_id").text = "给" .. ViewUtil.stringEllipsis(nick) .. + "(ID:" .. uid .. ")" .. action_text .. "\n" .. display_num .. "比赛分" + + obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M", rdata.time) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua index 7ab14500..8488e93b 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua @@ -99,9 +99,9 @@ function M:FillView() return end qid = tonumber(text) or 0 - printlog("sssssssssssssssaaaaaaaaaaaaaa", qid) qnick = text + self._view:GetChild("tex_id").text = "" local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GetUnderMembers( self.group_id, @@ -299,7 +299,6 @@ function M:FillItem(obj, member, refresh) else ctr_type.selectedIndex = 0 end - -- 体力值数据 local tex_fag = obj:GetChild('tex_fag') tex_fag.text = d2ad(member.hp) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua index ca014e16..1c87f0c4 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua @@ -150,7 +150,7 @@ function M:GetPartnerData(index, callback) ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败") else local newMembers = res.Data.members - + -- 实现先清空，后拼接逻辑 if index == 0 then -- 第一页：清空旧数据，直接赋值新数据 @@ -184,24 +184,29 @@ 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") - lst_partner_search:RemoveChildrenToPool() - for i = 1, #res.Data.members do - local tem = lst_partner_search:AddItemFromPool() - self:FillItem(tem, res.Data.members[i]) - end + fgCtr:FG_GetUnderMembers( + self.group_id, + 0, + 6, + query_id, + function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败") else - ViewUtil.ErrorTip(res.ReturnCode, "找不到指定的玩家") + 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") + lst_partner_search:RemoveChildrenToPool() + for i = 1, #res.Data.members do + local tem = lst_partner_search:AddItemFromPool() + self:FillItem(tem, res.Data.members[i]) + end + else + ViewUtil.ErrorTip(res.ReturnCode, "找不到指定的玩家") + end end - end - end) + end) end -- 管理员权限 @@ -344,23 +349,23 @@ function M:FillItem(obj, partner) self:ShowPartnerRewards(partner.uid, partner.partnerLev) end) - local btn_tag = obj:GetChild("btn_tag") - btn_tag.title = partner.score - btn_tag.onClick:Set(function() - local stv = GroupSetTagView.new(self.group_id, partner, function(refresh) - if refresh then - btn_tag.title = partner.score - end - end) - stv:Show() - end) + -- local btn_tag = obj:GetChild("btn_tag") + -- btn_tag.title = partner.score + -- btn_tag.onClick:Set(function() + -- local stv = GroupSetTagView.new(self.group_id, partner, function(refresh) + -- if refresh then + -- btn_tag.title = partner.score + -- end + -- end) + -- stv:Show() + -- end) - local btnDetail = obj:GetChild("btn_detail") - --btnDetail.visible = partner.total > 0 - btnDetail.onClick:Set(function() - local GroupMngPartnerListView2 = GroupMngPartnerListView2.new(self.group_id, partner.uid) - GroupMngPartnerListView2:Show() - end) + -- local btnDetail = obj:GetChild("btn_detail") + -- --btnDetail.visible = partner.total > 0 + -- btnDetail.onClick:Set(function() + -- local GroupMngPartnerListView2 = GroupMngPartnerListView2.new(self.group_id, partner.uid) + -- GroupMngPartnerListView2:Show() + -- end) end -- 列表对象填充 diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json index b05845ea..44830066 100644 --- a/wb_new_ui/.objs/fonts.json +++ b/wb_new_ui/.objs/fonts.json @@ -18,6 +18,13 @@ ui://visk5g30gq7m3n ui://visk5g30gq7m38 ui://visk5g30gq7m4h ui://visk5g30gq7m1c +ui://wima7r3pn52n1q +ui://wima7r3pn52n2h +ui://wima7r3pn52n4j +ui://wima7r3pn52n44 +ui://wima7r3pn52n8o +ui://wima7r3pn52n84 +ui://wima7r3pn52n2 ui://fnuxqeflkllg1u ui://fnuxqeflkllg1v ui://egnzysm7ffp38o @@ -28,6 +35,9 @@ ui://v2hilfzbgq7m2k ui://v2hilfzbgq7ml ui://oubpz2r2ofil78 ui://oubpz2r2ofil77 +ui://4ismcalcndxj2g +ui://4ismcalcndxj9w +ui://4ismcalcndxj2m ui://3n2top74kpmg36 ui://3n2top74kpmgk0 ui://3n2top74kpmgjz @@ -48,9 +58,12 @@ ui://qpsoxvainauecht ui://b8jloj2qnaueci9 ui://b8jloj2qnauecht ui://v09du5djgq7m6 +ui://wlat5n12n52n2 ui://eyxz924gffp34g ui://v2emygzogq7m8 ui://4wmd3o8gvlhjde +ui://4d8pyax7ndxj2x +ui://4d8pyax7ndxj13 ui://z3z0ysurvlhj7t ui://96mvx2mlvlhjcsv ui://boq0ohepvlhjd0 diff --git a/wb_new_ui/.objs/metas/442j0uep/ygxga.info b/wb_new_ui/.objs/metas/442j0uep/ygxga.info index 6686f36a..a3f33fa5 100644 --- a/wb_new_ui/.objs/metas/442j0uep/ygxga.info +++ b/wb_new_ui/.objs/metas/442j0uep/ygxga.info @@ -12,9 +12,6 @@ "n54_rx2e": { "hidden": true }, - "n92_qmn4": { - "collapsed": true - }, "n69_w06x": { "hidden": true }, @@ -24,9 +21,6 @@ "n61_fnpw": { "hidden": true }, - "n46_n1ry": { - "hidden": true - }, "n52_rx2e": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/4ismcalc/ndxj36.info b/wb_new_ui/.objs/metas/4ismcalc/ndxj36.info index 0b73a202..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/4ismcalc/ndxj36.info +++ b/wb_new_ui/.objs/metas/4ismcalc/ndxj36.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n92_qmn4": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info b/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info index 48038a38..7a6f58b7 100644 --- a/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info +++ b/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info @@ -1,8 +1,7 @@ { "objectStatus": { - "n19_pt1r": { - "hidden": true, - "collapsed": true + "n68_w06x": { + "hidden": true }, "n37_n1ry": { "hidden": true @@ -10,14 +9,12 @@ "n69_w06x": { "hidden": true }, - "n68_w06x": { - "hidden": true + "n19_pt1r": { + "hidden": true, + "collapsed": true }, "n51_fmkv": { "collapsed": true - }, - "n46_n1ry": { - "hidden": true } }, "adaptiveTest": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info index bbd07466..d7f97bdb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info @@ -6,14 +6,11 @@ "n136_s8rw": { "hidden": true }, - "n21_cioe": { - "hidden": true - }, "n33_rpaz": { "hidden": true }, - "n7_kwi0": { - "collapsed": true + "n21_cioe": { + "hidden": true }, "n131_jawz": { "hidden": true diff --git a/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info b/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info index 3c2b605a..c30bb410 100644 --- a/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info +++ b/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info @@ -6,9 +6,6 @@ "n63_fnpw": { "hidden": true }, - "n46_n1ry": { - "hidden": true - }, "n52_rx2e": { "hidden": true }, @@ -18,17 +15,17 @@ "n14_pt1r": { "hidden": true }, - "n69_w06x": { + "n73_p9qe": { "hidden": true }, - "n73_p9qe": { + "n37_n1ry": { "hidden": true }, "n61_fnpw": { "hidden": true, "collapsed": true }, - "n37_n1ry": { + "n69_w06x": { "hidden": true }, "n17_pt1r": { @@ -37,9 +34,6 @@ "n51_fmkv": { "collapsed": true }, - "n89_qmn4": { - "collapsed": true - }, "n15_pt1r": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info b/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info index 7c720d91..ce784b3a 100644 --- a/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info +++ b/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info @@ -6,9 +6,6 @@ "n49_g8y2": { "hidden": true }, - "n46_n1ry": { - "hidden": true - }, "n52_rx2e": { "hidden": true }, @@ -30,9 +27,6 @@ "n17_pt1r": { "hidden": true }, - "n70_dunj": { - "collapsed": true - }, "n15_pt1r": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 6f534d34..d941872e 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -4,17 +4,43 @@ "doc.openedDocs": [ "ui://m7iejg46kwi0hkr", "ui://m7iejg46cioeho9", - "ui://m7iejg46tkv17ii9", - "ui://m7iejg46tkv17iia" + "ui://m7iejg46qlfs7ime", + "ui://egnzysm7ffp36a", + "ui://ypulwxjhl9mn14", + "ui://4ismcalcndxj36", + "ui://442j0uepygxga", + "ui://niy3ldiwl9mn14" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46tkv17ii9", + "doc.activeDoc": "ui://egnzysm7ffp36a", "libview.twoColumn": false, "libview.expandedNodes": [ - "m7iejg46", - "/" + "egnzysm7", + "/", + "egnzysm7", + "/component/", + "egnzysm7", + "/component/clearing/", + "egnzysm7", + "/component/clearing/image/", + "4ismcalc", + "/", + "4ismcalc", + "/component/", + "4ismcalc", + "/component/clearing/", + "4ismcalc", + "/component/clearing/image/", + "442j0uep", + "/", + "442j0uep", + "/component/", + "442j0uep", + "/component/clearing/", + "442j0uep", + "/component/clearing/image/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/FullName.xml b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/FullName.xml index 5c010172..e86ec20d 100644 --- a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/FullName.xml +++ b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/FullName.xml @@ -1,9 +1,9 @@ - + - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/card_item.xml b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/card_item.xml index 94b44eb2..ec4f6be1 100644 --- a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/card_item.xml +++ b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/card_item.xml @@ -1,7 +1,7 @@ - - + + @@ -15,9 +15,9 @@ - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/clearing.xml index b28cc953..fb516a74 100644 --- a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/clearing.xml @@ -52,7 +52,19 @@ - + + + + + + + + + + + + + @@ -80,7 +92,7 @@ - + diff --git a/wb_new_ui/assets/Extend_Poker_FuLuShou/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FuLuShou/component/clearing/clearing.xml index bdcc27e5..03e3926c 100644 --- a/wb_new_ui/assets/Extend_Poker_FuLuShou/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_FuLuShou/component/clearing/clearing.xml @@ -1,12 +1,12 @@ - + - - - - + + + + @@ -46,7 +46,7 @@ - + @@ -78,13 +78,13 @@ - + - +