From 396ecbd69bc5781c1ade7bddb4ab7ef705509002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Tue, 22 Apr 2025 16:42:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=BA=AA=E6=8A=9A=E5=B7=9E=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=A5=96=E9=A9=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/majiang/fuzhou/EXClearingView.lua | 16 +++++++++++++++- .../extend/majiang/jinxi/EXClearingView.lua | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua index dabe8186..ffbbe023 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua @@ -115,6 +115,7 @@ function M:fillResult0(room, peopleNum, result) local isZhuang = playerInfoComp:GetController("zhuang") local infoList = result.info_list[i] + local infoJiangma = result.niao local playInfo = room:GetPlayerBySeat(infoList.seat) local fzCardInfo = playInfo.fz_list local fzInfoNum = #fzCardInfo @@ -122,6 +123,11 @@ function M:fillResult0(room, peopleNum, result) self:fillHead(playInfo.self_user.head_url, playerInfoComp) + infoList.jing_score = infoList.jing_score or 0 + infoList.gang_score = infoList.gang_score or 0 + infoList.hu_score = infoList.hu_score or 0 + infoList.round_score = infoList.round_score or 0 + playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and string.format("+%d", infoList.jing_score) or infoList.jing_score @@ -210,7 +216,15 @@ function M:fillResult0(room, peopleNum, result) huCardBtn.icon = string.format("ui://Main_Majiang/202_%d", infoList.win_card) huCardBtn.visible = true - jiangMaList.visible = false + jiangMaList.visible = true + jiangMaList:SetVirtual() + jiangMaList.itemRenderer = function(index, obj) + obj.icon = string.format("ui://Main_Majiang/202_%d", infoJiangma[index + 1].card) + obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score + obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0 + end + jiangMaList.numItems = #infoJiangma + jiangMaList.columnCount = #infoJiangma / 2 else playerInfoComp:GetChild("text_huShow").text = "" if not room.isZiMoHu and playInfo.self_user.account_id == result.active_player then diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua index dabe8186..ffbbe023 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua @@ -115,6 +115,7 @@ function M:fillResult0(room, peopleNum, result) local isZhuang = playerInfoComp:GetController("zhuang") local infoList = result.info_list[i] + local infoJiangma = result.niao local playInfo = room:GetPlayerBySeat(infoList.seat) local fzCardInfo = playInfo.fz_list local fzInfoNum = #fzCardInfo @@ -122,6 +123,11 @@ function M:fillResult0(room, peopleNum, result) self:fillHead(playInfo.self_user.head_url, playerInfoComp) + infoList.jing_score = infoList.jing_score or 0 + infoList.gang_score = infoList.gang_score or 0 + infoList.hu_score = infoList.hu_score or 0 + infoList.round_score = infoList.round_score or 0 + playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and string.format("+%d", infoList.jing_score) or infoList.jing_score @@ -210,7 +216,15 @@ function M:fillResult0(room, peopleNum, result) huCardBtn.icon = string.format("ui://Main_Majiang/202_%d", infoList.win_card) huCardBtn.visible = true - jiangMaList.visible = false + jiangMaList.visible = true + jiangMaList:SetVirtual() + jiangMaList.itemRenderer = function(index, obj) + obj.icon = string.format("ui://Main_Majiang/202_%d", infoJiangma[index + 1].card) + obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score + obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0 + end + jiangMaList.numItems = #infoJiangma + jiangMaList.columnCount = #infoJiangma / 2 else playerInfoComp:GetChild("text_huShow").text = "" if not room.isZiMoHu and playInfo.self_user.account_id == result.active_player then