From ff9c7eeb19dbb2694d293602b380c84042c20294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Wed, 7 May 2025 17:07:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8D=97=E5=9F=8E=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=B0=8F=E7=BB=93=E7=AE=97=E6=89=8B=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/majiang/fuzhou/EXMainView.lua | 1 + .../extend/majiang/jinxi/EXMainView.lua | 2 ++ .../extend/majiang/lichuan/EXMainView.lua | 2 ++ .../extend/majiang/nancheng/EXClearingView.lua | 12 ++++++++++-- .../extend/majiang/nancheng/EXMainView.lua | 2 ++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 3e2399d9..e6972975 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -656,6 +656,7 @@ function M:__FangziTip(tip, weight) if index == tip.tip_num then type.selectedIndex = 0 obj.onClick:Set(function() + --测试暂时取消过提示 -- local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel) -- guo_msg.onOk:Add(function() _gamectr:SendAction(0) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 1cebf5b4..9bcda9e0 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -655,6 +655,8 @@ function M:__FangziTip(tip, weight) if index == tip.tip_num then type.selectedIndex = 0 obj.onClick:Set(function() + --测试暂时取消过提示 + -- local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel) -- guo_msg.onOk:Add(function() _gamectr:SendAction(0) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 0e85c6fb..d88e17b1 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -654,6 +654,8 @@ function M:__FangziTip(tip, weight) if index == tip.tip_num then type.selectedIndex = 0 obj.onClick:Set(function() + --测试暂时取消过提示 + -- local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel) -- guo_msg.onOk:Add(function() _gamectr:SendAction(0) diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua index b86c3369..a4c4fa3d 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua @@ -182,13 +182,21 @@ function M:fillResult0(room, peopleNum, result) local handCardItem = allCardsList:AddItemFromPool("ui://Main_Majiang/Comp_HandCard") local handCardList = handCardItem:GetChild("list") handCardList:SetVirtual() + --去除赢家手牌标志 + local flag_remove = infoList.is_win + local num_add = 0 handCardList.itemRenderer = function(index, obj) - obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1]) + if infoList.win_card == infoList.hand_card[index + 1] and flag_remove then + flag_remove = false + num_add = 1 + end + obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), + infoList.hand_card[index + num_add + 1]) if room.jing == infoList.hand_card[index + 1] then obj:GetController('jing').selectedIndex = 1 end end - handCardList.numItems = handInfoNum + handCardList.numItems = infoList.is_win and handInfoNum - 1 or handInfoNum allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum) if infoList.seat == room.self_player.seat then diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index a2acd821..a1e21b52 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -657,6 +657,8 @@ function M:__FangziTip(tip, weight) if index == tip.tip_num then type.selectedIndex = 0 obj.onClick:Set(function() + --测试暂时取消过提示 + -- local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel) -- guo_msg.onOk:Add(function() _gamectr:SendAction(0)