From 6fefee5067c313bcfad2b8a2bdc31461e06d19b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Tue, 29 Apr 2025 10:48:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A2=AD=E5=93=88=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/poker/runfast/RunFast_MainView.lua | 69 ++++-------------- .../poker/runfast/RunFast_PlayerBackView.lua | 2 +- .../poker/runfast/RunFast_ResultView.lua | 1 - .../runfast/RunFast_ResultView_jiangxi.lua | 34 +++++++++ .../ui/Extend_Poker_RunFastNew_fui.bytes | Bin 159276 -> 159276 bytes 5 files changed, 50 insertions(+), 56 deletions(-) create mode 100644 lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView_jiangxi.lua diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index f6f7bcbb..ef1de00c 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -6,7 +6,7 @@ local PKMainView = import("main.poker.PKMainView") local RunFast_PlayerPokerInfoView = import(".RunFast_PlayerPokerInfoView") local RunFast_PlayerSelfPokerInfoView = import(".RunFast_PlayerSelfPokerInfoView") local RunFast_GameEvent = import(".RunFast_GameEvent") -local RunFast_ResultView = import(".RunFast_ResultView") +local RunFast_ResultView = import(".RunFast_ResultView_jiangxi") local RunFast_RightPanelView = import(".RunFast_RightPanelView") local PlayerInfoView = import(".EXPlayerInfoView") local TableBG = import('Game.Data.TableBG') @@ -577,12 +577,10 @@ function M:EventInit() local otherList = arg[5] local length = arg[6] self.ctr_time.selectedIndex = 0 - print("lingmengOnPlaySucc", p, card_number, cardstype, num, otherList) local index = self:GetPos(p.seat) if index == 1 then self.caozuo = 0 end - print("lingmengOnPlaySucc1") local head_info = self._player_info[index] if head_info._view:GetChild("shengyu") ~= nil then @@ -593,18 +591,15 @@ function M:EventInit() head_info._view:GetChild("shengyu"):GetChild("shengyu").text = "剩" .. card_number .. "张" end end - print("lingmengOnPlaySucc2") local card_info = self._player_card_info[index] card_info:SetOutCardInfo(p.out_card_list, false, true) - print("lingmengOnPlaySucc3") for i = 1, #otherList do local other_seat = otherList[i] local other_card_info = self._player_card_info[self:GetPos(other_seat)] other_card_info:SetOutCardBlack() end - print("lingmengOnPlaySucc4") if index == 1 then card_info:DeleteHandCards(p.out_card_list) @@ -612,7 +607,6 @@ function M:EventInit() card_info:SetRemainCardNumber(card_number == 1) --card_info:UpdateHandPoker(card_number,false,false) -- todo end - print("lingmengOnPlaySucc5") if self._room.is_new_bout == true then for i = 1, #self._room.player_list do @@ -654,7 +648,6 @@ function M:EventInit() self:_Effect(cardstype, p) end end - print("lingmengOnPlaySucc6") self:PlaySound(p.self_user.sex, self:GetSoundFileName(cardstype, num, self._room.is_new_bout)) if card_number == 1 then @@ -669,7 +662,6 @@ function M:EventInit() self:PlaySound(p.self_user.sex, "card_1") end) end - print("lingmengOnPlaySucc7") end) @@ -845,10 +837,10 @@ function M:EventInit() local remaincards = arg[4] -- local energyTab = arg[5] local otherpoker_list = self._view:GetChild("otherpoker_list") + local card_info = self._player_card_info[self:GetPos(self._room.self_player.seat)] if self.MypokerList ~= nil then -- body - local card_info = self._player_card_info[self:GetPos(self._room.self_player.seat)] card_info:Clear() card_info:InitPoker(self.MypokerList, false) self.MypokerList = nil @@ -859,50 +851,6 @@ function M:EventInit() otherpoker_list.visible = true end - if remaincards then - -- body - local newremaincards = _gamectr:ChangeCodeByFrom(remaincards, true) - table.sort(remaincards) - for i = #newremaincards, 1, -1 do - coroutine.start(function() - coroutine.wait(0.01) - - local flow = newremaincards[i] % 10 - local num = (newremaincards[i] - (newremaincards[i] % 10)) / 10 - local card_n = flow * 100 + num - local poker_item = UIPackage.CreateObject("Extend_Poker_RunFastNew", "poker6") - - --local code = self:ChangeCodeByTo(card_n) - -- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFast/" .. card_n) - -- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2") - local card_code_obj = nil - if DataManager.CurrenRoom.pai == 0 then - if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then - -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .. - "_1") - else - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n) - end - else - if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then - -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .. - "_2") - else - card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2") - end - end - if card_code_obj ~= nil then - card_code_obj:SetScale(0.6, 0.6) - if poker_item ~= nil then - poker_item:AddChild(card_code_obj) - otherpoker_list:AddChild(poker_item) - end - end - end) - end - end if self._cor_sound ~= nil then coroutine.stop(self._cor_sound) self._cor_sound = nil @@ -916,6 +864,19 @@ function M:EventInit() self.destory_win = coroutine.start(function() -- -- print("11111111111111") -- coroutine.wait(1) + if remaincards then + -- body + card_info._view_Out:RemoveChildrenToPool() + + local newremaincards = _gamectr:ChangeCodeByFrom(remaincards, true) + table.sort(remaincards) + for i = #newremaincards, 1, -1 do + coroutine.wait(0.5) + local child_card = card_info._view_Out:AddItemFromPool() + card_info:FillPoker(child_card, "", newremaincards[i]) + end + end + coroutine.wait(1) if self._room.self_player.seat == win_seat then local sprint_seat_list = self:GetSpringSeats(info) if #sprint_seat_list > 0 then diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua index 36a281e6..aab7e6c6 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua @@ -7,7 +7,7 @@ local RunFast_PlayerCardInfoView = import('.RunFast_PlayerPokerInfoView') local RunFast_PlayerSelfCardInfoView = import('.RunFast_PlayerSelfPokerInfoView') local PlayerInfoView = import('.EXPlayerInfoView') local RunFast_RightPanelView = import(".RunFast_RightPanelView") -local RunFast_ResultView = import(".RunFast_ResultView") +local RunFast_ResultView = import(".RunFast_ResultView_jiangxi") local M = {} local RunFast_Record_Event = { 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 86df6aad..828b253f 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -124,7 +124,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards) for k = 1, #data[i].outCards do local code = data[i].outCards[k] local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) - print("==================================================card_code_obj", card_code_obj, code) leftCard:AddChild(card_code_obj) card_code_obj:GetChildAt(0):GetChildAt(0).color = Color(0.7, 0.7, 0.7) end diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView_jiangxi.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView_jiangxi.lua new file mode 100644 index 00000000..03e5fa2a --- /dev/null +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView_jiangxi.lua @@ -0,0 +1,34 @@ +--- +--- Created by 谌建军. +--- DateTime: 2017/12/19 11:05 +--- +require("Game.View.ResultView") + +local RunFast_ResultView = {} + +local M = RunFast_ResultView + +function RunFast_ResultView.new(blur_view, data, roomid, over, win_seat, dissolve, remaincards) + setmetatable(M, { __index = ResultView }) + local self = setmetatable({}, { __index = M }) + + self.class = "RunFast_ResultView" + self._currenIndex = 0 + self._close_zone = false + --self._blur_view = blur_view + self._gamectr = ControllerManager.GetController(GameController) + self:init("ui://Extend_Poker_RunFastNew/clearing", data, roomid, over, win_seat, dissolve, remaincards) + return self +end + +function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) + ResultView.init(self, url, true) + + self._view:GetController('over').selectedIndex = over + + self._view:GetChild('btn_nextRound').onClick:Set(function() + + end) +end + +return M diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes index 54e25d280b777e96a0dea07d9b167ff37b6fafc7..7b801c0df23aea3c65518273db0bc161ab74d39f 100644 GIT binary patch delta 4636 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