From 16af2152186c3756fd187e0a4895c2e2866a5a79 Mon Sep 17 00:00:00 2001 From: fy <> Date: Fri, 10 Apr 2026 19:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=93=E7=AE=97=E9=BA=BB?= =?UTF-8?q?=E5=B0=86=E4=BD=8D=E7=BD=AE=E4=BB=A5=E5=8F=8A=E9=B8=9F=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../majiang/hongzhong/EXClearingView.lua | 5 ++++- .../.objs/metas/3z9lj55v/jokmdt.info | 3 +++ fk101/wb_new_ui/.objs/workspace.json | 7 ++++--- .../Main_Majiang/Main_style_2/Main_2_s2.xml | 4 ++-- .../component/clearing/clearing.xml | 2 +- .../clearing/clearing1/clearing_1_item.xml | 12 ++++++------ .../clearing/clearing1/clearing_card.xml | 8 ++++---- .../clearing/clearing1/clearing_card.xml | 4 ++-- .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 252265 -> 252258 bytes 9 files changed, 26 insertions(+), 19 deletions(-) diff --git a/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua index 29f5b427..cca6f11e 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua @@ -64,6 +64,8 @@ function M:ShowSelectMaPai(niaoList) self:IsMapaiShow(self.maPaiList[i], true) self:SetMaPaiValue(self.maPaiList[i], niaoList[i].card) if niaoList[i].score > 0 then + self:SetMaPaiColor(self.maPaiList[i], 0) + else self:SetMaPaiColor(self.maPaiList[i], 2) end end @@ -227,7 +229,8 @@ function M:FillItemData(room, data, item, active_player, niao) local fz_card = p.fz_list local fz_card_list = item:GetChild("fz_card_list") - fz_card_list.width = 157 * #fz_card * 0.8 + fz_card_list.width = 157 * #fz_card * 1.3 + print("你好 ", fz_card_list.width) fz_card_list:RemoveChildrenToPool() for i = 1, #fz_card do if fz_card[i].type == FZType.Peng then diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info index 80a2989c..73dab957 100644 --- a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n35_piv9": { + "hidden": true + }, "n45_ona1": { "hidden": true }, diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 236412c7..a401973d 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -58,6 +58,8 @@ "ui://visk5g30gq7m45", "ui://visk5g30gq7m48", "ui://visk5g30gq7m2a", + "ui://kplym8mus9wxa", + "ui://egnzysm7ffp386", "ui://s63l0suw6cpqv", "ui://s63l0suw6cpqr", "ui://s63l0suw6cpqt", @@ -71,6 +73,7 @@ "ui://v0j9abjygq7mcu", "ui://3z9lj55vjokmdt", "ui://3z9lj55vjokmdr", + "ui://442j0uepona1bm", "ui://3z9lj55vjokme6", "ui://3z9lj55vjokme4", "ui://3z9lj55vjokmdq", @@ -157,7 +160,7 @@ "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://3z9lj55vjokmdt", + "doc.activeDoc": "ui://3z9lj55vjokmdr", "libview.twoColumn": false, "libview.expandedNodes": [ "3z9lj55v", @@ -165,8 +168,6 @@ "3z9lj55v", "/Main_style_2/", "3z9lj55v", - "/image/", - "3z9lj55v", "/images/", "m7iejg46", "/", diff --git a/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml b/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml index bb92f9e9..1c9939f5 100644 --- a/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml +++ b/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml @@ -2,10 +2,10 @@ - + - + diff --git a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml index a6917b01..3ca06c96 100644 --- a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml +++ b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml @@ -15,7 +15,7 @@