diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua
index c8c93dd2..6fd04d2d 100644
--- a/lua_probject/base_project/Game/View/MainView.lua
+++ b/lua_probject/base_project/Game/View/MainView.lua
@@ -39,7 +39,7 @@ end
local function LoadClickData()
local json_data = Utils.LoadLocalFile("clickMode")
- if json_data == nil or json_data == "null" then
+ if json_data == nil or json_data == "null" then
return "double"
end
@@ -283,6 +283,11 @@ function M:InitView(url, isHideIpAdds)
local chatText = _view:GetChild('btn_sendText')
if chatText then
chatText.onClick:Add(function()
+ if self._room.room_config.config.hpData.BanChat == 1 then
+ ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天")
+ return
+ end
+
if self.chat_view == nil then
self.chat_view = ChatView.new(self)
end
@@ -294,6 +299,7 @@ function M:InitView(url, isHideIpAdds)
end
]]
+ --[[
local group = DataManager.groups:get(self._room.group_id)
local play = group:getPlay(self._room.play_id)
local hpData = json.decode(play.hpData)
@@ -301,6 +307,7 @@ function M:InitView(url, isHideIpAdds)
ViewUtil.ShowTips("本房间禁止快捷聊天")
return
end
+ ]]
self.chat_view:Show()
end)
@@ -311,6 +318,12 @@ function M:InitView(url, isHideIpAdds)
self._ctr_voice = _view:GetController('voice')
self._chat_Talk.onTouchBegin:Set(function()
+
+ if self._room.room_config.config.hpData.BanChat == 1 then
+ ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天")
+ return
+ end
+
if record_baned == 1 then
self:__SetRecordEnable()
else
@@ -914,7 +927,7 @@ function M:EventInit()
)
_gamectr:AddEventListener(GameEvent.HOMESTATE, function(...)
- local arg = {...}
+ local arg = { ... }
local uid = arg[1].uid
local setHome = arg[1].setHome
local gameStatus = arg[1].gameStatus
@@ -922,9 +935,9 @@ function M:EventInit()
local seat = GetSeat(self, uid)
local info = self._player_info[self:GetPos(seat)]
- if gameStatus == "out" then
+ if gameStatus == "out" then
info:UpdateLineState(0)
- elseif gameStatus == "enter" then
+ elseif gameStatus == "enter" then
info:UpdateLineState(1)
end
end)
@@ -1119,7 +1132,7 @@ function M:OnMissile(...)
local arg = {...}
print("OnMissile 有人发表情了")
pt(arg)
-
+
--self:Missile()
end
]]
@@ -1253,19 +1266,18 @@ function M:SetLanguage(language)
end
function M:Missile(seat, targetSeat, Missile)
-
local animUrl = ""
local url = ""
- if Missile == "boom" then
+ if Missile == "boom" then
animUrl = "ui://Main_Majiang/Missile_boom"
url = "ui://Common/boom"
- elseif Missile == "egg" then
+ elseif Missile == "egg" then
animUrl = "ui://Main_Majiang/Missile_egg"
url = "ui://Common/egg"
- elseif Missile == "diamo" then
+ elseif Missile == "diamo" then
animUrl = "ui://Main_Majiang/Missile_diamo"
url = "ui://Common/diamo"
- elseif Missile == "flower" then
+ elseif Missile == "flower" then
animUrl = "ui://Main_Majiang/Missile_flower"
url = "ui://Common/flower"
end
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/4918b5270e436c54b44d48f0bb79114 3.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/4918b5270e436c54b44d48f0bb79114 3.png
new file mode 100644
index 00000000..9f754bb6
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/4918b5270e436c54b44d48f0bb79114 3.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/Screenshot_20250412-160003.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/Screenshot_20250412-160003.png
new file mode 100644
index 00000000..b703fccd
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/Screenshot_20250412-160003.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/de87786dd190bbd4d4c7dbfff2484d89_720 1.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/de87786dd190bbd4d4c7dbfff2484d89_720 1.png
new file mode 100644
index 00000000..e0fcd657
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/de87786dd190bbd4d4c7dbfff2484d89_720 1.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/e64501792ed1d68d0c12c5668437a69 1.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/e64501792ed1d68d0c12c5668437a69 1.png
new file mode 100644
index 00000000..3e7bb2b3
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/e64501792ed1d68d0c12c5668437a69 1.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/微信图片_20250813225357_169.jpg b/wb_new_ui/assets/Main_Majiang/Main_new/Image/微信图片_20250813225357_169.jpg
new file mode 100644
index 00000000..1153005b
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/微信图片_20250813225357_169.jpg differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml
index 6f663727..2ea38b59 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
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 6c65e3ea..368d4107 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
@@ -57,11 +57,11 @@
-
+
-
-
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml
index a666a62c..36dcaa9a 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml
@@ -1,8 +1,12 @@
-
-
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml
index e0aaa0e6..10d871b4 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
index 19b84f0f..4557270f 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
@@ -2,7 +2,7 @@
-
+
@@ -31,8 +31,8 @@
-
-
+
+
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_2_1.xml
index 6d27ad49..41257144 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_2_1.xml
@@ -1,5 +1,5 @@
-
+
@@ -8,30 +8,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
@@ -46,7 +30,31 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -80,22 +88,21 @@
-
+
-
-
+
-
-
+
+
-
+
-
+
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
index 80845505..221e7530 100644
--- 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
@@ -1,28 +1,11 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -37,14 +20,13 @@
-
-
+
-
+
@@ -70,7 +52,7 @@
-
+
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_2_3.xml
new file mode 100644
index 00000000..909cfadb
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_3.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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_2_4.xml
new file mode 100644
index 00000000..1dd5e33a
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_4.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 e8c566a4..4bfa7901 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,6 +1,6 @@
-
-
+
+
@@ -14,13 +14,22 @@
-
+
+
+
+
+
+
+
+
+
+
@@ -92,18 +101,18 @@
-
+
-
-
+
+
-
+
-
-
+
+
@@ -111,59 +120,52 @@
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -183,10 +185,10 @@
-
+
-
+
@@ -251,7 +253,7 @@
-
+
@@ -266,7 +268,7 @@
-
+
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 509a9605..4f334388 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,26 +1,30 @@
-
-
+
+
-
+
+
-
+
+
+
+
-
+
-
+
-
+
@@ -29,12 +33,12 @@
-
+
-
+
@@ -48,24 +52,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -139,51 +125,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
@@ -257,6 +208,86 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
index 6e2eb104..1ad2da0b 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
@@ -1,15 +1,15 @@
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml
index 013e6727..6b5eb850 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml
@@ -1,23 +1,23 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml
index 86f6e22d..ee99d6a1 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml
index 815af9f5..e51d3322 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml
@@ -1,15 +1,15 @@
-
+
-
-
-
+
+
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml
index c0410ed4..cff03de7 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml
index 9837b38d..e1f87eeb 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml
@@ -1,15 +1,15 @@
-
+
-
-
-
+
+
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml
index e139593f..9e9b6525 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard3.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard3.xml
index 38eb671f..e50e07c3 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard3.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard3.xml
@@ -1,11 +1,11 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard4.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard4.xml
index 2c340e00..e7c7283f 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard4.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard4.xml
@@ -2,10 +2,10 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2.xml
index 8b28f7f4..b4aace68 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2_Record.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2_Record.xml
index 788328d4..78616a9c 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2_Record.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2_Record.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard3.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard3.xml
index 8cbd4a15..4455bd9b 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard3.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard3.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4.xml
index b1cc2ee6..4a8df955 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4_Record.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4_Record.xml
index 7a847110..54e2ce06 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4_Record.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4_Record.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_1.xml
index 87b50dc6..a01dae95 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_1.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_1.xml
@@ -1,5 +1,5 @@
-
+
@@ -8,29 +8,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
@@ -45,7 +30,31 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -79,18 +88,21 @@
-
+
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_3.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_3.xml
index c4ba4515..2e40037a 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_3.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_3.xml
@@ -5,24 +5,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -40,7 +23,6 @@
-
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
index 550cfcbf..65a9db86 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
@@ -1,6 +1,6 @@
-
+
@@ -10,19 +10,23 @@
+
-
+
+
+
+
-
+
-
+
-
+
@@ -31,22 +35,22 @@
-
+
-
+
-
+
-
+
@@ -55,21 +59,21 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
@@ -129,58 +133,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -190,15 +142,10 @@
-
+
-
-
-
-
-
@@ -276,6 +223,86 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index 69f56cce..4787ef00 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1395,7 +1395,7 @@
-
+
@@ -1526,6 +1526,13 @@
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 7cddc881..8bfde623 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ