From c325906c13453635a836be59a62b0d6382f24860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Fri, 18 Jul 2025 20:13:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BA=BB=E5=B0=86=E7=BB=93=E7=AE=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=8D=A2=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base_project/Game/View/ViewUtil.lua | 2 +- .../extend/majiang/fuzhou/EXClearingView.lua | 5 +-- .../extend/majiang/jinxi/EXClearingView.lua | 3 +- .../majiang/lichuan/EXGameController.lua | 2 +- .../majiang/nancheng/EXClearingView.lua | 2 +- .../Clearing/Component/Btn_RemindCard.xml | 20 +++++++++++ .../Clearing/Component/Comp_Clearing_FZ_3.xml | 8 ++--- .../Clearing/Component/Comp_Clearing_FZ_4.xml | 10 +++--- .../Clearing/Component/Comp_HandCard.xml | 4 +-- .../Clearing/Component/Comp_PlayInfo.xml | 6 ++-- .../Main_new/Clearing/clearing.xml | 34 +++++++++--------- wb_new_ui/assets/Main_Majiang/package.xml | 1 + .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 377831 -> 378376 bytes 13 files changed, 60 insertions(+), 37 deletions(-) create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml diff --git a/lua_probject/base_project/Game/View/ViewUtil.lua b/lua_probject/base_project/Game/View/ViewUtil.lua index b1d50826..bcf2aa49 100644 --- a/lua_probject/base_project/Game/View/ViewUtil.lua +++ b/lua_probject/base_project/Game/View/ViewUtil.lua @@ -199,7 +199,7 @@ function get_majiang_prefix(game_id) end ct = ct_data[tostring(game_id)] or 0 end - local prefix = ct == 0 and "" or "a" + local prefix = ct == 0 and "" or "b" --printlog("get_majiang_prefix===>>>",prefix,ct) return prefix end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua index 83f32916..3e71f92a 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua @@ -219,7 +219,7 @@ function M:fillResult0(room, peopleNum, result) end end handCardList.numItems = handInfoNum - allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum) + allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum) if infoList.seat == room.self_player.seat then isMeCtr.selectedIndex = 1 @@ -320,7 +320,8 @@ end function M:RemindCardRender(data, obj) local room = DataManager.CurrenRoom - obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data) + obj.icon = string.format("ui://Main_Majiang/b202_%d", data) + print("lingmeng icon", obj.icon) if room.jing == data then obj:GetController('jing').selectedIndex = 1 end diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua index 1bc7f836..9b592eb4 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua @@ -214,12 +214,13 @@ function M:fillResult0(room, peopleNum, result) handCardList:SetVirtual() handCardList.itemRenderer = function(index, obj) obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1]) + print("obj.icon") if room.jing == infoList.hand_card[index + 1] then obj:GetController('jing').selectedIndex = 1 end end handCardList.numItems = handInfoNum - allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum) + allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum) if infoList.seat == room.self_player.seat then isMeCtr.selectedIndex = 1 diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua index 852c04a7..32a47f1b 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua @@ -328,7 +328,7 @@ end function M:OneventResult1(evt_data) local over = evt_data.type - print("OneventResult1") + printlog("OneventResult1") pt(evt_data) --0:小结算 1:小大结算 2:大结算 self._room._reload_flag = false diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua index f380fe86..51d3a874 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua @@ -218,7 +218,7 @@ function M:fillResult0(room, peopleNum, result) end end handCardList.numItems = handInfoNum - allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum) + allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum) if infoList.seat == room.self_player.seat then isMeCtr.selectedIndex = 1 diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml new file mode 100644 index 00000000..6a2799db --- /dev/null +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + +