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 @@ - + -