From 49cf96d44faa9d49323a0323813cc4c9f532c4af Mon Sep 17 00:00:00 2001 From: fy <> Date: Wed, 22 Apr 2026 14:59:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8D=E9=A6=88=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=8F=E7=A6=84=E5=AF=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MngView/GroupMemberOperateView.lua | 90 +++---- .../MngView/GroupMngPartnerStatView.lua | 24 ++ .../zipai/changdepaohuzi/main/ZPMainView.lua | 1 + .../extend/zipai/fulushou/main/ZPMainView.lua | 2 +- .../extend/zipai/runbeard/main/ZPMainView.lua | 2 +- .../zipai/yueyangwaihuzi/main/ZPMainView.lua | 2 +- .../yueyangwaihuzi_bak/main/ZPMainView.lua | 2 +- .../main_project/main/zipai/ZPMainView.lua | 1 + .../.objs/metas/27vd145b/e2q77i64.info | 12 +- .../.objs/metas/27vd145b/hei77i2g.info | 3 + .../.objs/metas/3n2top74/kpmgp4.info | 3 + .../.objs/metas/3z9lj55v/jokmet.info | 3 +- .../.objs/metas/3z9lj55v/jokmft.info | 13 +- .../.objs/metas/egnzysm7/ffp36a.info | 3 + .../.objs/metas/m7iejg46/f6brhww.info | 9 +- .../.objs/metas/yzaioi79/f55qvx.info | 8 +- .../.objs/metas/yzaioi79/f55qw7.info | 25 +- .../.objs/metas/yzaioi79/f55qwa.info | 30 ++- fk101/wb_new_ui/.objs/workspace.json | 237 +++++++++++------- fk101/wb_new_ui/assets/Chat/Btn_chat.xml | 8 +- fk101/wb_new_ui/assets/Chat/Gcm_chat.xml | 10 +- .../assets/Common/Gcm_Window_Full.xml | 2 +- .../hand/ZiPaiHand/panel_handzipai02.xml | 124 ++++----- .../component/tuoguan/com_tuoguan_self.xml | 4 +- .../component/chi/Pop_tip_choice.xml | 14 +- .../component/clearing/clearing.xml | 20 +- .../component/clearing/result_zipai_main.xml | 2 +- .../component/Main/Main_2.xml | 12 +- .../chi/component/choose/Comp_choose.xml | 10 +- .../RunFast_Main_New_2.xml | 12 +- .../Extend_Poker_RunFastNew/clearing_new.xml | 30 +-- .../setting/SettingWindow1.xml | 6 +- .../Main/component/Player_card_info_1.xml | 12 +- .../component/chi/Pop_tip_choice.xml | 24 +- .../component/clearing/clearing.xml | 20 +- fk101/wb_new_ui/assets/Hotupdate/Version.xml | 6 +- .../component/clearing/clearing.xml | 39 ++- .../clearing/clearing2/result_main.xml | 5 +- .../Main_RunBeard/component/Main/Main_2.xml | 42 ++-- .../Main/component/Folder/RightPanel.xml | 4 +- .../component/Main/component/HeadNameBG.xml | 10 +- .../component/Main/component/PlayerHead_1.xml | 18 +- .../component/Main/component/PlayerHead_2.xml | 20 +- .../Main/component/Player_card_info_1.xml | 4 +- .../Main_RunBeard/component/cards/Qipai.xml | 2 +- .../component/clearing/result_zipai_main.xml | 6 +- .../component/option/Gcm_action_tips.xml | 2 +- .../component/option/Pop_tip_choice.xml | 16 +- .../option/component/choose/Comp_choose.xml | 6 +- .../component/Main/Head4.xml | 8 +- .../component/Main/Main_2.xml | 85 ++++--- .../component/Main/Qipai.xml | 4 +- .../Main/component/Folder/RightPanel.xml | 32 +-- .../component/phone_info/Btn_back_lobby.xml | 6 +- .../component/phone_info/Btn_jiesan_lobby.xml | 6 +- .../Folder/component/phone_info/Btn_log.xml | 6 +- .../Folder/component/phone_info/Btn_reset.xml | 8 +- .../component/phone_info/Btn_setting.xml | 6 +- .../component/phone_info/ProgressBar2.xml | 6 +- .../component/Main/component/HeadNameBG.xml | 10 +- .../component/Main/component/PlayerHead_1.xml | 78 +++--- .../component/Main/component/PlayerHead_2.xml | 94 +++---- .../Main/component/Player_card_info_1.xml | 45 ++-- .../Main/component/Player_card_info_2.xml | 38 ++- .../component/Main/Qipai.xml | 2 +- .../component/Main/component/HeadNameBG.xml | 8 +- .../option/component/choose/Comp_choose.xml | 4 +- .../assets/NewGroup/Main_GroupInfo.xml | 20 +- .../NewGroup/mgr/Mui/zhengtidiaoduM.png | Bin 0 -> 8915 bytes .../mgr/component/member/partner/Button14.xml | 19 ++ .../member/partner/item_partner_stat.xml | 41 +-- fk101/wb_new_ui/assets/NewGroup/package.xml | 2 + .../Assets/ART/base/chat/ui/Chat_atlas0.png | Bin 588315 -> 583357 bytes .../Assets/ART/base/chat/ui/Chat_fui.bytes | Bin 31821 -> 31815 bytes .../ART/base/common/ui/Common_fui.bytes | Bin 225139 -> 225611 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 252282 -> 252247 bytes .../main_zipai/ui/Main_RunBeard_fui.bytes | Bin 183624 -> 183648 bytes .../ui/Main_RunBeardMaJiang_fui.bytes | Bin 156462 -> 156748 bytes .../ART/base/newgroup/ui/NewGroup_atlas0.png | Bin 1074602 -> 1062765 bytes .../base/newgroup/ui/NewGroup_atlas0_1.png | Bin 2497697 -> 2497307 bytes .../ART/base/newgroup/ui/NewGroup_fui.bytes | Bin 270515 -> 271182 bytes .../ui/Extend_Poker_RunFastNew_fui.bytes | Bin 246076 -> 246076 bytes .../ui/Extend_Poker_ChangdeWHZ_fui.bytes | Bin 120269 -> 120269 bytes .../ui/Extend_Poker_FuLuShou_fui.bytes | Bin 81961 -> 81961 bytes .../ui/Extend_Poker_HSRunBeard_fui.bytes | Bin 86044 -> 86044 bytes .../ui/Extend_Poker_YueYangWHZ_fui.bytes | Bin 78748 -> 78762 bytes .../base/embed/ui/Hotupdate_fui.bytes | Bin 3519 -> 3519 bytes 87 files changed, 843 insertions(+), 645 deletions(-) create mode 100644 fk101/wb_new_ui/assets/NewGroup/mgr/Mui/zhengtidiaoduM.png create mode 100644 fk101/wb_new_ui/assets/NewGroup/mgr/component/member/partner/Button14.xml diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua index 9d9841c2..7736aacb 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua @@ -204,31 +204,31 @@ function M:init(url) local pic = member.ban == 1 and "mng_del_ban" or "mng_ban" btn_ban.icon = "ui://NewGroup/" .. pic btn_ban.onClick:Set(function() - if not CheckPermission(group.lev, perm_array[MngPermissionList.BanPlaying]) then - return - end + -- if not CheckPermission(group.lev, perm_array[MngPermissionList.BanPlaying]) then + -- return + -- end - local str = member.ban == 1 and "确定恢复娱乐吗？" or "确定禁止娱乐吗？" - local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) - _curren_msg.onOk:Add(function() - ViewUtil.ShowModalWait() - local val = 1 - member.ban - fgCtr:FG_BanMember(self.group_id, member.uid, val, 1, function(res1) - if self._is_destroy then - return - end - ViewUtil.CloseModalWait() - if res1.ReturnCode == 0 then - member.ban = val - pic = member.ban == 1 and "mng_del_ban" or "mng_ban" - btn_ban.icon = "ui://NewGroup/" .. pic - self.callBack() - else - ViewUtil.ErrorTip(res1.ReturnCode,"禁止娱乐失败！") - end - end) - end) - _curren_msg:Show() + -- local str = member.ban == 1 and "确定恢复娱乐吗？" or "确定禁止娱乐吗？" + -- local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) + -- _curren_msg.onOk:Add(function() + -- ViewUtil.ShowModalWait() + -- local val = 1 - member.ban + -- fgCtr:FG_BanMember(self.group_id, member.uid, val, 1, function(res1) + -- if self._is_destroy then + -- return + -- end + -- ViewUtil.CloseModalWait() + -- if res1.ReturnCode == 0 then + -- member.ban = val + -- pic = member.ban == 1 and "mng_del_ban" or "mng_ban" + -- btn_ban.icon = "ui://NewGroup/" .. pic + -- self.callBack() + -- else + -- ViewUtil.ErrorTip(res1.ReturnCode,"禁止娱乐失败！") + -- end + -- end) + -- end) + -- _curren_msg:Show() end) end @@ -247,27 +247,27 @@ function M:init(url) -- end - local str = member.group_ban == 1 and "确定恢复该合伙人整组娱乐吗？" or "确定禁止该合伙人整组娱乐吗？" - local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) - _curren_msg.onOk:Add(function() - ViewUtil.ShowModalWait() - local val = member.group_ban == 1 and 0 or 1 - fgCtr:FG_BanMember(self.group_id, member.uid, val, 2, function(res1) - if self._is_destroy then - return - end - ViewUtil.CloseModalWait() - if res1.ReturnCode == 0 then - member.group_ban = val - pic = member.group_ban == 1 and "mng_del_ban_group" or "mng_ban_group" - btn_ban.icon = "ui://NewGroup/" .. pic - self.callBack() - else - ViewUtil.ErrorTip(res1.ReturnCode,val == 1 and "禁止整组娱乐失败！" or "恢复整组娱乐失败！") - end - end) - end) - _curren_msg:Show() + -- local str = member.group_ban == 1 and "确定恢复该合伙人整组娱乐吗？" or "确定禁止该合伙人整组娱乐吗？" + -- local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) + -- _curren_msg.onOk:Add(function() + -- ViewUtil.ShowModalWait() + -- local val = member.group_ban == 1 and 0 or 1 + -- fgCtr:FG_BanMember(self.group_id, member.uid, val, 2, function(res1) + -- if self._is_destroy then + -- return + -- end + -- ViewUtil.CloseModalWait() + -- if res1.ReturnCode == 0 then + -- member.group_ban = val + -- pic = member.group_ban == 1 and "mng_del_ban_group" or "mng_ban_group" + -- btn_ban.icon = "ui://NewGroup/" .. pic + -- self.callBack() + -- else + -- ViewUtil.ErrorTip(res1.ReturnCode,val == 1 and "禁止整组娱乐失败！" or "恢复整组娱乐失败！") + -- end + -- end) + -- end) + -- _curren_msg:Show() end) -- end end 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 58bcf70c..cf19e2cb 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 @@ -2,11 +2,13 @@ local TimeSettingPanel = import(".TimeSettingPanel") local GroupPartnerStatMember = import(".GroupPartnerStatMember") local GroupPartnerStatPlay = import(".GroupPartnerStatPlay") local GroupNumberInputView = import(".GroupNumberInputView") +local GroupSetMemberInfoDiaoduView=import('.GroupSetMemberInfoDiaoduView') -- 开桌统计 local GroupMngPartnerStatView = {} local M = GroupMngPartnerStatView + function GroupMngPartnerStatView.new(gid) local self = M self.class = "GroupMngPartnerStatView" @@ -245,6 +247,28 @@ 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() + + ViewUtil.ShowModalWait() + ControllerManager.GetController(NewGroupController):FG_GetBanMemberHB(self.group_id, data.uid, function(res) + ViewUtil.CloseModalWait() + --pt(res) + if res.ReturnCode == 0 then + local diaoduView=GroupSetMemberInfoDiaoduView.new(self.group_id, data.uid) + diaoduView:SetCurrentState(res.Data.group_black+1,res.Data) + else + ViewUtil.ErrorTip(res.ReturnCode,"获取整组调度失败！") + end + + end) + + end) + local btnMen = obj:GetChild("btnMen") -- btnMen.text = d2ad(data.autoscore) local menControl = obj:GetController("menkan") diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua index 13271e09..478660f8 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua @@ -189,6 +189,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() diff --git a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua index 2e891831..b1d7feec 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua @@ -187,7 +187,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset - + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() end diff --git a/fk101/lua_probject/extend_project/extend/zipai/runbeard/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/runbeard/main/ZPMainView.lua index c5a2cd0a..2665875f 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/runbeard/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/runbeard/main/ZPMainView.lua @@ -192,7 +192,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset - + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() end diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua index 457b6d5c..567b6046 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua @@ -188,7 +188,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset - + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() end diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua index 707b48db..e4b370c9 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua @@ -188,7 +188,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height - self._xipaiPanel.x = offset + --self._xipaiPanel.x = offset self._xipaiPanel.visible=false --self:PlayXiPai() diff --git a/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua b/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua index b416c7b1..9d86cc0d 100644 --- a/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua +++ b/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua @@ -174,6 +174,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() diff --git a/fk101/wb_new_ui/.objs/metas/27vd145b/e2q77i64.info b/fk101/wb_new_ui/.objs/metas/27vd145b/e2q77i64.info index 6fb7becb..483bef06 100644 --- a/fk101/wb_new_ui/.objs/metas/27vd145b/e2q77i64.info +++ b/fk101/wb_new_ui/.objs/metas/27vd145b/e2q77i64.info @@ -1,4 +1,12 @@ { - "fitScreen": "FitSize", - "adaptiveTest": true + "objectStatus": { + "n35_k1ss": { + "collapsed": true + }, + "n20_k1ss": { + "collapsed": true + } + }, + "adaptiveTest": true, + "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/27vd145b/hei77i2g.info b/fk101/wb_new_ui/.objs/metas/27vd145b/hei77i2g.info index 79e9da94..3d3f3c20 100644 --- a/fk101/wb_new_ui/.objs/metas/27vd145b/hei77i2g.info +++ b/fk101/wb_new_ui/.objs/metas/27vd145b/hei77i2g.info @@ -5,6 +5,9 @@ }, "n20_k1ss": { "collapsed": true + }, + "n35_k1ss": { + "collapsed": true } }, "adaptiveTest": true, diff --git a/fk101/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info b/fk101/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info index 19cde723..377e1385 100644 --- a/fk101/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info +++ b/fk101/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info @@ -3,6 +3,9 @@ "n87_ni5n": { "hidden": true }, + "n34_hp0b": { + "hidden": true + }, "n50_hkbm": { "hidden": true }, diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info index a79867df..e57075c4 100644 --- a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info @@ -12,5 +12,6 @@ "n29_tjnv": { "hidden": true } - } + }, + "adaptiveTest": true } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info index d055db31..7bb28257 100644 --- a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info @@ -1,13 +1,22 @@ { "objectStatus": { - "n40_ona1": { - "hidden": true + "n79_uwvl": { + "collapsed": true }, "n36_piv9": { "hidden": true }, "n22_xtwh": { "hidden": true + }, + "n40_ona1": { + "hidden": true + }, + "n29_10imx": { + "collapsed": true + }, + "n52_ona1": { + "collapsed": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info index 56d2e4c5..fd649129 100644 --- a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info +++ b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info @@ -39,6 +39,9 @@ "n17_pt1r": { "hidden": true }, + "n70_dunj": { + "collapsed": true + }, "n51_fmkv": { "collapsed": true }, diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info index 6fb7becb..082b0634 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info @@ -1,4 +1,9 @@ { - "fitScreen": "FitSize", - "adaptiveTest": true + "objectStatus": { + "n64_hp03": { + "locked": true + } + }, + "adaptiveTest": true, + "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qvx.info b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qvx.info index 599ad124..9e26dfee 100644 --- a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qvx.info +++ b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qvx.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n45_j34t": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info index e2b7fb11..76f29fd4 100644 --- a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info +++ b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info @@ -1,7 +1,28 @@ { "objectStatus": { - "n74_o49p": { - "collapsed": true + "n34_e7qn": { + "hidden": true + }, + "n80_cbxl": { + "hidden": true + }, + "n8": { + "hidden": true + }, + "n38_e7qn": { + "hidden": true + }, + "n54_nu0l": { + "hidden": true + }, + "n37_e7qn": { + "hidden": true + }, + "n44_oqwm": { + "hidden": true + }, + "n58_fnpw": { + "hidden": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info index ebf7516b..fbacc469 100644 --- a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info +++ b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info @@ -1,16 +1,40 @@ { "objectStatus": { - "n170_o49p": { + "n162_o49p": { + "hidden": true + }, + "n175_fgao": { "hidden": true }, "n35_k3io": { "hidden": true }, - "n154_r1mo": { - "collapsed": true + "n46_u4l2": { + "hidden": true }, "n34_k3io": { "hidden": true + }, + "n163_o49p": { + "hidden": true + }, + "n179_kxwj": { + "hidden": true + }, + "n178_cbxl": { + "hidden": true + }, + "n170_o49p": { + "hidden": true + }, + "n37_kba2": { + "hidden": true + }, + "n31_h1uu": { + "hidden": true + }, + "n174_fgao": { + "hidden": true } }, "adaptiveTest": true, diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 96649bff..f70b18db 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -2,28 +2,113 @@ "libview.firstColumnWidth": 356, "libview.iconScale": 0, "doc.openedDocs": [ + "ui://yzaioi79f55qwa", + "ui://m7iejg46tqi8hwa", + "ui://m7iejg46hsbhhjn", + "ui://m7iejg46jgh8hwv", + "ui://m7iejg4610snh5j", + "ui://3z9lj55vjokmft", + "ui://b50sd5s6s9wx7", + "ui://b50sd5s6s9wxa", + "ui://visk5g30gq7m2c", + "ui://s63l0suw6cpqv", + "ui://s63l0suw6cpqt", + "ui://425x67nrs9wx7", + "ui://kplym8mus9wx7", + "ui://fnuxqeflnrnod", "ui://egnzysm7ffp36a", - "ui://egnzysm7ffp35h", - "ui://egnzysm7ffp36i", - "ui://egnzysm7ffp36o", "ui://egnzysm7ffp370", + "ui://27vd145blwcl28", + "ui://27vd145bcjli6", + "ui://27vd145bimywcd5", + "ui://bx1t0boos9wx8", + "ui://v2hilfzbgq7mde", + "ui://ypulwxjhl9mn14", + "ui://oubpz2r2ofil7k", + "ui://k15boclkl9mn14", + "ui://v0j9abjygq7med", + "ui://3z9lj55vjokmfg", + "ui://4skil1l6piv91ny", + "ui://v0j9abjygq7mdf", + "ui://v0j9abjygq7mdl", + "ui://v0j9abjygq7md3", + "ui://v0j9abjygq7md1", + "ui://v0j9abjygq7mct", + "ui://v0j9abjygq7mcu", + "ui://4skil1l6uwvl1qp", + "ui://4skil1l6piv91mk", + "ui://x3mp2cn6xvhr3r", + "ui://4skil1l6piv91o7", + "ui://4skil1l6piv91o5", + "ui://3n2top74kpmgq4", + "ui://27vd145bo95k7i4p", + "ui://27vd145bhei77i2g", + "ui://27vd145b7jqkcdl", + "ui://27vd145be2q77i64", + "ui://4skil1l6piv91mg", + "ui://4skil1l6piv91nt", "ui://442j0uepygxga", - "ui://2zlli80mr6cyce9", - "ui://3z9lj55vjokmky", - "ui://v0j9abjygq7mgo", - "ui://4skil1l6by4o1i2", - "ui://27vd145bpgy941", - "ui://27vd145bko559b", - "ui://27vd145beeqmcgu", - "ui://27vd145beeqmcgv", - "ui://27vd145bhxjc1ub", - "ui://l0ds4ys6h1uu2p", - "ui://l0ds4ys6h1uu26", - "ui://l0ds4ys6e54q2t", - "ui://z1qthxavlrfi0", + "ui://3n2top74kpmgkd", + "ui://9n9stu2eprgzee", + "ui://awernf6xbazq7n", + "ui://qpsoxvaiprgzee", + "ui://b8jloj2qg8ktcmb", + "ui://3op8sm5eu86s1f", + "ui://niy3ldiwl9mn14", + "ui://5cdldr01qaqf2c", + "ui://3z9lj55vjokmet", + "ui://c7j2rnvqtpf02f", + "ui://y8prev1ms9wx7", + "ui://3z9lj55vjokm8z", + "ui://3z9lj55vjokmey", + "ui://27vd145btjnvcg9", + "ui://27vd145bn12bcge", + "ui://c7j2rnvqtpf03e", + "ui://visk5g30gq7m30", + "ui://egnzysm7ffp37r", + "ui://visk5g30gq7m43", + "ui://m7iejg46f6brhww", + "ui://m7iejg46wbjh7ica", + "ui://m7iejg46j1207i2r", + "ui://m7iejg46j1207i2o", "ui://0khx14are0py2", - "ui://3z9lj55vjokm7l", + "ui://v2hilfzbgq7mh7", + "ui://oubpz2r2i2djgl", + "ui://3n2top74kpmgp4", + "ui://9n9stu2eprgzgj", + "ui://awernf6xbazqbp", + "ui://qpsoxvaiprgzgj", + "ui://b8jloj2qprgzgj", + "ui://2d9xdj6zl0lzb", + "ui://lx6k641gajzhoe", + "ui://5cdldr01qaqfdr", + "ui://yzaioi79wyal8n", + "ui://v6yvqp7wwyal8n", + "ui://35sf1c1fr05ed8", + "ui://m7iejg46kwi0hlb", + "ui://m7iejg46jr1l7i3c", + "ui://yzaioi79f55qw5", + "ui://yzaioi79f55qvx", + "ui://yzaioi79f55qvw", + "ui://35sf1c1fr05e8u", + "ui://35sf1c1fr05e9m", + "ui://35sf1c1fr05eae", + "ui://35sf1c1fr05e76", + "ui://v6yvqp7wf55qvw", + "ui://35sf1c1fr05e5z", + "ui://35sf1c1fr05eb", + "ui://5cdldr01qaqf9c", + "ui://5cdldr01qaqf6x", + "ui://5cdldr01qaqf7q", + "ui://5cdldr01qaqf7g", + "ui://5cdldr01qaqf71", "ui://3n2top74kpmgp5", + "ui://5cdldr01qaqf4w", + "ui://5cdldr01qaqf59", + "ui://5cdldr01qaqfa4", + "ui://v6yvqp7wf55qwa", + "ui://v6yvqp7wf55qw4", + "ui://v6yvqp7wfgao1dk", "ui://c7j2rnvqtpf08x", "ui://fnuxqeflkllg1x", "ui://egnzysm7ffp3b2", @@ -39,83 +124,29 @@ "ui://b8jloj2qprgzf0", "ui://3op8sm5eu86s3p", "ui://niy3ldiwl9mn37", - "ui://niy3ldiwl9mn34", - "ui://niy3ldiwl9mn31", - "ui://27vd145be54q3v", - "ui://niy3ldiwl9mn2s", "ui://3z9lj55vjokmwr", + "ui://3z9lj55vjokm7l", "ui://v0j9abjygq7ms2", - "ui://v6yvqp7wf55qwa", - "ui://35sf1c1fr05e8u", - "ui://35sf1c1fr05e9m", - "ui://35sf1c1fr05eae", - "ui://yzaioi79f55qwa", - "ui://c7j2rnvqtpf093", - "ui://c7j2rnvqtpf0w", - "ui://3n2top74kpmgbc", - "ui://3z9lj55vjokm8k", - "ui://3z9lj55vjokm8x", - "ui://3z9lj55vjokm8q", - "ui://3z9lj55vjokm8p", - "ui://c7j2rnvqtpf06k", - "ui://c7j2rnvqtpf08t", - "ui://c7j2rnvqtpf06p", - "ui://c7j2rnvqtpf08q", - "ui://3z9lj55vjokm8j", - "ui://v2hilfzbgq7mh7", - "ui://oubpz2r2i2djgl", - "ui://3n2top74kpmgp4", - "ui://m7iejg46tqi8hwa", - "ui://27vd145bp2bz6s", - "ui://27vd145bhxjc7i4q", - "ui://27vd145b7jqkcdl", - "ui://27vd145blwcl28", - "ui://27vd145bimywcd5", - "ui://27vd145bofsx1e", - "ui://27vd145bep9w7ik3", - "ui://27vd145bcvc87i5t", - "ui://27vd145bzwbu1a", - "ui://27vd145bhznkce2", - "ui://27vd145blprqce1", - "ui://27vd145bh1uu30", - "ui://27vd145bnosez", - "ui://27vd145bcjli6", - "ui://m7iejg46kwi0hlb", - "ui://m7iejg46jr1l7i3c", - "ui://3n2top74kpmgoa", - "ui://3n2top74kpmgog", - "ui://9n9stu2eprgzgj", - "ui://awernf6xbazqbp", - "ui://b8jloj2qprgzgj", - "ui://2d9xdj6zl0lzb", - "ui://2d9xdj6zl0lzo", - "ui://lx6k641gajzhoe", - "ui://5cdldr01qaqfdr", - "ui://yzaioi79wyal8n", - "ui://v6yvqp7wwyal8n", - "ui://35sf1c1fr05ed8", - "ui://qpsoxvaiprgzgj", - "ui://3z9lj55vjokm8c", "ui://v0j9abjygq7m8f", - "ui://4skil1l6ms5spy", "ui://4skil1l6r6qo1kc", - "ui://5cdldr01qaqf9c", - "ui://5cdldr01qaqfa4", - "ui://5cdldr01qaqfaw", - "ui://5cdldr01qaqf2c", - "ui://niy3ldiwl9mn14", - "ui://niy3ldiwl9mn18", - "ui://27vd145baen8chp", - "ui://niy3ldiwl9mny", - "ui://niy3ldiwl9mnz", - "ui://niy3ldiwl9mn17" + "ui://4skil1l6ms5spy", + "ui://5cdldr01qaqf61", + "ui://5cdldr01qaqfb" ], - "auxline1": true, + "test.device": "Huawei Mate20 Pro", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://3z9lj55vjokm7l", + "doc.activeDoc": "ui://3z9lj55vjokmft", "libview.twoColumn": false, "libview.expandedNodes": [ + "l0ds4ys6", + "/", + "niy3ldiw", + "/", + "niy3ldiw", + "/component/", + "niy3ldiw", + "/component/clearing/", "0khx14ar", "/", "3z9lj55v", @@ -123,6 +154,14 @@ "3z9lj55v", "/Main_style_2/", "3z9lj55v", + "/Main_style_2/card/", + "3z9lj55v", + "/Main_style_2/card/card_mark/", + "3z9lj55v", + "/Main_style_2/card/card_mark/images/", + "3z9lj55v", + "/Main_style_2/ting/", + "3z9lj55v", "/Main_style_2/turn/", "3z9lj55v", "/component/", @@ -141,21 +180,37 @@ "5cdldr01", "/component/", "5cdldr01", - "/component/clearing/", + "/component/Main/", "5cdldr01", - "/component/clearing/image/", + "/component/option/", + "5cdldr01", + "/component/record/", + "5cdldr01", + "/component/result/", + "5cdldr01", + "/component/result/component/", + "5cdldr01", + "/component/result/images/", + "5cdldr01", + "/component/tips/", + "5cdldr01", + "/image/", + "5cdldr01", + "/image/main_2/", "5cdldr01", "/images/", - "v6yvqp7w", + "yzaioi79", "/", "v6yvqp7w", - "/component/", - "v6yvqp7w", - "/component/clearing/", + "/", + "35sf1c1f", + "/", "m7iejg46", "/" ], + "auxline1": true, "snapToGrid": true, + "test.orientation": "landscape", "backgroundColor": 6710886, "libview.currentGroup": "", "gridSize": 30, diff --git a/fk101/wb_new_ui/assets/Chat/Btn_chat.xml b/fk101/wb_new_ui/assets/Chat/Btn_chat.xml index b61f4cad..ef977bf4 100644 --- a/fk101/wb_new_ui/assets/Chat/Btn_chat.xml +++ b/fk101/wb_new_ui/assets/Chat/Btn_chat.xml @@ -1,11 +1,11 @@ - + - + - + -