diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
index 49ef7a03..1e06359b 100644
--- a/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
+++ b/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
@@ -1137,12 +1137,28 @@ function M:InitView(url)
local btn_choose = self._view:GetChild('btn_choose')
btn_choose.onClick:Set(
function ()
- self.lstgameVisible = not self.lstgameVisible
- if (self.lstgameVisible) then
- self.lst_game:TweenMove(Vector2.New(3,194), 0.3)
- else
- self.lst_game:TweenMove(Vector2.New(3,1170), 0.3)
- end
+ -- self.lstgameVisible = not self.lstgameVisible
+ -- if (self.lstgameVisible) then
+ -- self.lst_game:TweenMove(Vector2.New(3,146), 0.3)
+ -- else
+ -- self.lst_game:TweenMove(Vector2.New(3,1232), 0.3)
+ -- end
+
+ self.lstgameVisible = not self.lstgameVisible
+
+ -- 获取 btn_choose 的当前 Y 坐标
+ local targetY = btn_choose.y
+
+ local lst_game_height = self.lst_game.height
+ local offset = 5 -- 间距
+
+ if (self.lstgameVisible) then
+ -- 显示：移动到 btn_choose 上方
+ self.lst_game:TweenMove(Vector2.New(btn_choose.x, targetY - lst_game_height - offset), 0.3)
+ else
+ -- 隐藏：移出屏幕可视区域
+ self.lst_game:TweenMove(Vector2.New(btn_choose.x, targetY + lst_game_height + 100), 0.3)
+ end
end
-- function()
diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua
index cf19e2cb..f7f95cce 100644
--- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua
+++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua
@@ -247,13 +247,16 @@ function M:FillRecordItem(data, obj)
gniv:Show()
end)
- local btn_detail1 = obj:GetChild("btn_detail_zhengzudiaodu")
- btn_detail1.onClick:Set(function()
- -- local time_type = self._view:GetController("type").selectedIndex
- -- --printlog("ccccccccccwwwwwwwwwwwwwwwwwwwwwwwwwwww ",self.begin_time," ",self.end_time)
- -- local gniv = GroupPartnerStatMember.new(self.group_id,data.uid, 0,self.begin_time,self.end_time)
- -- gniv:Show()
+ if group.lev == 1 then
+ obj:GetController('diaodu_ismengzhu').selectedIndex = 1
+ else
+ obj:GetController('diaodu_ismengzhu').selectedIndex = 0
+ end
+ local btn_detail1 = obj:GetChild("btn_detail_zhengzudiaodu")
+ -- 【新增】判断按钮是否存在
+ if btn_detail1 then
+ btn_detail1.onClick:Set(function()
ViewUtil.ShowModalWait()
ControllerManager.GetController(NewGroupController):FG_GetBanMemberHB(self.group_id, data.uid, function(res)
ViewUtil.CloseModalWait()
@@ -266,9 +269,8 @@ function M:FillRecordItem(data, obj)
end
end)
-
end)
-
+end
local btnMen = obj:GetChild("btnMen")
-- btnMen.text = d2ad(data.autoscore)
local menControl = obj:GetController("menkan")
diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
index 8815ebb7..6f7f5555 100644
--- a/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
+++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
@@ -3,6 +3,9 @@
"n154_cioe": {
"hidden": true
},
+ "n238_dg1v": {
+ "hidden": true
+ },
"n235_o6b1": {
"hidden": true
},
@@ -15,10 +18,6 @@
"n175_mn85": {
"hidden": true
},
- "n74_i7lq": {
- "locked": true,
- "hidden": true
- },
"n200_isix": {
"hidden": true
},
diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json
index c2a1072f..1bf0f3ca 100644
--- a/fk101/wb_new_ui/.objs/workspace.json
+++ b/fk101/wb_new_ui/.objs/workspace.json
@@ -1,169 +1,26 @@
{
- "libview.firstColumnWidth": 356,
+ "libview.firstColumnWidth": 384,
"libview.iconScale": 0,
"doc.openedDocs": [
- "ui://m7iejg46jgh8hwv",
- "ui://1hl55dqmc4r115",
- "ui://yzaioi79f55qwa",
- "ui://yzaioi79f55qvx",
- "ui://m7iejg46l679hws",
- "ui://27vd145beeqmch0",
- "ui://m7iejg46kwi0hmc",
- "ui://yzaioi79f55qw5",
- "ui://4skil1l6piv91mk",
- "ui://4skil1l6uwvl1qp",
- "ui://4skil1l6piv91o7",
- "ui://4skil1l6piv91o5",
- "ui://4skil1l6piv91ny",
- "ui://x3mp2cn6xvhr3r",
- "ui://niy3ldiwl9mn14",
- "ui://yzaioi79ku2gi4r",
- "ui://niy3ldiwl9mny",
- "ui://niy3ldiwl9mn19",
- "ui://niy3ldiwl9mn10",
- "ui://5cdldr01qaqf2c",
- "ui://5cdldr01qaqf2i",
- "ui://5cdldr01qaqf2h",
- "ui://5cdldr01qaqf2l",
- "ui://5cdldr01qaqf2n",
- "ui://5cdldr01qaqf2q",
- "ui://442j0uepygxga",
- "ui://3n2top74kpmgkd",
- "ui://awernf6xbazq7n",
- "ui://qpsoxvaiprgzee",
- "ui://b8jloj2qg8ktcmb",
- "ui://3op8sm5eu86s1f",
- "ui://y8prev1ms9wx7",
- "ui://c7j2rnvqtpf02f",
- "ui://b50sd5s6s9wx7",
- "ui://xul2z8cts9wx7",
- "ui://visk5g30gq7m2c",
- "ui://s63l0suw6cpqv",
- "ui://425x67nrs9wx7",
- "ui://kplym8mus9wx7",
- "ui://fnuxqeflnrnod",
- "ui://egnzysm7ffp36a",
- "ui://v2hilfzbgq7mde",
- "ui://ypulwxjhl9mn14",
- "ui://k15boclkl9mn14",
- "ui://oubpz2r2ofil7k",
- "ui://4skil1l6piv91mg",
- "ui://27vd145bdjzo18",
- "ui://yzaioi79f55qvw",
- "ui://c7j2rnvqtpf08x",
- "ui://fnuxqeflkllg1x",
- "ui://5cdldr01qaqf9c",
- "ui://5cdldr01qaqf61",
- "ui://5cdldr01qaqf7o",
- "ui://5cdldr01qaqf60",
- "ui://5cdldr01qaqfb",
- "ui://5cdldr01qaqf3f",
- "ui://5cdldr01qaqfa2",
- "ui://442j0uepdafga8",
- "ui://ypulwxjhl9mn37",
- "ui://k15boclkl9mn37",
- "ui://4skil1l6r6qo1kc",
- "ui://5cdldr01qaqfa4",
- "ui://5cdldr01qaqfaw",
- "ui://3z9lj55vjokmft",
- "ui://2zlli80mw9te0",
- "ui://2zlli80mr6cyce9",
- "ui://2d9xdj6zfn7fao",
- "ui://2d9xdj6zlumrgj",
- "ui://27vd145bofsx1e",
- "ui://m7iejg46mpllhuq",
- "ui://m7iejg46mpllhut",
"ui://m7iejg4610snh5j",
- "ui://m7iejg46jvvohyf",
- "ui://3z9lj55vjokmwr",
- "ui://3z9lj55vjokmlu",
- "ui://3z9lj55vjokmlt",
- "ui://3z9lj55vjokmay",
- "ui://3z9lj55vjokmb2",
- "ui://3z9lj55vjokmbc",
- "ui://3z9lj55vjokm6c",
- "ui://3z9lj55vjokm7l",
- "ui://4skil1l6ms5spy",
- "ui://2d9xdj6znlwcgk",
- "ui://2d9xdj6zlwcl5m",
- "ui://27vd145beeqmcgp",
- "ui://0khx14are0py2",
- "ui://3z9lj55vjokmet",
- "ui://3z9lj55vjokmey",
- "ui://3z9lj55vjokmfu",
- "ui://3z9lj55vjokmdt",
- "ui://3z9lj55vjokmdr",
- "ui://3z9lj55vjokme2",
- "ui://5cdldr01qaqf6x",
- "ui://5cdldr01qaqf7q",
- "ui://yzaioi79f55qw4",
- "ui://yzaioi79f55qw7",
- "ui://yzaioi79fgao1dk",
- "ui://27vd145bh1uu3f",
- "ui://1hl55dqmp6vl1d",
- "ui://d1qrzqprc4r116",
- "ui://qubt49z8c4r116",
- "ui://m7iejg46f6brhww",
- "ui://m7iejg46j1207i2r"
+ "ui://m7iejg46jgh8hwv",
+ "ui://m7iejg46kwi0hk0",
+ "ui://m7iejg46qlxihsl",
+ "ui://m7iejg46qlxihsm",
+ "ui://m7iejg46kwi0hld",
+ "ui://m7iejg46kwi0hmb",
+ "ui://m7iejg46f6brhww"
],
"test.device": "Xiaomi 9",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://5cdldr01qaqf2q",
+ "doc.activeDoc": "ui://m7iejg46f6brhww",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "442j0uep",
- "/",
- "442j0uep",
- "/component/",
- "442j0uep",
- "/component/EPRHZMui/",
- "niy3ldiw",
- "/",
- "niy3ldiw",
- "/component/",
- "niy3ldiw",
- "/component/EPYYWHZMui/",
- "niy3ldiw",
- "/component/clearing/",
- "3z9lj55v",
- "/",
- "3z9lj55v",
- "/component/",
- "3z9lj55v",
- "/component/card/",
- "5cdldr01",
- "/",
- "5cdldr01",
- "/buttons/",
- "5cdldr01",
- "/component/",
- "5cdldr01",
- "/component/Main/",
- "5cdldr01",
- "/component/clearing/",
- "5cdldr01",
- "/component/clearing/image/",
- "yzaioi79",
- "/",
- "yzaioi79",
- "/component/",
- "yzaioi79",
- "/component/Main/",
- "yzaioi79",
- "/component/Main/component/",
"m7iejg46",
"/",
"m7iejg46",
- "/component/",
- "m7iejg46",
- "/component/Lst_room/",
- "m7iejg46",
- "/component/mail/",
- "m7iejg46",
- "/mgr/",
- "m7iejg46",
- "/mgr/Mui/"
+ "/mgr/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/fk101/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/fk101/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
index 8570305e..49436940 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
@@ -1,6 +1,6 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -122,8 +122,8 @@
-
-
+
+
+