From fa249abd24565d29ffd183596910c4605dd72661 Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Tue, 10 Feb 2026 21:53:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zipai/fanpaofa/FanPaoFa_ResultView.lua | 476 +++++++++--------- wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info | 3 - wb_new_ui/.objs/workspace.json | 23 +- .../component/clearing/FullName.xml | 6 +- .../component/clearing/card_item.xml | 26 +- .../component/clearing/clearing.xml | 110 ++-- .../component/clearing/image/hu_1.png | Bin 9823 -> 5867 bytes .../component/clearing/image/hu_10.png | Bin 10448 -> 6603 bytes .../component/clearing/image/hu_11.png | Bin 9679 -> 5940 bytes .../component/clearing/image/hu_12.png | Bin 7089 -> 6040 bytes .../component/clearing/image/hu_13.png | Bin 7309 -> 6023 bytes .../component/clearing/image/hu_14.png | Bin 7446 -> 6273 bytes .../component/clearing/image/hu_15.png | Bin 7199 -> 5889 bytes .../component/clearing/image/hu_16.png | Bin 7035 -> 5940 bytes .../component/clearing/image/hu_17.png | Bin 7284 -> 6174 bytes .../component/clearing/image/hu_18.png | Bin 6463 -> 5929 bytes .../component/clearing/image/hu_19.png | Bin 6335 -> 5147 bytes .../component/clearing/image/hu_2.png | Bin 9562 -> 5742 bytes .../component/clearing/image/hu_20.png | Bin 7117 -> 5997 bytes .../component/clearing/image/hu_21.png | Bin 8170 -> 6053 bytes .../component/clearing/image/hu_22.png | Bin 8025 -> 5904 bytes .../component/clearing/image/hu_23.png | Bin 9019 -> 6568 bytes .../component/clearing/image/hu_24.png | Bin 7052 -> 6655 bytes .../component/clearing/image/hu_25.png | Bin 9701 -> 6012 bytes .../component/clearing/image/hu_26.png | Bin 9314 -> 5566 bytes .../component/clearing/image/hu_27.png | Bin 9650 -> 6001 bytes .../component/clearing/image/hu_28.png | Bin 9457 -> 5660 bytes .../component/clearing/image/hu_29.png | Bin 4225 -> 6688 bytes .../component/clearing/image/hu_3.png | Bin 9999 -> 5937 bytes .../component/clearing/image/hu_4.png | Bin 9499 -> 5693 bytes .../component/clearing/image/hu_5.png | Bin 9759 -> 5920 bytes .../component/clearing/image/hu_6.png | Bin 9907 -> 6007 bytes .../component/clearing/image/hu_7.png | Bin 10966 -> 6622 bytes .../component/clearing/image/hu_8.png | Bin 9957 -> 5990 bytes .../component/clearing/image/hu_9.png | Bin 10382 -> 6551 bytes .../component/clearing/otherCard_item.xml | 18 +- .../component/clearing/result_zipai_main.xml | 57 ++- .../font/images/js_btn_total.png | Bin 16466 -> 57535 bytes .../Main_RunBeard/component/Main/Main_2.xml | 24 +- .../Main/component/Player_card_info_1.xml | 4 +- .../component/Main/images/zipai2.png | Bin 23951 -> 38964 bytes .../component/Main/images/zipai3.png | Bin 23951 -> 38964 bytes .../component/option/Pop_tip_choice.xml | 4 +- .../main_zipai/ui/Main_RunBeard_atlas0_2.png | Bin 2714786 -> 2761412 bytes .../main_zipai/ui/Main_RunBeard_fui.bytes | Bin 178756 -> 178756 bytes .../ui/Extend_Poker_FanPaoFa_atlas0.png | Bin 537574 -> 557022 bytes .../ui/Extend_Poker_FanPaoFa_atlas0_1.png | Bin 1971783 -> 1887197 bytes .../ui/Extend_Poker_FanPaoFa_fui.bytes | Bin 141920 -> 141719 bytes 48 files changed, 374 insertions(+), 377 deletions(-) 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 a7f7ad05..f71314c3 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -224,7 +224,7 @@ function M:FillLiuJuItemData(room, data, item) for k = 1, #hand_card do local cards = qipai_list:AddItemFromPool() for j = 1, #hand_card[k] do - cards:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) + cards:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/201_', hand_card[k][j]) end end else @@ -255,77 +255,6 @@ function M:FillLiuJuItemData(room, data, item) card_list:RemoveChildrenToPool() - for k = 1, #data.info_list[i].opCardList do - local fztype = data.info_list[i].opCardList[k].type - if fztype == RB_FZType.Kan then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 1 - cards:GetChild('card_type').text = '坎' - cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', - data.info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Peng then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 - cards:GetChild('card_type').text = '碰' - cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 1 - cards:GetChild('card_type').text = '畏' - cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', - data.info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Ti then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 - cards:GetChild('card_type').text = '提' - cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi - for j = 1, 4 do - cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', - data.info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Pao then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 - cards:GetChild('card_type').text = '跑' - cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi - for j = 1, 4 do - cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', - data.info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Chi then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 1 - cards:GetChild('card_type').text = '顺' - cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi - - cards:GetChild('card_1').icon = - self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) - cards:GetChild('card_2').icon = - self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card2) - cards:GetChild('card_3').icon = - self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card3) - else - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 1 - cards:GetChild('card_type').text = '将' - cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi - cards:GetChild('card_1').icon = - self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) - cards:GetChild('card_2').icon = - self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card2) - end - end - local hand_card = {} if #data.info_list[i].hand_card >= 2 then hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3) @@ -335,7 +264,7 @@ function M:FillLiuJuItemData(room, data, item) cards:GetChild('card_huxi').text = hand_card[k].hu_xi for j = 1, #hand_card[k] do cards:GetChild('card_' .. (j)).icon = - self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) + self:getCardItem('ui://Main_RunBeard/201_', hand_card[k][j]) end end else @@ -344,7 +273,78 @@ function M:FillLiuJuItemData(room, data, item) local item = card_list:AddItemFromPool() item:GetController('c1').selectedIndex = 1 for j = 1, #hand_card do - item:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[j]) + item:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/201_', hand_card[j]) + end + end + + for k = #data.info_list[i].opCardList, 1, -1 do + local fztype = data.info_list[i].opCardList[k].type + if fztype == RB_FZType.Kan then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 1 + cards:GetChild('card_huxi').text = '坎' + cards:GetChild('card_type').text = data.info_list[i].opCardList[k].hu_xi + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/201_', + data.info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Peng then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = '碰' + cards:GetChild('card_type').text = data.info_list[i].opCardList[k].hu_xi + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', data.info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 1 + cards:GetChild('card_huxi').text = '畏' + cards:GetChild('card_type').text = data.info_list[i].opCardList[k].hu_xi + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/201_', + data.info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Ti then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = '提' + cards:GetChild('card_type').text = data.info_list[i].opCardList[k].hu_xi + for j = 1, 4 do + cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/201_', + data.info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Pao then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = '跑' + cards:GetChild('card_type').text = data.info_list[i].opCardList[k].hu_xi + for j = 1, 4 do + cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/201_', + data.info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Chi then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 1 + cards:GetChild('card_huxi').text = '顺' + cards:GetChild('card_type').text = data.info_list[i].opCardList[k].hu_xi + + cards:GetChild('card_1').icon = + self:getCardItem('ui://Main_RunBeard/201_', data.info_list[i].opCardList[k].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/201_', data.info_list[i].opCardList[k].card2) + cards:GetChild('card_3').icon = + self:getCardItem('ui://Main_RunBeard/201_', data.info_list[i].opCardList[k].card3) + else + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 1 + cards:GetChild('card_huxi').text = '将' + cards:GetChild('card_type').text = data.info_list[i].opCardList[k].hu_xi + cards:GetChild('card_1').icon = + self:getCardItem('ui://Main_RunBeard/201_', data.info_list[i].opCardList[k].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/201_', data.info_list[i].opCardList[k].card2) end end end @@ -384,101 +384,101 @@ function M:FillLiuJuItemData(room, data, item) end local card_list = player:GetChild('card_list') card_list:RemoveChildrenToPool() - for k = 1, #info_list[i].opCardList do - local fztype = info_list[i].opCardList[k].type - if fztype == RB_FZType.Chi then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 - cards:GetChild('card_type').text = '顺' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - - cards:GetChild('card_1').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - cards:GetChild('card_2').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card2) - cards:GetChild('card_3').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card3) - elseif fztype == RB_FZType.Peng then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 - cards:GetChild('card_type').text = '碰' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Kan then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 - cards:GetChild('card_type').text = '坎' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 - cards:GetChild('card_type').text = '畏' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Pao then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 - cards:GetChild('card_type').text = '跑' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - for j = 1, 4 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Ti then - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 - cards:GetChild('card_type').text = '提' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - for j = 1, 4 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - else - local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 1 - cards:GetChild('card_type').text = '将' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - cards:GetChild('card_1').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - cards:GetChild('card_2').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card2) - end - end if #info_list[i].hand_card > 0 then --local hand_card = PendulumRule.GetHandCard(info_list[i].hand_card, 3) local hand_card if #info_list[i].hand_card > 2 then hand_card = PendulumRule.GetHandCard(info_list[i].hand_card, 3) - for k = 1, #hand_card do + for k = #hand_card, 1, -1 do local cards = card_list:AddItemFromPool() cards:GetController('c1').selectedIndex = 2 cards:GetChild('card_huxi').text = hand_card[k].hu_xi for j = 1, #hand_card[k] do cards:GetChild('card_' .. (j)).icon = - self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) + self:getCardItem('ui://Main_RunBeard/201_', hand_card[k][j]) end end else hand_card = info_list[i].hand_card local cards = card_list:AddItemFromPool() cards:GetController('c1').selectedIndex = 2 - for j = 1, #hand_card do + for j = #hand_card, 1, -1 do cards:GetChild('card_' .. (j)).icon = - self:getCardItem('ui://Main_RunBeard/202_', hand_card[j]) + self:getCardItem('ui://Main_RunBeard/201_', hand_card[j]) end end end + for k = #info_list[i].opCardList, 1, -1 do + local fztype = info_list[i].opCardList[k].type + if fztype == RB_FZType.Chi then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = '顺' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + + cards:GetChild('card_1').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card2) + cards:GetChild('card_3').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card3) + elseif fztype == RB_FZType.Peng then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = '碰' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Kan then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = '坎' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = '畏' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Pao then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = '跑' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + for j = 1, 4 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Ti then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = '提' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + for j = 1, 4 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + else + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 1 + cards:GetChild('card_huxi').text = '将' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + cards:GetChild('card_1').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card2) + end + end end end end @@ -505,7 +505,7 @@ function M:FillItemData(room, data, item) for k = 1, #hand_card do local cards = qipai_list:AddItemFromPool() for j = 1, #hand_card[k] do - cards:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) + cards:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/201_', hand_card[k][j]) end end else @@ -637,12 +637,12 @@ function M:FillItemData(room, data, item) end end end]] - for i = 1, #win_data.opCardList do + for i = #win_data.opCardList, 1, -1 do local fztype = win_data.opCardList[i].type if fztype == RB_FZType.Chi then local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '顺' - cards:GetChild('card_huxi').text = win_data.opCardList[i].hu_xi + cards:GetChild('card_huxi').text = '顺' + cards:GetChild('card_type').text = win_data.opCardList[i].hu_xi cards:GetController('c1').selectedIndex = 1 cards:GetChild('card_1').icon = self:getCardItem('ui://Main_RunBeard/201_', win_data.opCardList[i].card1) @@ -664,8 +664,8 @@ function M:FillItemData(room, data, item) end elseif fztype == RB_FZType.Peng then local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '碰' - cards:GetChild('card_huxi').text = win_data.opCardList[i].hu_xi + cards:GetChild('card_huxi').text = '碰' + cards:GetChild('card_type').text = win_data.opCardList[i].hu_xi cards:GetController('c1').selectedIndex = 1 for j = 1, 3 do cards:GetChild('card_' .. j).icon = @@ -677,8 +677,8 @@ function M:FillItemData(room, data, item) end elseif fztype == RB_FZType.Kan then local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '坎' - cards:GetChild('card_huxi').text = win_data.opCardList[i].hu_xi + cards:GetChild('card_huxi').text = '坎' + cards:GetChild('card_type').text = win_data.opCardList[i].hu_xi cards:GetController('c1').selectedIndex = 1 if win_data.opCardList[i].card1 == win_data.win_card and isWin_Card == true then isWin_Card = false @@ -690,8 +690,8 @@ function M:FillItemData(room, data, item) end elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '畏' - cards:GetChild('card_huxi').text = win_data.opCardList[i].hu_xi + cards:GetChild('card_huxi').text = '畏' + cards:GetChild('card_type').text = win_data.opCardList[i].hu_xi cards:GetController('c1').selectedIndex = 1 if win_data.opCardList[i].card1 == win_data.win_card and isWin_Card == true then isWin_Card = false @@ -703,8 +703,8 @@ function M:FillItemData(room, data, item) end elseif fztype == RB_FZType.Pao then local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '跑' - cards:GetChild('card_huxi').text = win_data.opCardList[i].hu_xi + cards:GetChild('card_huxi').text = '跑' + cards:GetChild('card_type').text = win_data.opCardList[i].hu_xi cards:GetController('c1').selectedIndex = 2 if win_data.opCardList[i].card1 == win_data.win_card and isWin_Card == true then isWin_Card = false @@ -716,8 +716,8 @@ function M:FillItemData(room, data, item) end elseif fztype == RB_FZType.Ti then local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '提' - cards:GetChild('card_huxi').text = win_data.opCardList[i].hu_xi + cards:GetChild('card_huxi').text = '提' + cards:GetChild('card_type').text = win_data.opCardList[i].hu_xi cards:GetController('c1').selectedIndex = 2 if win_data.opCardList[i].card1 == win_data.win_card and isWin_Card == true then isWin_Card = false @@ -729,17 +729,17 @@ function M:FillItemData(room, data, item) end else local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '将' - cards:GetChild('card_huxi').text = win_data.opCardList[i].hu_xi + cards:GetChild('card_huxi').text = '将' + cards:GetChild('card_type').text = win_data.opCardList[i].hu_xi cards:GetController('c1').selectedIndex = 0 if win_data.opCardList[i].card1 == win_data.win_card and isWin_Card == true then isWin_Card = false cards:GetController('hu').selectedIndex = 0 end cards:GetChild('card_1').icon = - self:getCardItem('ui://Main_RunBeard/202_', win_data.opCardList[i].card1) + self:getCardItem('ui://Main_RunBeard/201_', win_data.opCardList[i].card1) cards:GetChild('card_2').icon = - self:getCardItem('ui://Main_RunBeard/202_', win_data.opCardList[i].card1) + self:getCardItem('ui://Main_RunBeard/201_', win_data.opCardList[i].card1) end end --printlog("FillItemData11333333") @@ -796,90 +796,88 @@ function M:FillItemData(room, data, item) end local card_list = player:GetChild('card_list') card_list:RemoveChildrenToPool() - for k = 1, #info_list[i].opCardList do - local fztype = info_list[i].opCardList[k].type - if fztype == RB_FZType.Chi then - local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '顺' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - cards:GetController('c1').selectedIndex = 1 - - cards:GetChild('card_1').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - cards:GetChild('card_2').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card2) - cards:GetChild('card_3').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card3) - elseif fztype == RB_FZType.Peng then - local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '碰' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - cards:GetController('c1').selectedIndex = 1 - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Kan then - local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '坎' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - cards:GetController('c1').selectedIndex = 1 - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then - local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '畏' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - cards:GetController('c1').selectedIndex = 1 - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Pao then - local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '跑' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - cards:GetController('c1').selectedIndex = 2 - for j = 1, 4 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - elseif fztype == RB_FZType.Ti then - local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '提' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - cards:GetController('c1').selectedIndex = 2 - for j = 1, 4 do - cards:GetChild('card_' .. j).icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - end - else - local cards = card_list:AddItemFromPool() - cards:GetChild('card_type').text = '将' - cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi - cards:GetController('c1').selectedIndex = 0 - cards:GetChild('card_1').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1) - cards:GetChild('card_2').icon = - self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card2) - end - end if #info_list[i].hand_card > 0 then local hand_card = PendulumRule.GetHandCard(info_list[i].hand_card, 3) - for k = 1, #hand_card do + for k = #hand_card, 1, -1 do local cards = card_list:AddItemFromPool() cards:GetController('c1').selectedIndex = 2 for j = 1, #hand_card[k] do cards:GetChild('card_' .. (j)).icon = - self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) + self:getCardItem('ui://Main_RunBeard/201_', hand_card[k][j]) end end end + for k = #info_list[i].opCardList, 1, -1 do + local fztype = info_list[i].opCardList[k].type + if fztype == RB_FZType.Chi then + local cards = card_list:AddItemFromPool() + cards:GetChild('card_huxi').text = '顺' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + cards:GetController('c1').selectedIndex = 1 - + cards:GetChild('card_1').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card2) + cards:GetChild('card_3').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card3) + elseif fztype == RB_FZType.Peng then + local cards = card_list:AddItemFromPool() + cards:GetChild('card_huxi').text = '碰' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + cards:GetController('c1').selectedIndex = 1 + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Kan then + local cards = card_list:AddItemFromPool() + cards:GetChild('card_huxi').text = '坎' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + cards:GetController('c1').selectedIndex = 1 + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then + local cards = card_list:AddItemFromPool() + cards:GetChild('card_huxi').text = '畏' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + cards:GetController('c1').selectedIndex = 1 + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Pao then + local cards = card_list:AddItemFromPool() + cards:GetChild('card_huxi').text = '跑' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + cards:GetController('c1').selectedIndex = 2 + for j = 1, 4 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + elseif fztype == RB_FZType.Ti then + local cards = card_list:AddItemFromPool() + cards:GetChild('card_huxi').text = '提' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + cards:GetController('c1').selectedIndex = 2 + for j = 1, 4 do + cards:GetChild('card_' .. j).icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + end + else + local cards = card_list:AddItemFromPool() + cards:GetChild('card_huxi').text = '将' + cards:GetChild('card_type').text = info_list[i].opCardList[k].hu_xi + cards:GetController('c1').selectedIndex = 0 + cards:GetChild('card_1').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/201_', info_list[i].opCardList[k].card2) + end + end -- self._view:GetChild('score_shu').text = '总胡息:' .. info_list[i].total_score end diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index c0a6e44e..d04551a1 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -6,9 +6,6 @@ "n84_rbpg": { "hidden": true }, - "n64_pwj4": { - "collapsed": true - }, "n4_fux2": { "hidden": true } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index b367ec0c..ef3b6a8b 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -3,16 +3,21 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://lkq9ne9speuq8b", + "ui://lkq9ne9speuq5a", "ui://lkq9ne9speuq6e", "ui://lkq9ne9speuq6r", - "ui://1utjt0r2ufu929", "ui://1utjt0r2ufu92i", - "ui://1utjt0r2ufu923" + "ui://1utjt0r2ufu930", + "ui://1utjt0r2ufu923", + "ui://1utjt0r2ufu92u", + "ui://1utjt0r2ufu929", + "ui://lkq9ne9speuq9n", + "ui://lkq9ne9speuq9g" ], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://1utjt0r2ufu92i", + "doc.activeDoc": "ui://lkq9ne9speuq9n", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -35,8 +40,14 @@ "/component/clearing/image/", "1utjt0r2", "/images/", - "1utjt0r2", - "/mgr/", + "v0j9abjy", + "/", + "v0j9abjy", + "/images/", + "v0j9abjy", + "/images/cards/", + "v0j9abjy", + "/images/cards/2/", "lkq9ne9s", "/", "lkq9ne9s", @@ -74,8 +85,6 @@ "lkq9ne9s", "/component/setting/", "lkq9ne9s", - "/component/setting/images/", - "lkq9ne9s", "/image/", "lkq9ne9s", "/images/", diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/FullName.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/FullName.xml index e97a6cd7..60acb820 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/FullName.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/FullName.xml @@ -1,9 +1,9 @@ - + - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml index 7895eba6..7dea145a 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml @@ -1,23 +1,23 @@ - - - + + + - + - + - - - - - - - + + + + + + + - + \ 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 01cf8a3a..3f9eba80 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,17 +1,19 @@ - - - + + + - + - - - + + + + + @@ -19,53 +21,49 @@ - - -