diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index fe08c682..0ecf51d2 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -196,7 +196,12 @@ local function __fillRoomItem(self, index, item, room) --printlog("wwwwwwwwwww1111111111111111 ",room.round," ",room.times) - room_item.tex_round.text = room.status >= -1 and string.format('%s/%s', room.round, room.times) or "" + if room.times == 100 then + room_item.tex_round.text = '百息结算' + else + room_item.tex_round.text = room.status >= -1 and string.format('%s/%s', room.round, room.times) or "" + end + local name = __getLayerName(self, room.pid) room_item.tex_gamename.text = name room_item.tex_limit.text = str @@ -651,7 +656,7 @@ function M:InitRoomInfoView() local room = self.roominfo.room if not room.default then printlog("wwwwwwwwwww22222222222222222 ", room.round, " ", room.times) - self.roominfo.view:GetChild('tex_round').text = string.format('(%s/%s)', room.round, room.times) + self.roominfo.view:GetChild('tex_round').text = string.format('(%s====%s)', room.round, room.times) local lst_player = self.roominfo.view:GetChild('lst_player') lst_player:RemoveChildrenToPool() if room.plist and #room.plist > 0 then 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 160dd7ae..f972e270 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -94,6 +94,7 @@ function M:InitData(over, room, result, total_result, callback) self.xiPaiCtr.selectedIndex=0 _btnCtr.selectedIndex = 1 _sdkCtr.selectedIndex = 1 + printlog("btn_result00000") btn_result.onClick:Add( function() _overCtr.selectedIndex = 3 @@ -145,6 +146,17 @@ function M:InitData(over, room, result, total_result, callback) ViewManager.ChangeView(ViewManager.View_Lobby) end ) + + -- 自动跳转 + coroutine.start( + function() + coroutine.wait(3) + _overCtr.selectedIndex = 3 + _btnCtr.selectedIndex = 0 + _sdkCtr.selectedIndex = 0 + end + ) + self:AddClearItem(room, result, total_result.info_list, over) else @@ -432,6 +444,8 @@ function M:FillItemData(room, data, item) self._view:GetChild("fangpaoscore").text = "放炮扣息:-"..win_data.fangpaoscore + + if (hp_info ~= nil and room.hpOnOff == 1 or room:checkHpNonnegative()) then local isupper_limit = hp_info.upper_limit -- // 输赢是否已达上限 if (isupper_limit) then @@ -621,6 +635,11 @@ function M:FillItemData(room, data, item) end end end + + else + + + end printlog("输了:") item:RemoveChildrenToPool() @@ -708,6 +727,10 @@ function M:FillItemData(room, data, item) end end end + + + + self._view:GetChild('score_shu').text = '总胡息:' .. info_list[i].total_score end end end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua index 25e08568..50253673 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -165,9 +165,9 @@ function M:ShowHuTip(card) if card ~= nil then list_remove(player.handcard_list, card) end - printlog("jefe ting pai") + local tingList = CardCheck.tingPai(player, DataManager.CurrenRoom) - pt(tingList) + if self._mainView._hu_tip ~= nil then self._mainView._hu_tip:FillData(tingList) end diff --git a/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info b/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info index ae4e9717..758c6486 100644 --- a/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info +++ b/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info @@ -3,6 +3,9 @@ "n51_fmkv": { "collapsed": true }, + "n92_uw33": { + "hidden": true + }, "n33_n1ry": { "hidden": true } 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 00768a47..19080e07 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,13 +1,13 @@ - + - + @@ -139,7 +139,9 @@ - + + + diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml index e9d00c48..a29d4951 100644 --- a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml +++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml @@ -1,6 +1,6 @@ - + @@ -27,7 +27,7 @@ - + @@ -69,14 +69,14 @@ - + - - - - + + + + diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml index 942908df..55a53fe1 100644 --- a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml +++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml @@ -2,18 +2,18 @@ - +