From dab13a4ec5e154bee717284fb3f14f780ba6189f Mon Sep 17 00:00:00 2001 From: fy <> Date: Tue, 28 Apr 2026 11:21:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../majiang/changsha/MJPlayerCardInfoView.lua | 3 +- fk101/wb_new_ui/.objs/workspace.json | 150 ++---------------- .../NewGroup/mgr/View_GroupPartnerStat.xml | 16 +- .../member/partner/item_partner_stat.xml | 20 +-- .../ART/base/newgroup/ui/NewGroup_fui.bytes | Bin 271381 -> 271386 bytes 5 files changed, 35 insertions(+), 154 deletions(-) diff --git a/fk101/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua b/fk101/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua index f685a679..04627528 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua @@ -1,5 +1,5 @@ local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") - +local ViewUtil = require("Game.View.ViewUtil") local M = {} function M.new(view,mainView) @@ -56,6 +56,7 @@ function M:UpdateHandCard(getcard, mp, opcard) opnum = #opcard end local loc = 0 + if not mp then local comp_back = handcard_list["comp_back"] if self._current_card_type == 2 then diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 7d17366e..c415b904 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -2,144 +2,14 @@ "libview.firstColumnWidth": 356, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://27vd145bhxjc7i4q", - "ui://kplym8mus9wxa", - "ui://fnuxqeflnrnod", - "ui://egnzysm7ffp36a", - "ui://27vd145bimywcd5", - "ui://egnzysm7ffp370", - "ui://v2hilfzbgq7mde", - "ui://ypulwxjhl9mn14", - "ui://yzaioi79aen81b0", - "ui://k15boclkl9mn14", - "ui://oubpz2r2ofil7k", - "ui://442j0uepygxga", - "ui://3n2top74kpmgkd", - "ui://awernf6xbazq7n", - "ui://qpsoxvaiprgzee", - "ui://b8jloj2qg8ktcmb", - "ui://3op8sm5eu86s1f", - "ui://niy3ldiwl9mn14", - "ui://5cdldr01qaqf2c", - "ui://c7j2rnvqtpf02f", - "ui://y8prev1ms9wx7", - "ui://b50sd5s6s9wx7", - "ui://xul2z8cts9wx7", - "ui://visk5g30gq7m2c", - "ui://s63l0suw6cpqv", - "ui://425x67nrs9wx7", - "ui://kplym8mus9wx7", - "ui://3z9lj55vjokmft", - "ui://ypulwxjhl9mn37", - "ui://c7j2rnvqtpf08x", - "ui://fnuxqeflkllg1x", - "ui://egnzysm7ffp3b2", - "ui://v2hilfzbgq7me6", - "ui://k15boclkl9mn37", - "ui://oubpz2r2ofil8x", - "ui://442j0uepdafga8", - "ui://3n2top74kpmgmh", - "ui://awernf6xbazq90", - "ui://qpsoxvaiprgzf0", - "ui://b8jloj2qprgzf0", - "ui://3op8sm5eu86s3p", - "ui://niy3ldiwl9mn37", - "ui://3z9lj55vjokmwr", - "ui://3z9lj55vjokm7l", - "ui://4skil1l6ms5spy", - "ui://4skil1l6r6qo1kc", - "ui://5cdldr01qaqf9c", - "ui://5cdldr01qaqf61", - "ui://5cdldr01qaqfb", - "ui://5cdldr01qaqf62", - "ui://5cdldr01qaqf7o", - "ui://5cdldr01qaqfo", - "ui://yzaioi79lvh412c", - "ui://yzaioi79cyprwq", - "ui://5cdldr01qaqfbb", - "ui://5cdldr01qaqfc", - "ui://4skil1l6bw4gev", - "ui://3z9lj55vjokmis", - "ui://3z9lj55vjokmce", - "ui://3z9lj55vjokm7g", - "ui://3z9lj55vjokm3", - "ui://3op8sm5eu86s2", - "ui://fnuxqeflnrnoa", - "ui://kplym8mus9wx2", - "ui://425x67nrs9wx2", - "ui://s63l0suw6cpqm", - "ui://visk5g30gq7m9", - "ui://visk5g30gq7m1v", - "ui://xul2z8cts9wx2", - "ui://b50sd5s6s9wx2", - "ui://y8prev1ms9wx2", - "ui://c7j2rnvqtpf08b", - "ui://c7j2rnvqtpf066", - "ui://c7j2rnvqtpf0o", - "ui://c7j2rnvqtpf0k", - "ui://c7j2rnvqtpf00", - "ui://bx1t0boos9wx2", - "ui://4skil1l6piv91oc", - "ui://4skil1l6by4o1i4", - "ui://5cdldr01qaqf60", - "ui://5cdldr01qaqf7s", - "ui://5cdldr01qaqf34", - "ui://5cdldr01qaqfa4", - "ui://5cdldr01qaqfaw", - "ui://yzaioi79f55qwa", - "ui://yzaioi79oynr1ag", - "ui://yzaioi79f55qw5", - "ui://yzaioi79f55qvw", - "ui://yzaioi79lr5d31", - "ui://27vd145bycze3n", - "ui://1hl55dqmc4r115", - "ui://d1qrzqprc4r116", - "ui://m7iejg46kwi0hkb", - "ui://egnzysm7ffp38j", - "ui://s63l0suw6cpqy", - "ui://27vd145bh1uu3i", - "ui://qubt49z8c4r116", - "ui://5cdldr01qaqf3f", - "ui://yzaioi79f55qvx", - "ui://yzaioi79f55qvy", - "ui://27vd145bko559b", - "ui://c7j2rnvqtpf059", - "ui://c7j2rnvqtpf07n", - "ui://c7j2rnvqtpf05a", - "ui://3z9lj55vjokmj5", - "ui://3z9lj55vjokmj1", - "ui://4skil1l6bw4ghh", - "ui://5cdldr01qaqfbk", - "ui://5cdldr01qaqfbi", - "ui://yzaioi79wyal87", - "ui://yzaioi79wyal85", - "ui://yzaioi79f55qw7", - "ui://3n2top74kpmgp5", - "ui://yzaioi79f55qva", - "ui://yzaioi79f55qvp", - "ui://yzaioi79f55qvt", - "ui://yzaioi79f55qvn", - "ui://5cdldr01qaqfe0", - "ui://yzaioi79fgao1dn", - "ui://yzaioi79voqg1dy", - "ui://yzaioi79mk2u138", - "ui://27vd145bycze3m", - "ui://27vd145bkzpehy5", - "ui://27vd145blwcl28", - "ui://m7iejg46mpllhuq", - "ui://3z9lj55vjokmet", - "ui://3z9lj55vjokm8z", - "ui://3z9lj55vjokmdt", - "ui://3z9lj55vjokmey", - "ui://4skil1l6piv91ny", - "ui://niy3ldiwl9mny", - "ui://niy3ldiwl9mn19", - "ui://27vd145bpgy941" + "ui://m7iejg46jgh8hwv", + "ui://m7iejg46f6brhww", + "ui://m7iejg46j1207i2r" ], "test.device": "Xiaomi 9", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://egnzysm7ffp38j", + "doc.activeDoc": "ui://m7iejg46jgh8hwv", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -148,6 +18,12 @@ "/buttons/", "27vd145b", "/conMui/", + "egnzysm7", + "/", + "egnzysm7", + "/component/", + "egnzysm7", + "/component/create_room/", "3n2top74", "/", "5cdldr01", @@ -167,7 +43,11 @@ "yzaioi79", "/component/Main/", "yzaioi79", - "/component/Main/component/" + "/component/Main/component/", + "m7iejg46", + "/", + "m7iejg46", + "/mgr/" ], "auxline1": true, "snapToGrid": true, diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml index 558a9b0d..4307945e 100644 --- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml +++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml @@ -20,28 +20,28 @@ - + - + - + - + - + - + - + - + diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml index bd8c0eac..8865d2fc 100644 --- a/fk101/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml +++ b/fk101/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml @@ -2,15 +2,15 @@ - + - + - + @@ -20,10 +20,10 @@ - + - + @@ -36,26 +36,26 @@ - + - + -