diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua index b0972386..f6fcf7e2 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua +++ b/fk101/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 @@ -245,13 +245,13 @@ function M:OnRenderItem(index, obj) if data.reason ~= 15 or not data.detail then btn_check.selected = false obj:GetController("c1").selectedIndex = 0 - obj.height = 94 + obj.height = 146 end btn_check.onClick:Set(function() local lst = obj:GetChild("lst") lst:RemoveChildrenToPool() if not btn_check.selected then - obj.height = 94 + obj.height = 146 self.lst_fag:RefreshVirtualList() return end @@ -261,7 +261,7 @@ function M:OnRenderItem(index, obj) local item = lst:AddItemFromPool() fillItem(data.detail[i], item) end - obj.height =95 * (#data.detail+1) + obj.height =146 * (#data.detail+1) self.lst_fag:RefreshVirtualList() self.lst_fag:ScrollToView(index) else @@ -281,7 +281,7 @@ function M:OnRenderItem(index, obj) local item = lst:AddItemFromPool() fillItem(data.detail[i], item) end - obj.height =95 * (#data.detail+1) + obj.height =146 * (#data.detail+1) self.lst_fag:RefreshVirtualList() self.lst_fag:ScrollToView(index) end diff --git a/fk101/wb_new_ui/.objs/metas/27vd145b/cvc87i5n.info b/fk101/wb_new_ui/.objs/metas/27vd145b/cvc87i5n.info new file mode 100644 index 00000000..f6dfd012 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/27vd145b/cvc87i5n.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n77_omkm": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info new file mode 100644 index 00000000..a7a608f4 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n12_cpin": { + "hidden": true + }, + "n11_cpin": { + "hidden": true + }, + "n10_cpin": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/gltdhc9.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/gltdhc9.info index e76527a3..784698b7 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/gltdhc9.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/gltdhc9.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n45_task": { + "hidden": true + }, "n14_l0s4": { "hidden": true } diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/k5m97i76.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/k5m97i76.info index 6fb7becb..5cdaae34 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/k5m97i76.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/k5m97i76.info @@ -1,4 +1,9 @@ { - "fitScreen": "FitSize", - "adaptiveTest": true + "objectStatus": { + "n92_k5m9": { + "hidden": true + } + }, + "adaptiveTest": true, + "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info index fc84c762..1d9f8a41 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info @@ -18,9 +18,6 @@ "n116_l7wn": { "hidden": true }, - "n90_omkm": { - "hidden": true - }, "n118_l7wn": { "hidden": true }, diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index a8ad3538..22ad81a3 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -8,18 +8,30 @@ ], "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg4610snh5j", - "ui://m7iejg46jvvohyf", - "ui://m7iejg46ul317i9q", - "ui://m7iejg46ul317i9y", - "ui://m7iejg46ul317i9z", - "ui://m7iejg46jvvohyd", - "ui://m7iejg46p0pdhvp", - "ui://m7iejg46jiu8hef", - "ui://m7iejg46csp47i3z", - "ui://m7iejg46lnhahsf", - "ui://m7iejg46lnhahsh", - "ui://m7iejg46oviii0w" + "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" ], "packageGroup.mine": [ "2d9xdj6z" @@ -27,31 +39,51 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46ul317i9z", + "doc.activeDoc": "ui://m7iejg46z3847i6m", "libview.twoColumn": false, "libview.expandedNodes": [ + "27vd145b", + "/", + "27vd145b", + "/buttons/", + "27vd145b", + "/component/", + "27vd145b", + "/component/create_room/", + "27vd145b", + "/component/create_room/image/", + "27vd145b", + "/font/", + "27vd145b", + "/font/images/", + "27vd145b", + "/font/images/btn_keyboard/", + "27vd145b", + "/font/images/win/", + "27vd145b", + "/images/", "m7iejg46", "/", "m7iejg46", "/component/", "m7iejg46", - "/component/Lst_room/", - "m7iejg46", - "/component/mail/", - "m7iejg46", "/component/nav/", "m7iejg46", - "/component/notice/", - "m7iejg46", "/images/", "m7iejg46", - "/images/index/", + "/images/main/", "m7iejg46", - "/images/info/", + "/mgr/", "m7iejg46", - "/images/info/right_panel/", + "/mgr/component/", "m7iejg46", - "/images/room/" + "/mgr/component/member/", + "m7iejg46", + "/mgr/imgs/", + "m7iejg46", + "/mgr/imgs/fagpack/", + "m7iejg46", + "/mgr/imgs/member/" ], "auxline1": true, "snapToGrid": true, diff --git a/fk101/wb_new_ui/assets/Common/font/images/ann_queren.png b/fk101/wb_new_ui/assets/Common/font/images/ann_queren.png index 874a00c5..1710ea6b 100644 Binary files a/fk101/wb_new_ui/assets/Common/font/images/ann_queren.png and b/fk101/wb_new_ui/assets/Common/font/images/ann_queren.png differ diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/0000.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/0000.png index 227c6b5b..cca9a437 100644 Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/0000.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/0000.png differ diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/Win_FagInput2.xml b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/Win_FagInput2.xml index 57acbe7a..a8185b14 100644 --- a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/Win_FagInput2.xml +++ b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/Win_FagInput2.xml @@ -1,69 +1,69 @@ - + - - - - + + + + - +