diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua index b8fd2761..3a9c8ecc 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua @@ -15,7 +15,7 @@ function GroupMngPartnerListView2.new(gid,tagId) setmetatable(M, {__index = BaseWindow}) local self = setmetatable({}, {__index = M}) self.class = "GroupMngPartnerListView2" - self._full = true + -- self._full = true self.group_id = gid self.tagId = tagId self.partner_data = {} diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua index af62fd13..5020d606 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua @@ -17,7 +17,7 @@ function GroupPartnerStatMember.new(group_id, uid, time_type, begin_time, end_ti self.begin_time = begin_time self.end_time = end_time self.check_member = false -- true的话是查询直属成员统计 - self._full = true + -- self._full = true self:init("ui://NewGroup/Win_PartnerStatMember") return self diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupStatMember.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupStatMember.lua index a648027a..e9ad92bb 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupStatMember.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupStatMember.lua @@ -10,7 +10,7 @@ function GroupStatMember.new(group_id, uid) self._close_destroy = true self.group_id = group_id self.uids = {} - self._full = true + -- self._full = true self:init("ui://NewGroup/Win_StatMember") return self diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/k5m97i77.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/k5m97i77.info new file mode 100644 index 00000000..e3bbd430 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/k5m97i77.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n42_ozaz": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/nwgkhx1.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/nwgkhx1.info index 9e26dfee..d2c361e8 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/nwgkhx1.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/nwgkhx1.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n44_f6br": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info index f0ac32ee..34cb8e56 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info @@ -1,6 +1,9 @@ { "objectStatus": { - "n79_nk4v": { + "n130_yre9": { + "hidden": true + }, + "n13_gls1": { "hidden": true }, "n78_nk4v": { @@ -9,10 +12,10 @@ "n73_cioe": { "hidden": true }, - "n13_gls1": { + "n79_nk4v": { "hidden": true }, - "n130_yre9": { + "n98_yetw": { "hidden": true } } diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 22ad81a3..11c2a161 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -8,30 +8,8 @@ ], "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46hsbhhjn", - "ui://m7iejg46gojuhh5", - "ui://m7iejg46t1hqhxw", - "ui://m7iejg46z3847i6m", - "ui://m7iejg46z3847i6q", - "ui://m7iejg46tqi8hwa", - "ui://27vd145bvg2c4", - "ui://m7iejg46kk3uhru", - "ui://m7iejg46taski05", - "ui://m7iejg46cvc87i5y", - "ui://27vd145bc6bub0", - "ui://m7iejg46csp47i42", - "ui://m7iejg46pfvz7i98", - "ui://m7iejg46pfvz7i99", - "ui://27vd145beeqmcgu", - "ui://27vd145bh1uu3i", - "ui://m7iejg46kwi0hlb", - "ui://m7iejg46mtk57i94", - "ui://m7iejg46oviii15", - "ui://m7iejg46oviii16", - "ui://m7iejg46dzx8hbb", - "ui://27vd145beeqmch0", - "ui://27vd145bcsp47i4w", - "ui://27vd145bcsp47i4x" + "ui://m7iejg46nwgkhx0", + "ui://m7iejg46nwgkhx1" ], "packageGroup.mine": [ "2d9xdj6z" @@ -39,7 +17,7 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46z3847i6m", + "doc.activeDoc": "ui://m7iejg46nwgkhx0", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -47,12 +25,6 @@ "27vd145b", "/buttons/", "27vd145b", - "/component/", - "27vd145b", - "/component/create_room/", - "27vd145b", - "/component/create_room/image/", - "27vd145b", "/font/", "27vd145b", "/font/images/", @@ -60,8 +32,6 @@ "/font/images/btn_keyboard/", "27vd145b", "/font/images/win/", - "27vd145b", - "/images/", "m7iejg46", "/", "m7iejg46", @@ -71,19 +41,23 @@ "m7iejg46", "/images/", "m7iejg46", + "/images/common/", + "m7iejg46", "/images/main/", "m7iejg46", + "/images/partner_rewards/", + "m7iejg46", "/mgr/", "m7iejg46", - "/mgr/component/", - "m7iejg46", - "/mgr/component/member/", - "m7iejg46", "/mgr/imgs/", "m7iejg46", "/mgr/imgs/fagpack/", "m7iejg46", - "/mgr/imgs/member/" + "/mgr/imgs/member/", + "m7iejg46", + "/mgr/imgs/partner/", + "m7iejg46", + "/tuoguan/" ], "auxline1": true, "snapToGrid": true, diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l1.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l1.xml index 1fbed09d..d9c7da14 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l1.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l1.xml @@ -1,11 +1,11 @@ - + - + diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l4.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l4.xml new file mode 100644 index 00000000..393cf6a5 --- /dev/null +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l4.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + +