From 05f8a5860cade340bda2510fcac2ef5736e40377 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 17:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MngView/GroupMemberFagLogView.lua | 20 +++-
wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info | 3 +
.../assets/NewGroup/images/jifen/btn_all.xml | 15 +++
.../NewGroup/images/jifen/btn_filter1.xml | 15 +++
.../NewGroup/images/jifen/btn_filter16.xml | 15 +++
.../NewGroup/images/jifen/btn_filter2.xml | 15 +++
.../NewGroup/images/jifen/btn_filter64.xml | 15 +++
.../assets/NewGroup/mgr/Win_MemberFagLog.xml | 93 ++++++++++++-------
.../component/member/partner/btn_choose.xml | 10 ++
wb_new_ui/assets/NewGroup/package.xml | 10 +-
10 files changed, 171 insertions(+), 40 deletions(-)
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/btn_all.xml
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/btn_filter1.xml
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/btn_filter16.xml
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/btn_filter2.xml
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/btn_filter64.xml
create mode 100644 wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_choose.xml
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 fb9c767c..67ee2cce 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua
@@ -12,13 +12,13 @@ function GroupMemberFagLogView.new(group_id, member, not_manager)
-- self._blur_view = blur_view
self.member = member
self.nick = nick
- self._full = true
+ -- self._full = true
self._animation = false
self.group_id = group_id
self.hp_log = {}
self.daily_count = {}
self.not_manager = not_manager
- self._full = true
+ -- self._full = true
self.m_index = 0
self:init("ui://NewGroup/Win_MemberFagLog")
return self
@@ -40,11 +40,27 @@ 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)
+
self.lst_fag = self._view:GetChild("lst_fag")
self.lst_fag:SetVirtual()
self.lst_fag.itemRenderer = function(index, obj)
diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info
index 5d53d48a..64925a0e 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info
@@ -18,6 +18,9 @@
"n39_gltd": {
"hidden": true
},
+ "n40_gltd": {
+ "hidden": true
+ },
"n74_s9vt": {
"hidden": true
},
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/btn_all.xml b/wb_new_ui/assets/NewGroup/images/jifen/btn_all.xml
new file mode 100644
index 00000000..638eeda5
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/images/jifen/btn_all.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/btn_filter1.xml b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter1.xml
new file mode 100644
index 00000000..4c3fcbe3
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter1.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 00000000..fcb69a91
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter16.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 00000000..f0d3d698
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter2.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 00000000..9720335b
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/images/jifen/btn_filter64.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 b442f664..baaac691 100644
--- a/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml
@@ -1,10 +1,17 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
@@ -17,39 +24,39 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -139,5 +146,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_choose.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_choose.xml
new file mode 100644
index 00000000..138907d1
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_choose.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index 35e82f54..ffe9a4ef 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -1115,10 +1115,12 @@
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file