From d4c13822c6d4c6dc28312302baf5bb4339205006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Sat, 14 Jun 2025 20:40:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=AF=E5=88=86=E8=AE=B0?=
=?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MngView/GroupMemberFagLogView.lua | 17 ++-----
.../NewGroup/images/jifen/btn_filter1.xml | 2 +-
.../NewGroup/images/jifen/btn_filter16.xml | 2 +-
.../NewGroup/images/jifen/btn_filter2.xml | 2 +-
.../NewGroup/images/jifen/btn_filter64.xml | 2 +-
.../assets/NewGroup/mgr/Win_MemberFagLog.xml | 45 ++++++++++---------
6 files changed, 31 insertions(+), 39 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 67ee2cce..1c36e2bf 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua
@@ -32,6 +32,8 @@ function M:init(url)
self:Destroy()
end)
+
+
for i = 1, 8 do
local tem = math.pow(2, i - 1)
local btn_filter = self._view:GetChild("btn_filter" .. tem)
@@ -40,24 +42,12 @@ function M:init(url)
self.hp_log = {}
self.m_index = 0
self.lst_fag.numItems = 0
- local filter = self:GetFilter()
- local btn_all = self._view:GetChild("btn_all")
- if btn_all then
- btn_all.selected = filter == 251
- end
self:GetData(0)
end)
end
end
self._view:GetChild('btn_all').onClick:Set(function()
- for i = 1, 8 do
- local tem = math.pow(2, i - 1)
- local btn_filter = self._view:GetChild("btn_filter" .. tem)
- if btn_filter then
- btn_filter.selected = true
- end
- end
self:GetData(0)
end)
@@ -106,6 +96,7 @@ end
-- 获取过滤值,根据多选框计算
function M:GetFilter()
local filter = 0
+ local btn_all = self._view:GetChild('btn_all')
for i = 1, 8 do
local tem = math.pow(2, i - 1)
--print("aaaaaaaaaaaaaaaaaaaaaaaa ",tem)
@@ -114,7 +105,7 @@ function M:GetFilter()
filter = filter + tem
end
end
- return filter
+ return btn_all.selected and 251 or filter
end
-- 显示原因文本
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/btn_filter1.xml b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter1.xml
index 4c3fcbe3..afe6105f 100644
--- a/wb_new_ui/assets/NewGroup/images/jifen/btn_filter1.xml
+++ b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter1.xml
@@ -11,5 +11,5 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/btn_filter16.xml b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter16.xml
index fcb69a91..53ee11e6 100644
--- a/wb_new_ui/assets/NewGroup/images/jifen/btn_filter16.xml
+++ b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter16.xml
@@ -11,5 +11,5 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/btn_filter2.xml b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter2.xml
index f0d3d698..69c165c9 100644
--- a/wb_new_ui/assets/NewGroup/images/jifen/btn_filter2.xml
+++ b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter2.xml
@@ -11,5 +11,5 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/btn_filter64.xml b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter64.xml
index 9720335b..79e8d3bb 100644
--- a/wb_new_ui/assets/NewGroup/images/jifen/btn_filter64.xml
+++ b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter64.xml
@@ -11,5 +11,5 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml b/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml
index baaac691..e7519bba 100644
--- a/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml
@@ -1,7 +1,8 @@
-
+
+
@@ -68,44 +69,44 @@