From 982a08103f5b457c1e7cf7126012978922d4aaa8 Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Thu, 14 Aug 2025 02:49:58 +0800 Subject: [PATCH] =?UTF-8?q?3=E3=80=814=E4=BA=BA=E9=BA=BB=E5=B0=86=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/View/Family/FamilyMsgRecord.lua | 6 +- .../main/majiang/MJPlayerCardInfoView.lua | 4 +- .../Main_new/Main/PlayerHead_1.xml | 4 +- .../Main_new_2/Player_card_info_2_2.xml | 60 ---- ...rd_info_2_3.xml => Player_card_info_E.xml} | 15 + .../Main_new_2/Player_card_info_N.xml | 82 +++++ ...rd_info_2_1.xml => Player_card_info_S.xml} | 24 +- ...rd_info_2_4.xml => Player_card_info_W.xml} | 15 + .../Main_new/Main_new_2_jiangxi.xml | 57 ++-- .../Main_new/Main_new_3_jiangxi.xml | 309 +++++++++-------- .../Main_new/Main_new_4_jiangxi.xml | 321 +++++++++--------- wb_new_ui/assets/Main_Majiang/package.xml | 8 +- .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 388304 -> 381146 bytes 13 files changed, 478 insertions(+), 427 deletions(-) delete mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml rename wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/{Player_card_info_2_3.xml => Player_card_info_E.xml} (62%) create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_N.xml rename wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/{Player_card_info_2_1.xml => Player_card_info_S.xml} (64%) rename wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/{Player_card_info_2_4.xml => Player_card_info_W.xml} (61%) diff --git a/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua index f360d749..9a33a81d 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua @@ -24,10 +24,8 @@ local function list_msgRender(self, index, obj) local msgText = '' if msg.m_state == 0 then - msgText = string.format("【%s】被【%s】加入亲友圈", msg.user_name, msg.tag_name) - - - + --msgText = string.format("【%s】被【%s】加入亲友圈", msg.user_name, msg.tag_name) + msgText = string.format("【%s】被【%s】加入亲友圈", msg.tag_name, msg.user_name) elseif msg.m_state == 1 then msgText = string.format("【%s】退出亲友圈", msg.user_name) elseif msg.m_state == 2 then diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 4240e24f..b3fa7b4f 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -469,7 +469,7 @@ function M:ShowHand(cards) for _, card in pairs(cards) do if self.winCard ~= card then local obj = self._view_handCardList:AddItemFromPool() - obj:GetChild("icon").url = 'ui://Main_Majiang/' .. "b202_" .. card + obj:GetChild("icon").url = 'ui://Main_Majiang/' .. self._viewText_cardInfo['Out_Card'] .. card end end end @@ -478,7 +478,7 @@ function M:ShowHuCard(card) self.winCard = card self._view_getCard:RemoveChildrenToPool() local btn_card = self._view_getCard:AddItemFromPool() - btn_card:GetChild("icon").url = 'ui://Main_Majiang/' .. "b202_" .. card + btn_card:GetChild("icon").url = 'ui://Main_Majiang/' .. self._viewText_cardInfo['Out_Card'] .. card end return M diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml index 368d4107..ea488eda 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml @@ -34,8 +34,8 @@ - - + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml deleted file mode 100644 index 221e7530..00000000 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_3.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_E.xml similarity index 62% rename from wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_3.xml rename to wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_E.xml index 909cfadb..fbed5c1d 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_3.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_E.xml @@ -72,5 +72,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_N.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_N.xml new file mode 100644 index 00000000..8dbb92c5 --- /dev/null +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_N.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_S.xml similarity index 64% rename from wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml rename to wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_S.xml index 41257144..917785d9 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_S.xml @@ -1,5 +1,5 @@ - + @@ -7,6 +7,11 @@ + + + + + @@ -31,6 +36,8 @@ + + @@ -105,5 +112,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_4.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_W.xml similarity index 61% rename from wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_4.xml rename to wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_W.xml index 1dd5e33a..f2db1eb2 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_4.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_W.xml @@ -70,5 +70,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index 4bfa7901..1d08f922 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -1,5 +1,5 @@ - + @@ -17,19 +17,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - @@ -133,27 +149,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml index 4f334388..bf3d811f 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml @@ -1,6 +1,6 @@ - - + + @@ -11,135 +11,184 @@ - + - - - + + + + + + + + + + + - - - - + + - - - + + + - - - + + - - - + + - - - - + + - + - + - - - + + + - - - - + - - -