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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml
index 7112a469..422efa02 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml
@@ -1,8 +1,8 @@
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml
index f5c5bb12..39c34dd1 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml
@@ -1,9 +1,9 @@
-
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml
index 525ae414..52fb2aea 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml
@@ -1,7 +1,7 @@
-
+
-
+
+
-
+
-
+
+
-
-
-
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index 32187d50..c0170bc2 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1454,6 +1454,7 @@
+
\ 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 7239964f..b161acab 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