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 b7375b6c..160dd7ae 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -20,11 +20,11 @@ function FanPaoFa_ResultView.new(blur_view, index) end function M:init(url) - printlog("init view fanpaofa") + ResultView.init(self, url) - printlog("init view fanpaofa2") + local btn_share = self._view:GetChild('btn_share') - printlog("init view fanpaofa3") + btn_share.onClick:Set( function() ShareScreenShot() @@ -33,7 +33,6 @@ function M:init(url) end function M:InitData(over, room, result, total_result, callback) - printlog("result1") local _overCtr = self._view:GetController('over') local btn_confirm = self._view:GetChild('btn_confirm') local btn_result = self._view:GetChild('btn_showResult') @@ -71,8 +70,6 @@ function M:InitData(over, room, result, total_result, callback) xipai.text="洗牌 积分x"..result.xipai_score end - printlog("resultsss") - if result ~= nil and result.liuju == true then _icon.icon = 'ui://Main_RunBeard/liuju' _btnCtr.selectedIndex = 0 @@ -112,9 +109,7 @@ function M:InitData(over, room, result, total_result, callback) self:AddClearItem(room, result, total_result.info_list, over) end end - printlog("result2") if over == 0 and result.liuju == false then - printlog("result3") _icon.icon = 'ui://Main_RunBeard/jiesuan' _btnCtr.selectedIndex = 0 _sdkCtr.selectedIndex = 1 @@ -130,10 +125,10 @@ function M:InitData(over, room, result, total_result, callback) end end ) - printlog("result31") + self:AddClearItem(room, result, nil, over) elseif over == 1 and result.liuju == false then - printlog("result4") + _icon.icon = 'ui://Main_RunBeard/jiesuan' _btnCtr.selectedIndex = 1 _sdkCtr.selectedIndex = 1 @@ -152,7 +147,7 @@ function M:InitData(over, room, result, total_result, callback) ) self:AddClearItem(room, result, total_result.info_list, over) else - printlog("result5") + if result ~= nil then if result.liuju == false then _icon.icon = 'ui://Main_RunBeard/jiesuan' @@ -178,15 +173,13 @@ function M:InitData(over, room, result, total_result, callback) self:AddClearItem(room, nil, total_result.info_list, over) end end - - printlog("resultend") end function M:AddClearItem(room, data, total_data, over) local n = over + 1 local list_view1 = self._view:GetChild('player_list') local list_view2 = self._view:GetChild('player_list_2') - printlog("result32") + if data ~= nil and data.liuju == true then self:FillLiuJuItemData(room, data,list_view1) if over == 1 then @@ -194,7 +187,7 @@ function M:AddClearItem(room, data, total_data, over) self:FillItemData2(room, total_data, list_view2) end else - printlog("result34") + if 0 == over or 1 == over and data.liuju == false then self:FillItemData(room, data, list_view1) if 1 == over then @@ -203,7 +196,7 @@ function M:AddClearItem(room, data, total_data, over) elseif 2 == over then self:FillItemData2(room, total_data, list_view2) end - printlog("result35") + end end @@ -211,15 +204,12 @@ function M:GetPos(room, seat) return ViewUtil.GetPos(room.self_player.seat, seat, room.room_config.people_num) end function M:FillLiuJuItemData(room, data,item) - printlog("FillLiuJuItemData") + local qipai_list = self._view:GetChild('qipai_listl') local _dipaiC = self._view:GetController('qipai') - - pt(data) - qipai_list:RemoveChildrenToPool() - printlog("FillLiuJuItemData1") + if data.throw_card ~= nil and #data.throw_card > 0 then _dipaiC.selectedIndex = 1 local hand_card = PendulumRule.GetHandCard(data.throw_card, 3) @@ -232,7 +222,7 @@ function M:FillLiuJuItemData(room, data,item) else _dipaiC.selectedIndex = 0 end - printlog("FillLiuJuItemData2") + for i = 1, #data.info_list do if data.info_list[i].seat == room.banker_seat then local p = room:GetPlayerBySeat(data.info_list[i].seat) @@ -244,7 +234,7 @@ function M:FillLiuJuItemData(room, data,item) - if data.info_list[i].seat ~= room.self_player.seat and #data.info_list[i].hand_card > 0 then + if data.info_list[i].seat == room.banker_seat and #data.info_list[i].hand_card > 0 then local card_list --[[if #data.info_list == 2 then card_list = self._view:GetChild('card_list_2') @@ -256,9 +246,9 @@ function M:FillLiuJuItemData(room, data,item) end end]] card_list = self._view:GetChild('card_list_2') - printlog("FillLiuJuItemData3") + card_list:RemoveChildrenToPool() - pt(data.info_list[i].opCardList) + for k = 1, #data.info_list[i].opCardList do local fztype = data.info_list[i].opCardList[k].type @@ -269,7 +259,7 @@ function M:FillLiuJuItemData(room, data,item) end end end - printlog("FillLiuJuItemData4") + local hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3) for k = 1, #hand_card do local item = card_list:AddItemFromPool() @@ -278,14 +268,13 @@ function M:FillLiuJuItemData(room, data,item) end end - printlog("FillLiuJuItemData5") end end item:RemoveChildrenToPool() local info_list = data.info_list for i = 1, #info_list do - if info_list[i].is_win == false then + if info_list[i].is_win == false and info_list[i].seat ~= room.banker_seat then local player = item:AddItemFromPool() local p = room:GetPlayerBySeat(info_list[i].seat) if p.self_user.account_id == room.owner_id then @@ -373,7 +362,7 @@ function M:FillLiuJuItemData(room, data,item) end function M:FillItemData(room, data, item) - printlog("FillItemData") + local dipai_list = self._view:GetChild('dipai_list') dipai_list:RemoveChildren(0, -1, true) if data.left_card ~= nil and #data.left_card > 0 then diff --git a/wb_new_ui/.objs/metas/ppu1wv76/j4mf9f.info b/wb_new_ui/.objs/metas/ppu1wv76/j4mf9f.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/ppu1wv76/j4mf9f.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info b/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info index 90df6874..ae4e9717 100644 --- a/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info +++ b/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info @@ -3,12 +3,6 @@ "n51_fmkv": { "collapsed": true }, - "n58_fnpw": { - "collapsed": true - }, - "n19_pt1r": { - "collapsed": 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 55a0efaa..00768a47 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,11 +1,11 @@ - + - + @@ -61,7 +61,7 @@ - + diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_1_item.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_1_item.xml index e7c20d4d..77327530 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_1_item.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_1_item.xml @@ -20,7 +20,7 @@ - + diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_2_item.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_2_item.xml index ff3a9d9a..9f281259 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_2_item.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_2_item.xml @@ -13,13 +13,13 @@ - + - + diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room3.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room3.xml index 179c05a7..03749447 100644 --- a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room3.xml +++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room3.xml @@ -2,18 +2,18 @@ - +