diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua
index 34c05fcb..b4450d42 100644
--- a/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua
@@ -94,13 +94,14 @@ function M:InitData(over, room, result, total_result, callback)
local round = DataManager.CurrenRoom.room_config.config.times or 1
local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai
+ --默认开启洗牌准备,不管配置是否勾选
+ xpconfig = true
if xpconfig and round > 1 then
self.xiPaiCtr.selectedIndex = 1
else
self.xiPaiCtr.selectedIndex = 0
end
-
if result then
self:ShowSelectMaPai(result.niao)
end
@@ -175,6 +176,8 @@ function M:InitData(over, room, result, total_result, callback)
end)
self:AddClearItem(room, nil, total_result.info_list, over)
end
+ self.xiPaiCtr.selectedIndex = 1
+ printlog("lingmeng xipai ", self.xiPaiCtr.selectedIndex)
end
function M:AddClearItem(room, data, total_data, over, niao, active_player)
diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png
index 8122a627..83b76b2d 100644
Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa_bar/component/clearing/洗牌.png b/wb_new_ui/assets/Extend_Poker_FanPaoFa_bar/component/clearing/洗牌.png
index 431ea053..5ae7a785 100644
Binary files a/wb_new_ui/assets/Extend_Poker_FanPaoFa_bar/component/clearing/洗牌.png and b/wb_new_ui/assets/Extend_Poker_FanPaoFa_bar/component/clearing/洗牌.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Btn_Yellow.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Btn_Yellow.xml
index 80e8b90e..32f8e2ba 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Btn_Yellow.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Btn_Yellow.xml
@@ -1,9 +1,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 715.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 715.png
index b8523e53..238f1a56 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 715.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 715.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 7216.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 7216.png
index a2973810..5ae7a785 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 7216.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 7216.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/clearing.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/clearing.xml
index f2dce769..c761f680 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/clearing.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/clearing.xml
@@ -1,7 +1,7 @@
-
+
@@ -79,12 +79,12 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
index 8e1ba05c..c0fa5704 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
@@ -1,14 +1,14 @@
-
-
-
+
+
+
-
-
+
+
-
+
@@ -56,13 +56,13 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml
index bbc9e7c4..85defdd1 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml
@@ -1,8 +1,8 @@
-
-
-
+
+
+
@@ -12,17 +12,17 @@
-
+
-
+
-
+
-
+
@@ -35,34 +35,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/clearing/room/btn_invite(1).xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/clearing/room/btn_invite(1).xml
index 255c3e0d..6e66e30d 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/clearing/room/btn_invite(1).xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/clearing/room/btn_invite(1).xml
@@ -1,12 +1,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
index 34f19957..7182b60a 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
@@ -1,6 +1,6 @@
-
+
@@ -9,7 +9,7 @@
-
+
@@ -19,67 +19,67 @@
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_jxyx.png b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_jxyx.png
index 04bda008..238f1a56 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_jxyx.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_jxyx.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/room/btn_invite(1).xml b/wb_new_ui/assets/Main_Majiang/component/clearing/room/btn_invite(1).xml
index df3ea5b3..7104d0f0 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/room/btn_invite(1).xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/room/btn_invite(1).xml
@@ -1,12 +1,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
index b2789653..b879b3c0 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
index c34d43a1..fb1e3c1b 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png
index bcce46a0..af208590 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png
index 845998c8..3033d33f 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ
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 a203e2af..0e3b9c71 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
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
index c2ab6374..ab826c39 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
index 03fb3387..ee30c7fa 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
index b09406d6..da76c3f0 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ