diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua index 708077cf..665584ee 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -428,13 +428,15 @@ function M:InitBigResult(room, fontsize) item:GetChild('txt_positive').text = '+' .. tostring(player_info.total_score) item2:GetChild('txt_navigate').text = string.format("总战绩:+%s", player_info.total_score) item2:GetChild('txt_daniao').text = string.format("打鸟 +%s", player_info.daniao) - item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao + item2:GetChild('text_zongjifen').text = player_info.total_score < player_info.daniao and 0 or + player_info.total_score - player_info.daniao else item:GetController('pn').selectedIndex = 0 item:GetChild('txt_navigate').text = tostring(player_info.total_score) item2:GetChild('txt_navigate').text = string.format("总战绩:%s", player_info.total_score) item2:GetChild('txt_daniao').text = string.format("打鸟 %s", player_info.daniao) - item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao + item2:GetChild('text_zongjifen').text = player_info.total_score > player_info.daniao and 0 or + player_info.total_score - player_info.daniao end end diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index 85f03107..e078dbbb 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index 8d46756e..f8239774 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index 78256ea4..ab4b6654 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 51849c74..56e7d1a4 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/wb_new_ui/.objs/metas/9n9stu2e/m9jahb.info b/wb_new_ui/.objs/metas/9n9stu2e/m9jahb.info index 097810d4..38be3b0d 100644 --- a/wb_new_ui/.objs/metas/9n9stu2e/m9jahb.info +++ b/wb_new_ui/.objs/metas/9n9stu2e/m9jahb.info @@ -9,9 +9,6 @@ "n2_tjnv": { "hidden": true }, - "n14_tjnv": { - "collapsed": true - }, "n11_tjnv": { "collapsed": true }, diff --git a/wb_new_ui/assets/Chat/Main.xml b/wb_new_ui/assets/Chat/Main.xml index 4f537c57..65946362 100644 --- a/wb_new_ui/assets/Chat/Main.xml +++ b/wb_new_ui/assets/Chat/Main.xml @@ -64,7 +64,7 @@