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 54e25d28..7b801c0d 100644 Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ