diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua index e22621e6..781b65a1 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua @@ -339,12 +339,13 @@ function M:FillPoker(poker, prefix, num, code) code = self:ChangeCodeByTo(num) end local suffix = code == 310 and - (DataManager.CurrenRoom.pai == 0 and (DataManager.CurrenRoom.room_config.Heart10 == 2 and "_1" or "") or "_2") or "" + (DataManager.CurrenRoom.pai == 0 and (DataManager.CurrenRoom.room_config.Heart10 == 2 and "_1" or "") or "_2") or + "" code = code == 1 and "00" or code if not poker.icon then - poker:GetChild('icon').url = string.format("ui://Extend_Poker_RunFastNew/%s%s%s", prefix, code, suffix) + poker:GetChild('icon').url = string.format("ui://Main_Poker/%s%s%s", prefix, code, suffix) else - poker.icon = string.format("ui://Extend_Poker_RunFastNew/%s%s%s", prefix, code, suffix) + poker.icon = string.format("ui://Main_Poker/%s%s%s", prefix, code, suffix) end end diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml index b4a48f22..a0032b66 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml @@ -1,14 +1,11 @@ - + - - - + - diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml index 3c6296d5..68c2fd65 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml @@ -1,6 +1,6 @@ - + @@ -77,7 +77,6 @@ - diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png index a9a62fa4..701ca322 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes index a4ce3e7d..ec2ed643 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png index 396e8ea9..05a7fd39 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes index 2a198197..5ec9d512 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes 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 1232db4f..6f77c90c 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