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 d2ae2f83..f294f86c 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -102,6 +102,15 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) end obj:GetChild("score").text = jifen .. tili .. limit + if info.seat == room.self_player.seat then + if roundScore >= 0 then + bgWindow.text = "胜利" + bgWindow:GetController('bianhui').selectedIndex = 0 + else + bgWindow.text = "失败" + bgWindow:GetController('bianhui').selectedIndex = 1 + end + end else local jifen = "" if roundScore >= 0 then @@ -128,12 +137,14 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) obj:GetChild("score").text = jifen .. tili end - if info.seat == room.self_player.seat and roundScore>=0 then - bgWindow.text = "胜利" - bgWindow:GetController('bianhui').selectedIndex = 0 - else - bgWindow.text = "失败" - bgWindow:GetController('bianhui').selectedIndex = 1 + if info.seat == room.self_player.seat then + if roundScore >= 0 then + bgWindow.text = "胜利" + bgWindow:GetController('bianhui').selectedIndex = 0 + else + bgWindow.text = "失败" + bgWindow:GetController('bianhui').selectedIndex = 1 + end end local list_residue = obj:GetChild('list_residue') diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua index 41060ca2..ed0cad4c 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -40,6 +40,7 @@ function M:InitData(over, room, result, total_result, callback) local _sdkCtr = self._view:GetController('sdk') local _icon = self._view:GetChild('win_base') local btn_close = self._view:GetChild('btn_close') + local ctr_type = self._view:GetController('type') self._view:GetChild('tex_roomnum').text = room.room_id self._view:GetChild('tex_data').text = os.date('%Y-%m-%d %H:%M', os.time()) @@ -68,7 +69,25 @@ function M:InitData(over, room, result, total_result, callback) if result and result.xipai_score then xipai.text = "洗牌 积分x" .. result.xipai_score end - + if over ~= 2 then + if result.liuju then + ctr_type.selectedIndex = 2 + else + local info_list = result.info_list + for i = 1, #info_list do + local is_win = info_list[i].is_win + if is_win then + if info_list[i].seat == room.self_player.seat then + ctr_type.selectedIndex = 1 + else + ctr_type.selectedIndex = 0 + end + end + end + end + else + ctr_type.selectedIndex = 3 + end if result ~= nil and result.liuju == true then _icon.icon = 'ui://Main_RunBeard/liuju' _btnCtr.selectedIndex = 0 @@ -108,6 +127,7 @@ function M:InitData(over, room, result, total_result, callback) self:AddClearItem(room, result, total_result.info_list, over) end end + if over == 0 and result.liuju == false then --printlog("jiesuanjefeef efef ef1") _icon.icon = 'ui://Main_RunBeard/jiesuan' diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index 7d0bb1dd..5ccc1ea8 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -1,19 +1,40 @@ { "objectStatus": { + "n19_pt1r": { + "collapsed": true + }, "n85_rbpg": { "hidden": true }, + "n64_pwj4": { + "collapsed": true + }, + "n51_fmkv": { + "collapsed": true + }, "n84_rbpg": { "hidden": true }, - "n4_fux2": { + "n43_n1ry": { "hidden": true }, "n33_n1ry": { "locked": true }, - "n43_n1ry": { + "n45_n1ry": { + "collapsed": true + }, + "n70_dunj": { + "collapsed": true + }, + "n55_rx2e": { + "collapsed": true + }, + "n4_fux2": { "hidden": true + }, + "n44_n1ry": { + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml index 550affde..7834141e 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml @@ -1,20 +1,36 @@ - + - + + + + + + + + + + + + + + + + + + + - - @@ -30,7 +46,7 @@ - +