diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 84c6282e..a30b7277 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -1488,15 +1488,8 @@ function M:InitView(url) end) end - -- 2. 刷新当前详情页的数据 (可选，取决于“刷新当前牌友圈”的具体定义) - -- 如果只是刷新列表，上面的步骤就够了。 - -- 如果需要刷新当前圈子的房间/玩法信息，可以调用: + --刷新当前详情页的数据 : self:__loadGroupData() - -- 或者更轻量级的刷新: - -- self:_evtUpdatePlay() - - -- 这里假设主要是刷新列表展示，如需刷新详情可取消下面注释 - -- self:__loadGroupData() ViewUtil.ErrorTip(0, "刷新成功") else @@ -1508,7 +1501,7 @@ function M:InitView(url) -- local btn_cancel = self._view:GetChild('node_matching'):GetChild('btn_cancel') -- btn_cancel.onClick:Set( -- function() - -- local _gameCtrl = ControllerManager.GetController(GameController) + -- local _gameCtrl = ControllerManager.GetController(GameController)-- -- local _currentCtrl = ControllerManager.GetCurrenController() -- if _gameCtrl == _currentCtrl then -- _gameCtrl:LevelRoom( @@ -1636,27 +1629,6 @@ function M:SwitchToGroup(newGroup) end) end end - --- 嵌入GroupMainView到详情页中 -function M:_embedGroupMainView() - local root_view = self._root_view_for_embed - local groupMainView = self._groupMainView_to_embed - - -- 设置GroupMainView的父节点为详情页的根节点 - groupMainView:SetParent(root_view) - - -- 设置GroupMainView的锚点和位置 - groupMainView:SetAnchor(0, 0, 1, 1) - groupMainView:SetPos(0, 0) - groupMainView:SetSize(root_view:GetSize()) - - -- 设置GroupMainView的可见性 - groupMainView.visible = true - - -- 传递必要的数据或回调给GroupMainView - groupMainView:FillData() -end - function M:__saveLastData() if not self._get_data then self._get_data = true end local data = json.encode(self.curGroup.playList) diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua index 8b99001b..310927d3 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua @@ -131,23 +131,23 @@ function M:InitView(url) -- 读取牌友圈信息 local filename = 'fginfo_' .. DataManager.SelfUser.account_id local json_data = Utils.LoadLocalFile(filename) - local fg_info = not json_data and {} or json.decode(json_data) + --local fg_info = not json_data and {} or json.decode(json_data) - -- 创建GroupInfoView，传入根视图和列表页容器 - -- GroupMainView会被嵌入到GroupInfoView的lnfo_group组件中，显示所有圈子列表 - local info = GroupInfoView.new(curGroup, fg_info, self._root_view, self) - info:SetCallBack(function() - -- 关闭回调：恢复列表页到原位置 - if self and self._view and not self._view.isDisposed then - -- 将列表页移回原容器 - if self._originalParent then - self._originalParent:AddChild(self._view) - self._originalParent = nil - end - self._view.visible = false - end - end) - info:Show() + -- -- 创建GroupInfoView，传入根视图和列表页容器 + -- -- GroupMainView会被嵌入到GroupInfoView的lnfo_group组件中，显示所有圈子列表 + -- local info = GroupInfoView.new(curGroup, fg_info, self._root_view, self) + -- info:SetCallBack(function() + -- -- 关闭回调：恢复列表页到原位置 + -- if self and self._view and not self._view.isDisposed then + -- -- 将列表页移回原容器 + -- if self._originalParent then + -- self._originalParent:AddChild(self._view) + -- self._originalParent = nil + -- end + -- self._view.visible = false + -- end + -- end) + -- info:Show() end else ViewUtil.ErrorTip(10000000, '获取牌友圈失败，请检查网络设置！') diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua index 43eb97fd..a8bbd4eb 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua @@ -43,6 +43,12 @@ function M:FillView() local group = DataManager.groups:get(self.group_id) if group.lev < 3 then self._view:GetController("mng").selectedIndex = 1 + end + if self._view:GetChild("tex_gr_name") then + self._view:GetChild("tex_gr_name").text = group.o_nick + end + if self._view:GetChild("tex_gr_id") then + self._view:GetChild("tex_gr_id").text = "ID: " .. group.id end -- 初始化列表 self.lst_fag = self._view:GetChild("lst_fag") diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua index 3faa8cb6..ad1ad927 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua @@ -212,14 +212,16 @@ function M:OnRenderItem(index, obj) local local_data = (self.quary_id == 0 and self.query_nick == "" ) and self.fag_data or self.fag_result_data local rdata = local_data[index + 1] local num = d2ad(rdata.hp) - obj:GetChild("tex_mgr_name").text = ViewUtil.stringEllipsis(rdata.m_nick) - obj:GetChild("tex_mgr_id").text = rdata.mgr_id - obj:GetChild("tex_obj_name").text = ViewUtil.stringEllipsis(rdata.t_nick) - obj:GetChild("tex_id").text = rdata.uid - obj:GetChild("tex_num").text = num >= 0 and "+".. num or num - obj:GetController("add").selectedIndex = num >=0 and 1 or 0 - obj:GetChild("tex_left").text = d2ad(rdata.cur_hp) - obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) + printlog("+++++++++++++++++++++++++sssssssssss") + pt(rdata) + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(rdata.m_nick) + obj:GetChild("tex_id").text = rdata.mgr_id + -- obj:GetChild("tex_obj_name").text = ViewUtil.stringEllipsis(rdata.t_nick) + -- obj:GetChild("tex_id").text = rdata.uid + -- obj:GetChild("tex_num").text = num >= 0 and "+".. num or num + -- obj:GetController("add").selectedIndex = num >=0 and 1 or 0 + -- obj:GetChild("tex_left").text = d2ad(rdata.cur_hp) + -- obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) end return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua index a62238df..079be680 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua @@ -219,11 +219,11 @@ function M:GetMemberData(index) end -- 修改体力值 -local function __change_fag(gid, pid, is_add, cur_hp, callback) - printlog("修改体力值==》》》",pid) +local function __change_fag(gid, pid, is_add, cur_hp,member, callback) + local gniv = GroupNumberInputView.new( - nil, + member, function(num) num = ad2d((is_add and num or -num)) ViewUtil.ShowModalWait() @@ -232,7 +232,9 @@ local function __change_fag(gid, pid, is_add, cur_hp, callback) gid, pid, num, + function(res1) + ViewUtil.CloseModalWait() -- if gniv._is_destroy then -- return @@ -243,6 +245,7 @@ local function __change_fag(gid, pid, is_add, cur_hp, callback) ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败！') end end + ) -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str end, @@ -320,6 +323,7 @@ function M:FillItem(obj, member, refresh) member.uid, true, nil, + member, function(data) local hp = data.hp member.hp = hp @@ -349,6 +353,7 @@ function M:FillItem(obj, member, refresh) member.uid, false, member.hp, + member, function(data) local hp = data.hp member.hp = hp diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua index 741a94ae..eec49f78 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua @@ -62,7 +62,7 @@ function M:FillView() self._view = UIPackage.CreateObjectFromURL('ui://NewGroup/View_GroupMemberList1') local rtype = self._view:GetChild("n132") - rtype.visible = true + --rtype.visible = false rtype.onChanged:Set(function () if tostring(self.online) == rtype.value then @@ -294,6 +294,7 @@ function M:FillItem(obj, member, refresh) obj:GetChild('tex_name').text = ViewUtil.stringEllipsis(member.nick) obj:GetChild('btn_head').icon = 'ui://Common/Head0' ImageLoad.Load(member.portrait, obj:GetChild('btn_head')._iconObject, self.class) + -- obj.data = member.id -- 显示玩家标签，合伙人、管理员 local ctr_type = obj:GetController('type') diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua index 81024764..3f48911c 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua @@ -79,10 +79,10 @@ function M:OnRenderConsumeItem(index, obj) else obj:GetController("total").selectedIndex = 1 end - + obj:GetChild("tex_date").text = os.date("%Y/%m/%d") obj:GetChild("tex_round").text = data.round / 100 obj:GetChild("tex_finish").text = data.valid / 100 - obj:GetChild("tex_unfinish").text = data.no_valid / 100 + obj:GetChild("tex_unfinish").text = data.valid / 100-data.no_valid / 100 obj:GetChild("tex_diamond").text = data.diamo_cost / 100 end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRankView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRankView.lua index de4c1adb..62b67d47 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRankView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRankView.lua @@ -49,7 +49,12 @@ function M:FillView() if group.lev ~= 3 then self._view:GetController("mng").selectedIndex = 1 end - + if self._view:GetChild("tex_gr_name") then + self._view:GetChild("tex_gr_name").text = group.o_nick + end + if self._view:GetChild("tex_gr_id") then + self._view:GetChild("tex_gr_id").text = "ID: " .. group.id + end self.zongren = self._view:GetChild("zongren") self.rank_data = {} diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua index 54cb956c..851eafcb 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua @@ -19,16 +19,13 @@ function M:initData() self.lst_record.numItems = 0 self.record_data = {} - local now_time = os.date("*t",now) - local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0}) + local now_time = os.date("*t", now) + local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 }) self.begin_time = today self.end_time = today + 86400 self:GetRecordData(0) - end - - function M:InitView() self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupXingYunStat") @@ -36,33 +33,47 @@ function M:InitView() -- if group.lev ~= 3 then -- self._view:GetController("mng").selectedIndex = 1 -- end + if group then + printlog("group.lev-----------------", group.o_nick) -- 直接打印 lev 字段的值notice + pt(group) -- 使用 pt 打印整个表的详细结构 + end local lst_mgr_index = self._view:GetChild("lst_mgr_index") - + if self._view:GetChild("tex_gyxs_name") then + self._view:GetChild("tex_gyxs_name").text = group.o_nick + end + if self._view:GetChild("tex_gyxs_id") then + self._view:GetChild("tex_gyxs_id").text = "ID: " .. group.id + end + if self._view:GetChild("tex_gyxs_session") then + self._view:GetChild("tex_gyxs_session").text = "" + end self.lst_record = self._view:GetChild("lst_record") - self.lst_record:SetVirtual() + self.lst_record:SetVirtual() self.lst_record.itemRenderer = function(index, obj) self:OnRenderRecordItem(index, obj) end self.lst_record.scrollPane.onPullUpRelease:Set(function() self:GetRecordData(self.lst_record.numItems) end) - - self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, nil, true) + + + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0, nil, true) local ctr_page = self._view:GetController("type") ctr_page.onChanged:Set(function() self.record_data = {} self.lst_record.numItems = 0 if ctr_page.selectedIndex == 0 then - local now_time = os.date("*t",now) - local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0}) + local now_time = os.date("*t", now) + local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 }) self.begin_time = today self.end_time = today + 86400 else - local now_time = os.date("*t",now) - local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0}) + local now_time = os.date("*t", now) + local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 }) self.begin_time = today - 86400 * ctr_page.selectedIndex self.end_time = today - 86400 * (ctr_page.selectedIndex - 1) end @@ -78,28 +89,23 @@ function M:InitView() end) self.totalwin = self._view:GetChild("tex_alltotal") - end - function M:GetRecordData(index) - ViewUtil.ShowModalWait() local time_type = self._view:GetController("type").selectedIndex if self.begin_time ~= nil and self.end_time ~= nil then time_type = 0 end - - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetXingYunStat(self.group_id, index, 6, time_type,self.begin_time,self.end_time,function(res) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetXingYunStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res) ViewUtil.CloseModalWait() if res.ReturnCode == 0 then - local members = res.Data.members - + self.totalwin.text = d2ad(res.Data.all_total_win) for i = 1, #members do self.record_data[#self.record_data + 1] = members[i] @@ -109,23 +115,19 @@ function M:GetRecordData(index) end) end - function M:FillRecordItem(data, obj) - - local group = DataManager.groups:get(self.group_id) + local group = DataManager.groups:get(self.group_id) - obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) - obj:GetChild("tex_id").text = "ID:" .. data.uid - obj:GetChild("tex_round_total").text = data.total_round - obj:GetChild("tex_total").text = d2ad(data.total_win) + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) + obj:GetChild("tex_id").text = "ID:" .. data.uid + obj:GetChild("tex_round_total").text = data.total_round + obj:GetChild("tex_total").text = d2ad(data.total_win) obj:GetChild("tex_round_youxiao").text = data.valid_round / 100 - end function M:OnRenderRecordItem(index, obj) local data = self.record_data[index + 1] - self:FillRecordItem(data, obj) + self:FillRecordItem(data, obj) end - -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupNumberInputView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupNumberInputView.lua index 9503fe61..865289f2 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupNumberInputView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupNumberInputView.lua @@ -44,6 +44,22 @@ function M:init(url) self:ClearNumTex() local cnt = self._view.numChildren - 1 + + if self._view:GetChild("tex_name") then + self._view:GetChild("tex_name").text = self._blur_view.nick + end + if self._view:GetChild("tex_id") then + self._view:GetChild("tex_id").text = self._blur_view.uid + end + if self._view:GetChild("btn_head") then + self._view:GetChild('btn_head').icon = 'ui://Common/Head0' + ImageLoad.Load(self._blur_view.portrait, self._view:GetChild('btn_head')._iconObject, self.class) + end + if self._view:GetChild("tex_Current matchScore") then + self._view:GetChild("tex_Current matchScore").text = d2ad(self._blur_view.hp) + end + + for i = 0, 10 do local obj = self._view:GetChild("btn_" .. i) if obj then diff --git a/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info b/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info index 212f8d9a..14847104 100644 --- a/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info +++ b/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info @@ -33,10 +33,7 @@ "n231_ttbr": { "collapsed": true }, - "n89_se1s": { - "collapsed": true - }, - "n129_t038": { + "n155_c4r1": { "collapsed": true }, "n52_v38k": { @@ -45,9 +42,6 @@ "n160_c4r1": { "collapsed": true }, - "n155_c4r1": { - "collapsed": true - }, "n217_rjio": { "collapsed": true } diff --git a/wb_new_ui/.objs/metas/96mvx2ml/10kys6.info b/wb_new_ui/.objs/metas/96mvx2ml/10kys6.info index 1629cbbb..f816c2a2 100644 --- a/wb_new_ui/.objs/metas/96mvx2ml/10kys6.info +++ b/wb_new_ui/.objs/metas/96mvx2ml/10kys6.info @@ -1,6 +1,11 @@ { "objectStatus": { - "n146_udgc": { + "n166_ozsy": { + "hidden": true, + "collapsed": true + }, + "n149_udgc": { + "hidden": true, "collapsed": true }, "n153_udgc": { @@ -8,20 +13,6 @@ }, "n152_udgc": { "hidden": true - }, - "n149_udgc": { - "hidden": true, - "collapsed": true - }, - "n143_udgc": { - "collapsed": true - }, - "n140_udgc": { - "collapsed": true - }, - "n166_ozsy": { - "hidden": true, - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info index 36378fe3..ccff922a 100644 --- a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info +++ b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info @@ -1,11 +1,5 @@ { "objectStatus": { - "n163_ozsy": { - "collapsed": true - }, - "n157_ug6y": { - "collapsed": true - }, "n74_nip5": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/egnzysm7/ffp38j.info b/wb_new_ui/.objs/metas/egnzysm7/ffp38j.info index 33321412..22178475 100644 --- a/wb_new_ui/.objs/metas/egnzysm7/ffp38j.info +++ b/wb_new_ui/.objs/metas/egnzysm7/ffp38j.info @@ -1,11 +1,3 @@ { - "objectStatus": { - "n322_gz8w": { - "collapsed": true - }, - "n317_ffp3": { - "collapsed": true - } - }, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 5077008b..aab9963d 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -9,6 +9,9 @@ "n191_xsk4": { "hidden": true }, + "n246_m0lm": { + "locked": true + }, "n78_i7lq": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/dzx8hbf.info b/wb_new_ui/.objs/metas/m7iejg46/dzx8hbf.info index 0535d10e..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/dzx8hbf.info +++ b/wb_new_ui/.objs/metas/m7iejg46/dzx8hbf.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n4_dzx8": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ex3l7igb.info b/wb_new_ui/.objs/metas/m7iejg46/ex3l7igb.info index 9296e7d5..b5a1a7b1 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ex3l7igb.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ex3l7igb.info @@ -1,23 +1,10 @@ { "objectStatus": { - "n13_kwi0": { + "n22_ex3l": { "hidden": true }, "n8_gls1": { "hidden": true - }, - "n14_kwi0": { - "hidden": true - }, - "n12_kwi0": { - "hidden": true - }, - "n7_gls1": { - "hidden": true - }, - "n22_ex3l": { - "hidden": true, - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info index 249a6095..ee3a6e2b 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info +++ b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info @@ -3,9 +3,6 @@ "n54_j120": { "hidden": true }, - "n69_ex3l": { - "collapsed": true - }, "n42_f6br": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info b/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info index 226fdba8..e4f5d468 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info +++ b/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info @@ -3,9 +3,6 @@ "n155_sbng": { "collapsed": true }, - "n83_kwi0": { - "collapsed": true - }, "n187_g6sw": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info index e5131ba1..9f245a9a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info @@ -3,7 +3,7 @@ "n160_10xl7": { "hidden": true }, - "n162_10xl7": { + "n163_10xl7": { "collapsed": true } }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info index dd0a7da9..bbd07466 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info @@ -3,6 +3,9 @@ "n22_cioe": { "hidden": true }, + "n136_s8rw": { + "hidden": true + }, "n21_cioe": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i80.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i80.info index 09eb47af..7f348255 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i80.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i80.info @@ -1,13 +1,7 @@ { "objectStatus": { - "n120_l7wn": { - "collapsed": true - }, - "n128_tkv1": { - "collapsed": true - }, - "n132_tkv1": { - "collapsed": true + "n122_tkv1": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info index 8ccf73d6..ba1af5e4 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info @@ -3,8 +3,8 @@ "n151_tkv1": { "collapsed": true }, - "n140_tkv1": { - "collapsed": true + "n139_tkv1": { + "hidden": true }, "n144_tkv1": { "collapsed": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info index 1d9f8a41..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info @@ -1,34 +1 @@ -{ - "objectStatus": { - "n112_l7wn": { - "hidden": true - }, - "n115_l7wn": { - "hidden": true - }, - "n117_l7wn": { - "hidden": true - }, - "n114_l7wn": { - "hidden": true - }, - "n113_l7wn": { - "hidden": true - }, - "n116_l7wn": { - "hidden": true - }, - "n118_l7wn": { - "hidden": true - }, - "n111_l7wn": { - "hidden": true - }, - "n122_jawz": { - "hidden": true - }, - "n119_l7wn": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info b/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info index 9a781832..749d901b 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info +++ b/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info @@ -1,27 +1,15 @@ { "objectStatus": { - "n199_t7dq": { - "hidden": true - }, - "n183_s2gd": { - "locked": true + "n131_kwi0": { + "hidden": true, + "collapsed": true }, "n198_r0qx": { "hidden": true, "collapsed": true }, - "n147_r4s4": { - "collapsed": true - }, - "n131_kwi0": { - "hidden": true, - "collapsed": true - }, - "n153_g21o": { - "collapsed": true - }, - "n146_r4s4": { - "collapsed": true + "n162_g21o": { + "hidden": true } }, "fitScreen": "FitSize" diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info index 89a3a89d..82d643f6 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info @@ -2,6 +2,9 @@ "objectStatus": { "n131_jawz": { "hidden": true + }, + "n136_s8rw": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info index 43b0ae9c..c677e7c4 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info @@ -11,6 +11,9 @@ }, "n65_kwi0": { "hidden": true + }, + "n140_ex3l": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info index 3864e298..43692621 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info @@ -6,6 +6,9 @@ "n122_b8zx": { "hidden": true }, + "n132_z384": { + "hidden": true + }, "n127_b8zx": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info b/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info index 08b42843..fdea9a2d 100644 --- a/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info +++ b/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info @@ -1,5 +1,17 @@ { "objectStatus": { + "n103_t038": { + "collapsed": true + }, + "n167_ozsy": { + "collapsed": true + }, + "n172_liak": { + "collapsed": true + }, + "n106_t038": { + "collapsed": true + }, "n82_e8zl": { "hidden": true } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 5e603905..f2790253 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -3,16 +3,21 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://m7iejg4610snh5j", - "ui://m7iejg46kwi0hkb", - "ui://2d9xdj6z75efcz", - "ui://1hl55dqmc4r115", - "ui://27vd145bh1uu3i", - "ui://27vd145br0qx7i5y" + "ui://m7iejg46l7wn7i82", + "ui://m7iejg46l7wn7i81", + "ui://m7iejg46l7wn7i80", + "ui://m7iejg46kwi0hkr", + "ui://m7iejg46tkv17ii5", + "ui://m7iejg46z3847i6m", + "ui://m7iejg46tkv17iig", + "ui://m7iejg46tkv17iii", + "ui://2d9xdj6zfn7fao", + "ui://2d9xdj6zlumrgj" ], "test.device": "Huawei Mate20", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46kwi0hkb", + "doc.activeDoc": "ui://m7iejg46tkv17iii", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -26,29 +31,57 @@ "27vd145b", "/component/head/", "27vd145b", + "/font/", + "27vd145b", + "/font/images/", + "27vd145b", + "/font/images/win/", + "27vd145b", "/images/", "27vd145b", "/images/ComxiantangMui/", + "egnzysm7", + "/", + "egnzysm7", + "/component/", + "egnzysm7", + "/component/EPCDWHZMui/", + "442j0uep", + "/", + "442j0uep", + "/component/", + "442j0uep", + "/component/EPRHZMui/", "1hl55dqm", "/", + "d1qrzqpr", + "/", + "qubt49z8", + "/", + "4wmd3o8g", + "/", + "96mvx2ml", + "/", + "boq0ohep", + "/", + "2d9xdj6z", + "/", + "2d9xdj6z", + "/component/", + "2d9xdj6z", + "/component/group/", "m7iejg46", "/", "m7iejg46", + "/component/", + "m7iejg46", + "/component/Btn/", + "m7iejg46", "/images/", "m7iejg46", "/images/NGXiangTangMui/", "m7iejg46", "/mgr/", - "m7iejg46", - "/mgr/component/", - "m7iejg46", - "/mgr/component/member/", - "m7iejg46", - "/mgr/component/record/", - "m7iejg46", - "/mgr/imgs/", - "m7iejg46", - "/mgr/imgs/member/", "x3mp2cn6", "/" ], diff --git a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml index 2f281d45..4c4758d4 100644 --- a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml +++ b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml @@ -1,12 +1,12 @@ - + - +