From 8d6ec31ebb2ee945717fdb00a37b9b8daf49075e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Mon, 26 May 2025 01:39:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=91=E5=BE=97=E5=BF=AB=E6=8D=A2=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../runfast/RunFast_PlayerPokerInfoView.lua | 173 +++++------ .../RunFast_PlayerSelfPokerInfoView.lua | 282 +++++++++--------- .../component/newcard/1/101.xml | 14 +- .../component/newcard/1/102.xml | 14 +- .../component/newcard/1/103.xml | 14 +- .../component/newcard/1/104.xml | 14 +- .../component/newcard/1/105.xml | 14 +- .../component/newcard/1/106.xml | 14 +- .../component/newcard/1/107.xml | 14 +- .../component/newcard/1/108.xml | 14 +- .../component/newcard/1/109.xml | 14 +- .../component/newcard/1/110.xml | 14 +- .../component/newcard/1/111.xml | 14 +- .../component/newcard/1/112.xml | 14 +- .../component/newcard/1/113.xml | 14 +- .../component/newcard/1/114.xml | 14 +- .../component/newcard/2/201.xml | 10 +- .../component/newcard/2/202.xml | 10 +- .../component/newcard/2/203.xml | 10 +- .../component/newcard/2/204.xml | 10 +- .../component/newcard/2/205.xml | 10 +- .../component/newcard/2/206.xml | 10 +- .../component/newcard/2/207.xml | 10 +- .../component/newcard/2/208.xml | 10 +- .../component/newcard/2/209.xml | 10 +- .../component/newcard/2/210.xml | 10 +- .../component/newcard/2/211.xml | 10 +- .../component/newcard/2/212.xml | 10 +- .../component/newcard/2/213.xml | 10 +- .../component/newcard/2/214.xml | 10 +- .../component/newcard/3/301.xml | 10 +- .../component/newcard/3/302.xml | 10 +- .../component/newcard/3/303.xml | 10 +- .../component/newcard/3/304.xml | 10 +- .../component/newcard/3/305.xml | 10 +- .../component/newcard/3/306.xml | 10 +- .../component/newcard/3/307.xml | 10 +- .../component/newcard/3/308.xml | 10 +- .../component/newcard/3/309.xml | 10 +- .../component/newcard/3/310.xml | 10 +- .../component/newcard/3/310_1.xml | 10 +- .../component/newcard/3/310_2.xml | 10 +- .../component/newcard/3/311.xml | 10 +- .../component/newcard/3/312.xml | 10 +- .../component/newcard/3/313.xml | 10 +- .../component/newcard/3/314.xml | 10 +- .../component/newcard/4/401.xml | 10 +- .../component/newcard/4/402.xml | 10 +- .../component/newcard/4/403.xml | 10 +- .../component/newcard/4/404.xml | 10 +- .../component/newcard/4/405.xml | 10 +- .../component/newcard/4/406.xml | 10 +- .../component/newcard/4/407.xml | 10 +- .../component/newcard/4/408.xml | 10 +- .../component/newcard/4/409.xml | 10 +- .../component/newcard/4/410.xml | 10 +- .../component/newcard/4/411.xml | 10 +- .../component/newcard/4/412.xml | 10 +- .../component/newcard/4/413.xml | 10 +- .../component/newcard/4/414.xml | 10 +- .../component/newcard/4/415.xml | 10 +- .../component/newcard/di(1).xml | 4 +- .../component/poker/poker12.5.xml | 2 +- wb_new_ui/assets/Main_Poker/newcard/1/101.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/102.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/103.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/104.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/105.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/106.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/107.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/108.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/109.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/110.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/111.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/112.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/113.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/1/114.xml | 10 +- wb_new_ui/assets/Main_Poker/newcard/di(1).xml | 4 +- 78 files changed, 650 insertions(+), 601 deletions(-) diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua index ccf35bb4..c8b807f3 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua @@ -10,17 +10,15 @@ local RunFast_PlayerPokerInfoView = { local M = RunFast_PlayerPokerInfoView -function M.new( view,mainView ) +function M.new(view, mainView) local self = {} - setmetatable(self, {__index = M}) + setmetatable(self, { __index = M }) self._view = view self._mainView = mainView self:init() return self end - - function M:init() local view = self._view self._gameCtr = ControllerManager.GetController(GameController) @@ -41,8 +39,8 @@ function M:init() self.ani_result_score = view:GetTransition("score_1") end -function M:SetOutCardInfo(cardlist,isPass,isAnim) - self.outpoker_list:RemoveChildren(0,-1,true) +function M:SetOutCardInfo(cardlist, isPass, isAnim) + self.outpoker_list:RemoveChildren(0, -1, true) if cardlist == nil then if isPass == true then self.ctr_outpoker.selectedIndex = 2 @@ -71,22 +69,20 @@ function M:SetOutCardInfo(cardlist,isPass,isAnim) -- -- body -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFast/"..code.."_1") -- end - if DataManager.CurrenRoom.pai==0 then - if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if DataManager.CurrenRoom.pai == 0 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code.."_1") + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1") else - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code) + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) end - else - if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code.."_2") + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2") end - end if card_code_obj == nil then card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/00") @@ -95,13 +91,15 @@ function M:SetOutCardInfo(cardlist,isPass,isAnim) poker_item:AddChild(card_code_obj) --local poker = self:CreatPoker(cardlist[i],0.7) self.outpoker_list:AddChild(poker_item) - poker_item.xy = Vector2.New(self.out_card_data["start_x"],self.out_card_data["start_y"]) - poker_item:TweenMove(self:GetOutCardEndPokerPos(i,#cardlist,self.outpoker_list,poker_item,self.out_card_data["maxcount_x"],1),time) + poker_item.xy = Vector2.New(self.out_card_data["start_x"], self.out_card_data["start_y"]) + poker_item:TweenMove( + self:GetOutCardEndPokerPos(i, #cardlist, self.outpoker_list, poker_item, self.out_card_data + ["maxcount_x"], 1), time) --card_code_obj -- self.tween = TweenUtils.TweenFloat(1,0.7,time,function(x) -- card_code_obj:SetScale(x,x) -- end) - card_code_obj:SetScale(0.7,0.7) + card_code_obj:SetScale(0.7, 0.7) end self.move_cor = coroutine.start(function() coroutine.wait(0.1) @@ -112,31 +110,30 @@ function M:SetOutCardInfo(cardlist,isPass,isAnim) local poker_item = UIPackage.CreateObject("Extend_Poker_RunFastNew", "poker7") local code = self:ChangeCodeByTo(cardlist[i]) local card_code_obj - if DataManager.CurrenRoom.pai==0 then - if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if DataManager.CurrenRoom.pai == 0 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code.."_1") + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1") else - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code) + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) end - else - if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code.."_2") + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2") end - end if card_code_obj == nil then card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/00") end - card_code_obj:SetScale(0.7,0.7) + card_code_obj:SetScale(0.7, 0.7) poker_item:AddChild(card_code_obj) --local poker = self:CreatPoker(cardlist[i],0.7) self.outpoker_list:AddChild(poker_item) - poker_item.xy = self:GetOutCardEndPokerPos(i,#cardlist,self.outpoker_list,poker_item,self.out_card_data["maxcount_x"],1) + poker_item.xy = self:GetOutCardEndPokerPos(i, #cardlist, self.outpoker_list, poker_item, + self.out_card_data["maxcount_x"], 1) end end --self.ctr_outpoker.selectedIndex = 1 @@ -145,23 +142,24 @@ end function M:SetOutCardBlack() for i = 0, self.outpoker_list.numChildren - 1 do - self.outpoker_list:GetChildAt(i):GetChildAt(0):GetChildAt(0):GetChildAt(0).color = Color(0.7,0.7,0.7) + self.outpoker_list:GetChildAt(i):GetChildAt(0):GetChildAt(0):GetChildAt(0).color = Color(0.7, 0.7, 0.7) end end -- 12 -61 --11 58 --10 55 --46 -function M:GetOffSet(cardLength) -- 15 -70 +function M:GetOffSet(cardLength) -- 15 -70 if cardLength > 8 then - return 52--40 + return 52 --40 else - return - cardLength * 5 + 80 + return -cardLength * 5 + 80 end end -function M:GetOutCardEndFirstPokerPos(count,parent_com,poker_obj,max_count,scale) - local parent_width,parent_height = parent_com.width,parent_com.height - local poker_width,poker_height = poker_obj.width * scale,poker_obj.height * scale + +function M:GetOutCardEndFirstPokerPos(count, parent_com, poker_obj, max_count, scale) + local parent_width, parent_height = parent_com.width, parent_com.height + local poker_width, poker_height = poker_obj.width * scale, poker_obj.height * scale local offset = self:GetOffSet(count) - local x,y = 0,0 + local x, y = 0, 0 --local length = (count - 1) * (poker_width + offset) + poker_width --if length <= parent_width then -- x = (parent_width - length) / 2 @@ -171,22 +169,21 @@ function M:GetOutCardEndFirstPokerPos(count,parent_com,poker_obj,max_count,scale local length = (count - 1) * offset + poker_width x = (parent_width - length) / 2 y = ((parent_height - poker_height) / 2) - end - return Vector2.New(x,y) + return Vector2.New(x, y) end -function M:GetOutCardEndPokerPos(index,count,parent_com,poker_obj,max_count,scale) - local offset_x,offset_y = self:GetOffSet(count),-50 - local start_pos = self:GetOutCardEndFirstPokerPos(count,parent_com,poker_obj,max_count,scale) - local poker_width,poker_height = poker_obj.width * scale,poker_obj.height * scale - local parent_width,parent_height = parent_com.width,parent_com.height - local pos_x,pos_y = start_pos.x + (index - 1) * offset_x,start_pos.y +function M:GetOutCardEndPokerPos(index, count, parent_com, poker_obj, max_count, scale) + local offset_x, offset_y = self:GetOffSet(count), -50 + local start_pos = self:GetOutCardEndFirstPokerPos(count, parent_com, poker_obj, max_count, scale) + local poker_width, poker_height = poker_obj.width * scale, poker_obj.height * scale + local parent_width, parent_height = parent_com.width, parent_com.height + local pos_x, pos_y = start_pos.x + (index - 1) * offset_x, start_pos.y if index > max_count then pos_x = (index - max_count - 1) * offset_x pos_y = pos_y + poker_height + offset_y end - return Vector2.New(pos_x,pos_y) + return Vector2.New(pos_x, pos_y) end -- function M:PlayCardTypeEff(type1) @@ -219,13 +216,13 @@ end -- end) -- end -function M:PlayScore(score,isBomb,isWin) +function M:PlayScore(score, isBomb, isWin) if score == nil then self.text_bomb_score.alpha = 0 return end if isBomb then - self.text_bomb_score.text = score >= 0 and "+"..score or tostring(score) + self.text_bomb_score.text = score >= 0 and "+" .. score or tostring(score) self.text_bomb_score.grayed = score < 0 self.ani_bomb_score:Play() else @@ -233,48 +230,45 @@ function M:PlayScore(score,isBomb,isWin) self.text_bomb_score.text = tostring(score) self.text_bomb_score.grayed = true elseif score > 0 then - self.text_bomb_score.text = "+"..score + self.text_bomb_score.text = "+" .. score self.text_bomb_score.grayed = false else local str = isWin and "+" or "-" - self.text_bomb_score.text = str..score + self.text_bomb_score.text = str .. score self.text_bomb_score.grayed = not isWin end self.ani_result_score:Play() end end - - - -function M:UpdateHandPoker(cardList,isPlayAni,isMing) +function M:UpdateHandPoker(cardList, isPlayAni, isMing) if self.cor_init_poker ~= nil then coroutine.stop(self.cor_init_poker) end self.cor_init_poker = nil self.card_list = {} - self.hand_card_list:RemoveChildren(0,-1,true) + self.hand_card_list:RemoveChildren(0, -1, true) local card_length local new_card_list if isMing == true then - new_card_list = self._gameCtr:ChangeCodeByFrom(cardList,true) + new_card_list = self._gameCtr:ChangeCodeByFrom(cardList, true) card_length = #cardList else card_length = cardList end if isPlayAni == true then self.cor_init_poker = coroutine.start(function() - for i = card_length, 1,-1 do + for i = card_length, 1, -1 do local code = isMing == true and new_card_list[i] or 0 coroutine.wait(0.01) - local poker = self:CreatPoker1(code,0.4) + local poker = self:CreatPoker1(code, 0.4) self.hand_card_list:AddChild(poker) end end) else - for i = card_length, 1,-1 do + for i = card_length, 1, -1 do local code = isMing == true and new_card_list[i] or 0 - local poker = self:CreatPoker1(code,0.4) + local poker = self:CreatPoker1(code, 0.4) self.hand_card_list:AddChild(poker) end end @@ -283,7 +277,7 @@ end function M:SetRemainCardNumber(isPlay) if isPlay then self.ctr_one_card.selectedIndex = 1 - self.eff_one_card:Play(-1,0,nil) + self.eff_one_card:Play(-1, 0, nil) else self.ctr_one_card.selectedIndex = 0 end @@ -293,73 +287,67 @@ function M:SetRemainCardNumber(isPlay) --end end -function M:CreatPoker1(poker,scale,bank) - - local poker_item = UIPackage.CreateObject("Extend_Poker_RunFastNew", "poker"..scale * 10) +function M:CreatPoker1(poker, scale, bank) + local poker_item = UIPackage.CreateObject("Extend_Poker_RunFastNew", "poker" .. scale * 10) local code = self:ChangeCodeByTo(poker) local card_code_obj - if DataManager.CurrenRoom.pai==0 then - if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if DataManager.CurrenRoom.pai == 0 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code.."_1") + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1") else - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code) + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) end - else - if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code.."_2") + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2") end - end - if card_code_obj == nil or bank==1 then + if card_code_obj == nil or bank == 1 then card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/00") end - card_code_obj:SetScale(scale,scale) + card_code_obj:SetScale(scale, scale) poker_item:AddChild(card_code_obj) - + return poker_item end -function M:CreatPoker(poker,scale,bank) - - local poker_item = UIPackage.CreateObject("Extend_Poker_RunFastNew", "poker"..12.5) +function M:CreatPoker(poker, scale, bank) + local poker_item = UIPackage.CreateObject("Extend_Poker_RunFastNew", "poker" .. 12.5) local code = self:ChangeCodeByTo(poker) local card_code_obj - if DataManager.CurrenRoom.pai==0 then - if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if DataManager.CurrenRoom.pai == 0 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code.."_1") + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1") else - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code) + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) end - else - if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then -- body - card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code.."_2") + card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2") end - end - if card_code_obj == nil or bank==1 then + if card_code_obj == nil or bank == 1 then card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/00") end - card_code_obj:SetScale(scale,scale) + card_code_obj:SetScale(scale, scale) poker_item:AddChild(card_code_obj) - + return poker_item end -function M:ChangeCodeByTo( card ) +function M:ChangeCodeByTo(card) local flower = card % 10 local number = math.floor(card / 10) if number == 15 then @@ -368,16 +356,15 @@ function M:ChangeCodeByTo( card ) return flower * 100 + number end - function M:Clear() self:PlayScore(nil) self:SetRemainCardNumber(false) - self:SetOutCardInfo(nil,false) - self.hand_card_list:RemoveChildren(0,-1,true) - self._mask_liangpai:RemoveChildren(0,-1,true) + self:SetOutCardInfo(nil, false) + self.hand_card_list:RemoveChildren(0, -1, true) + self._mask_liangpai:RemoveChildren(0, -1, true) end function M:Destroy() end -return M \ No newline at end of file +return M diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index 7e5e40be..28852ee0 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -17,7 +17,7 @@ local CardView = { local function NewCardView(card, cardcodenum, cardcodeflower) local self = {} - setmetatable(self, {__index = CardView}) + setmetatable(self, { __index = CardView }) self.btn_card = card self.card_code_number = cardcodenum self.card_code_flower = cardcodeflower @@ -38,8 +38,8 @@ local RunFast_PlayerSelfPokerInfoView = { local M = RunFast_PlayerSelfPokerInfoView function M.new(view, mainView) - setmetatable(M, {__index = RunFast_PlayerPokerInfoView}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = RunFast_PlayerPokerInfoView }) + local self = setmetatable({}, { __index = M }) self._view = view self._mainView = mainView self.gameCtr = ControllerManager.GetController(GameController) @@ -88,7 +88,7 @@ function M:InitPoker(pokerList, isPlayAni, open) -- self.zhizhanplay=0 -- self.zhizhanzdts=0 local cs = 1.25 - if DataManager.CurrenRoom.cardsize==0 then + if DataManager.CurrenRoom.cardsize == 0 then cs = 1.35 elseif DataManager.CurrenRoom.cardsize == 1 then cs = 1.25 @@ -107,73 +107,72 @@ function M:InitPoker(pokerList, isPlayAni, open) if isPlayAni == true then self.cor_init_poker = coroutine.start( - function() - self._mainView._popEvent = false - if self._mainView._rightPanelView._settingView ~= nil then - self._mainView._rightPanelView._settingView:SetBtnDismissRoomEnable(false) - end - table.sort(pokerList) + function() + self._mainView._popEvent = false + if self._mainView._rightPanelView._settingView ~= nil then + self._mainView._rightPanelView._settingView:SetBtnDismissRoomEnable(false) + end + table.sort(pokerList) - for i = 1, #pokerList do - local card_number_code = self:ChangeOneCodeByFrom(pokerList[i]) - local card_flower_code = pokerList[i] - local btn_card = self:CreatPoker(card_number_code, cs, open) - local x, y = self._view.width / 2 + 100, -200 - btn_card:SetXY(x, y) - btn_card.alpha = 0 - btn_card.touchable = false - -- coroutine.wait(0.05) - self.cards_view:AddChild(btn_card) - local card_view = NewCardView(btn_card, card_number_code, card_flower_code) - self.card_list[#self.card_list + 1] = card_view + for i = 1, #pokerList do + local card_number_code = self:ChangeOneCodeByFrom(pokerList[i]) + local card_flower_code = pokerList[i] + local btn_card = self:CreatPoker(card_number_code, cs, open) + local x, y = self._view.width / 2 + 100, -200 + btn_card:SetXY(x, y) + btn_card.alpha = 0 + btn_card.touchable = false + -- coroutine.wait(0.05) + self.cards_view:AddChild(btn_card) + local card_view = NewCardView(btn_card, card_number_code, card_flower_code) + self.card_list[#self.card_list + 1] = card_view - table.sort(self.card_list, tableSortNumber) + table.sort(self.card_list, tableSortNumber) - if i == #pokerList then - for j = 1, #self.card_list do - local card = self.card_list[j] - card.btn_card.touchable = true - if open ~= 1 then - -- body - self:AddCardMoveEvent(card) + if i == #pokerList then + for j = 1, #self.card_list do + local card = self.card_list[j] + card.btn_card.touchable = true + if open ~= 1 then + -- body + self:AddCardMoveEvent(card) + end end end end - end - for j = #self.card_list, 1, -1 do - -- ViewUtil.PlaySound('RunFastNew_PK', 'extend/poker/runfast/sound/mopai.mp3') - local card_view = self.card_list[j] - card_view.index = j - self.cards_view:SetChildIndex(card_view.btn_card, card_view.index - 1) + for j = #self.card_list, 1, -1 do + -- ViewUtil.PlaySound('RunFastNew_PK', 'extend/poker/runfast/sound/mopai.mp3') + local card_view = self.card_list[j] + card_view.index = j + self.cards_view:SetChildIndex(card_view.btn_card, card_view.index - 1) - card_view.btn_card:TweenMove(self:GetHandCardPos(j, #self.card_list), 0.10) - DSTween.To( - 0.7, - 1, - 0.1, - function(value) - card_view.btn_card:SetScale(value, value) - end - ) - DSTween.To( - 0.7, - 1, - 0.1, - function(value) - card_view.btn_card.alpha = value - end - ) - card_view.btn_card.alpha = 1 - end + card_view.btn_card:TweenMove(self:GetHandCardPos(j, #self.card_list), 0.10) + DSTween.To( + 0.7, + 1, + 0.1, + function(value) + card_view.btn_card:SetScale(value, value) + end + ) + DSTween.To( + 0.7, + 1, + 0.1, + function(value) + card_view.btn_card.alpha = value + end + ) + card_view.btn_card.alpha = 1 + end - self._mainView._popEvent = true - if self._mainView._rightPanelView._settingView ~= nil then - self._mainView._rightPanelView._settingView:SetBtnDismissRoomEnable(true) + self._mainView._popEvent = true + if self._mainView._rightPanelView._settingView ~= nil then + self._mainView._rightPanelView._settingView:SetBtnDismissRoomEnable(true) + end end - end - ) + ) else - for i = 1, #pokerList do local card_number_code = self:ChangeOneCodeByFrom(pokerList[i]) local card_flower_code = pokerList[i] @@ -197,7 +196,6 @@ function M:InitPoker(pokerList, isPlayAni, open) end function M:updatePoker() - local templist = {} for i = 1, #self.card_list do templist[#templist + 1] = self.card_list[i].card_code_flower @@ -246,21 +244,21 @@ function M:AddCardMoveEvent(card) if k == #self.card_list then if card.btn_card.x + self.card_width > min_x and card.btn_card.x < max_x and - card.card_isTouchable == 0 - then + card.card_isTouchable == 0 + then self:UpdateCardMove(card.btn_card, not card.btn_card.selected, false) - --ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/paodekuai/sound/click.mp3") + --ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/paodekuai/sound/click.mp3") end else if card.btn_card.x + - (self.card_width + self:GetHandCardOffset(#self.card_list)) > - min_x and - card.btn_card.x < max_x and - card.card_isTouchable == 0 - then + (self.card_width + self:GetHandCardOffset(#self.card_list)) > + min_x and + card.btn_card.x < max_x and + card.card_isTouchable == 0 + then self:UpdateCardMove(card.btn_card, not card.btn_card.selected, false) - --ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/paodekuai/sound/click.mp3") + --ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/paodekuai/sound/click.mp3") end end end @@ -286,21 +284,21 @@ function M:AddCardMoveEvent(card) if k == #self.card_list then if card.btn_card.x + self.card_width > min_x and card.btn_card.x < max_x and - card.card_isTouchable == 0 - then + card.card_isTouchable == 0 + then self:UpdateCardMove(card.btn_card, not card.btn_card.selected, false) - --ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/paodekuai/sound/click.mp3") + --ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/paodekuai/sound/click.mp3") end else if card.btn_card.x + - (self.card_width + self:GetHandCardOffset(#self.card_list)) > - min_x and - card.btn_card.x < max_x and - card.card_isTouchable == 0 - then + (self.card_width + self:GetHandCardOffset(#self.card_list)) > + min_x and + card.btn_card.x < max_x and + card.card_isTouchable == 0 + then self:UpdateCardMove(card.btn_card, not card.btn_card.selected, false) - --ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/paodekuai/sound/click.mp3") + --ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/paodekuai/sound/click.mp3") end end end @@ -340,6 +338,7 @@ function M:AddCardMoveEvent(card) end ) end + function M:zhizhanxuanpai() --智障选牌 -- body local temp_send_card = {} @@ -409,8 +408,8 @@ function M:TouchMoving(context) else if card.btn_card.x + (self.card_width + self:GetHandCardOffset(#self.card_list)) > min_x and - card.btn_card.x < max_x - then + card.btn_card.x < max_x + then printlog("cccccccccccccc22222222222222") self:SetBtnCardColor(card, 0.8) if #send_card1 == 0 then @@ -440,8 +439,8 @@ function M:TouchMoving(context) else if card.btn_card.x + (self.card_width + self:GetHandCardOffset(#self.card_list)) > min_x and - card.btn_card.x < max_x - then + card.btn_card.x < max_x + then -- self:UpdateCardMove(card.btn_card, not card.btn_card.selected, false) -- card.card_isTouchable = 1 -- ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/paodekuai/sound/click.mp3") @@ -478,8 +477,8 @@ end function M:SetBtnCardColor(card, num) if card.btn_card:GetChildAt(0) ~= nil and card.btn_card:GetChildAt(0):GetChildAt(0) ~= nil and - card.btn_card:GetChildAt(0):GetChildAt(0):GetChildAt(0) ~= nil - then + card.btn_card:GetChildAt(0):GetChildAt(0):GetChildAt(0) ~= nil + then -- body card.btn_card:GetChildAt(0):GetChildAt(0):GetChildAt(0).color = Color(num, num, num) end @@ -573,10 +572,9 @@ end function M:SetOutCardBlack() for i = 1, #self.out_card_list do local card = self.out_card_list[i] - if card and card:GetChildAt(0) and card:GetChildAt(0):GetChildAt(0) and card:GetChildAt(0):GetChildAt(0):GetChildAt(0) then - card:GetChildAt(0):GetChildAt(0):GetChildAt(0).color = Color(0.7, 0.7, 0.7) - end - + if card and card:GetChildAt(0) and card:GetChildAt(0):GetChildAt(0) and card:GetChildAt(0):GetChildAt(0):GetChildAt(0) then + card:GetChildAt(0):GetChildAt(0):GetChildAt(0).color = Color(0.7, 0.7, 0.7) + end end end @@ -606,13 +604,13 @@ function M:SetOutCardList(cardlist, isAnim) -- todo 出牌动画 local pos = self:GetOutCardEndPokerPos( - i, - #cardlist, - self.cards_view, - card.btn_card, - self.out_card_data['maxcount_x'], - 0.7 - ) + i, + #cardlist, + self.cards_view, + card.btn_card, + self.out_card_data['maxcount_x'], + 0.7 + ) card.btn_card:TweenMove(Vector2.New(pos.x, pos_y), time) -- self.tween = TweenUtils.TweenFloat(1, 0.7, time, function(x) -- card.btn_card:GetChildAt(0):SetScale(x, x) @@ -624,16 +622,16 @@ function M:SetOutCardList(cardlist, isAnim) end self.move_cor = coroutine.start( - function() - coroutine.wait(0.05) - for i = 1, #self.out_card_list do - local card = self.out_card_list[i] - self.cards_view:SetChildIndex(card, i - 1) + function() + coroutine.wait(0.05) + for i = 1, #self.out_card_list do + local card = self.out_card_list[i] + self.cards_view:SetChildIndex(card, i - 1) + end + coroutine.wait(0.1) + ViewUtil.PlaySound('RunFastNew_PK', 'extend/poker/runfast/sound/chupai.mp3') end - coroutine.wait(0.1) - ViewUtil.PlaySound('RunFastNew_PK', 'extend/poker/runfast/sound/chupai.mp3') - end - ) + ) else for i = 1, #cardlist do local poker_item = UIPackage.CreateObject('Extend_Poker_RunFastNew', 'poker7') @@ -673,13 +671,13 @@ function M:SetOutCardList(cardlist, isAnim) self.cards_view:AddChild(poker_item) local pos = self:GetOutCardEndPokerPos( - i, - #cardlist, - self.cards_view, - poker_item, - self.out_card_data['maxcount_x'], - 1 - ) + i, + #cardlist, + self.cards_view, + poker_item, + self.out_card_data['maxcount_x'], + 1 + ) poker_item.xy = Vector2.New(pos.x, pos_y) self.out_card_list[#self.out_card_list + 1] = poker_item end @@ -759,10 +757,10 @@ function M:BtnEvent() end local send_card = {} self.send_card = {} - local currentCard={} + local currentCard = {} for i = 1, #self.card_list do local card = self.card_list[i] - table.insert(currentCard,card.card_code_flower) + table.insert(currentCard, card.card_code_flower) if card.btn_card.selected then send_card[#send_card + 1] = card.card_code_flower self.send_card[#self.send_card + 1] = card @@ -772,7 +770,7 @@ function M:BtnEvent() if #send_card == 0 then self:ErrorTip('请选择要出的牌 ') else - self.gameCtr:SendCard(send_card,currentCard) + self.gameCtr:SendCard(send_card, currentCard) end end ) @@ -836,7 +834,7 @@ function M:ShowTipsCard(index) end function M:GetHandCardOffset(count) - local start = -70---54 + local start = -50 ---54 local offset = 0 if count > 10 then @@ -855,6 +853,7 @@ function M:GetHandCardPos(index, card_count) x = start_x + (self.card_width + offset) * (index - 1) return Vector2.New(x, y) end + function M:GetHandCardPos1(index, card_count) local x, y = 0, -18 local offset = self:GetHandCardOffset(card_count) @@ -863,6 +862,7 @@ function M:GetHandCardPos1(index, card_count) x = start_x + (self.card_width + offset) * (index - 1) return x, y end + function M:ChangeOneCodeByFrom(card) local flower = math.floor(card / 100) local number = card % 100 @@ -879,13 +879,13 @@ function M:ErrorTip(error_text) self.cor_init_poker = nil self.cor_init_poker = coroutine.start( - function() - self.put_error_text.text = error_text - self.ctr_put_error.selectedIndex = 1 - coroutine.wait(2) - self.ctr_put_error.selectedIndex = 0 - end - ) + function() + self.put_error_text.text = error_text + self.ctr_put_error.selectedIndex = 1 + coroutine.wait(2) + self.ctr_put_error.selectedIndex = 0 + end + ) end --RunFast_CardType @@ -904,7 +904,7 @@ end function M:GetCardTips(type, number, length, mustPutMaxCard, tip_templist) local tip_list = {} local sidaisan = false - local touch_key_list = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} + local touch_key_list = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } --printlog("aaaaaaaaaaaaacccccccccccccccccccc11111111111111111111111111111") --pt(self.card_list) local card_map, max_key = self:GetCardMapAndMaxKey(self.card_list) @@ -996,7 +996,7 @@ end -- 合并多个list function M:GetMergeAllList(...) - local lists = {...} + local lists = { ... } local merge_list = {} for i = 1, #lists do local list_item = lists[i] @@ -1024,13 +1024,13 @@ function M:CheckOneCard(pokerMap, num, length) end for k, v in pairs(pokerMap) do if k > num and #v == 1 then - one_card_list[#one_card_list + 1] = {v[1]} + one_card_list[#one_card_list + 1] = { v[1] } touch_key_list[#touch_key_list + 1] = k end end for k, v in pairs(pokerMap) do if k > num and #v ~= 1 then - one_card_list[#one_card_list + 1] = {v[1]} + one_card_list[#one_card_list + 1] = { v[1] } touch_key_list[#touch_key_list + 1] = k end end @@ -1045,7 +1045,7 @@ function M:CheckOnePair(pokerMap, num, length) end for k, v in pairs(pokerMap) do -- 从三条和对子里面提取 if #v > 1 and k > num then - one_pair_list[#one_pair_list + 1] = {v[1], v[2]} + one_pair_list[#one_pair_list + 1] = { v[1], v[2] } touch_key_list[#touch_key_list + 1] = k end end @@ -1060,7 +1060,7 @@ function M:CheckThree(pokerMap, num, length) end for k, v in pairs(pokerMap) do if #v > 2 and k > num then - three_list[#three_list + 1] = {v[1], v[2], v[3]} + three_list[#three_list + 1] = { v[1], v[2], v[3] } touch_key_list[#touch_key_list + 1] = k end end @@ -1107,8 +1107,8 @@ function M:CheckThreeAndOne(pokerMap, num, length) end for k, v in pairs(pokerMap) do if #v >= 3 and k > num then - three_and_one_list[#three_and_one_list + 1] = {v[1], v[2], v[3]} - touch_key_list = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} + three_and_one_list[#three_and_one_list + 1] = { v[1], v[2], v[3] } + touch_key_list = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } end end return three_and_one_list, touch_key_list @@ -1122,8 +1122,8 @@ function M:CheckThreeAndTwo(pokerMap, num, length) end for k, v in pairs(pokerMap) do if #v >= 3 and k > num then - three_and_two_list[#three_and_two_list + 1] = {v[1], v[2], v[3]} - touch_key_list = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} + three_and_two_list[#three_and_two_list + 1] = { v[1], v[2], v[3] } + touch_key_list = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } end end return three_and_two_list, touch_key_list @@ -1208,7 +1208,7 @@ function M:CheckPlane(pokerMap, num, length, and_num) end if j == i + pair_length - 1 then plane_list[#plane_list + 1] = item_all_list - touch_key_list = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} + touch_key_list = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } end end end @@ -1216,7 +1216,7 @@ function M:CheckPlane(pokerMap, num, length, and_num) end function M:SetNotTouchCard(touch_key_list, card_map) - local all_key_list = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} + local all_key_list = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } for i = 1, #all_key_list do local key = all_key_list[i] local isExsit = self:IsExistByList(touch_key_list, key) @@ -1259,13 +1259,14 @@ function M:GetCardMapAndMaxKey(pokerList) max_key = number end if map[number] == nil then - map[number] = {pokerList[i]} + map[number] = { pokerList[i] } else map[number][#map[number] + 1] = pokerList[i] end end return map, max_key end + function M:CheckOnes(pokerMap, num, length) local one_card_list = {} local touch_key_list = {} @@ -1283,7 +1284,7 @@ function M:CheckOnes(pokerMap, num, length) for i = 0, length - 1 do if l == k + i and l ~= 15 and l ~= 16 then -- body - text[#text + 1] = {p[1]} + text[#text + 1] = { p[1] } text2[#text2 + 1] = l if #text >= length then -- body @@ -1311,6 +1312,7 @@ function M:CheckOnes(pokerMap, num, length) end return one_card_list, touch_key_list, length end + function M:Clear() self:PlayScore(nil) self:SetOutCardInfo(nil, false) @@ -1321,9 +1323,9 @@ function M:Clear() end function M:ClearCheck() - self.card_list = {} + self.card_list = {} self.out_card_list = {} - self.cards_view:RemoveChildren(0, -1, true) + self.cards_view:RemoveChildren(0, -1, true) end function M:Destroy() diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/101.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/101.xml index 93cfb4fc..8e08c41c 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/101.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/101.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/102.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/102.xml index 841b47af..f24896cf 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/102.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/102.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/103.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/103.xml index d9b63159..6cc415ad 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/103.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/103.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/104.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/104.xml index 6da7793e..b799157b 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/104.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/104.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/105.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/105.xml index 1a1a3650..1c2adb56 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/105.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/105.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/106.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/106.xml index 8534f766..dba560a4 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/106.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/106.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/107.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/107.xml index 4ea81c0a..636c381e 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/107.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/107.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/108.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/108.xml index 0032534f..d505bf21 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/108.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/108.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/109.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/109.xml index dbdba24e..0a9383ee 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/109.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/109.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/110.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/110.xml index 52197106..703fa857 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/110.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/110.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/111.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/111.xml index da9feb52..6171e007 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/111.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/111.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/112.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/112.xml index 8c79efb9..53a20682 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/112.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/112.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/113.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/113.xml index 373b945f..e9399fcd 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/113.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/113.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/114.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/114.xml index c3629899..8e08c41c 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/114.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/1/114.xml @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/201.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/201.xml index c5a2c0d1..f735d266 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/201.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/201.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/202.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/202.xml index 09f72032..922f8896 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/202.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/202.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/203.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/203.xml index 8cc43bf5..061fadea 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/203.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/203.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/204.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/204.xml index 5d65f0d3..106e7e0b 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/204.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/204.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/205.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/205.xml index d0016fba..bf076587 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/205.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/205.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/206.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/206.xml index 622286fa..ff24aad1 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/206.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/206.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/207.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/207.xml index ca53cc02..13d75608 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/207.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/207.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/208.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/208.xml index 8268c3f8..3b563e0a 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/208.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/208.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/209.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/209.xml index d93c7d4f..3bbbb3e2 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/209.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/209.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/210.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/210.xml index 5995da3e..285177dc 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/210.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/210.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/211.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/211.xml index 6562b94f..a5980258 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/211.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/211.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/212.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/212.xml index 16aad50c..96a0c96e 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/212.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/212.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/213.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/213.xml index 425712f8..7e78cc8d 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/213.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/213.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/214.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/214.xml index 28492198..f735d266 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/214.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/2/214.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/301.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/301.xml index 06ec69e6..7dfc188e 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/301.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/301.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/302.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/302.xml index ace14437..4984136f 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/302.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/302.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/303.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/303.xml index e9635531..099bf506 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/303.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/303.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/304.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/304.xml index 94e6cdcf..72f02a1b 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/304.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/304.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/305.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/305.xml index 2237004d..ad6ed996 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/305.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/305.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/306.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/306.xml index e66b7474..ff8aba0e 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/306.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/306.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/307.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/307.xml index ae1a81d9..62968751 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/307.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/307.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/308.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/308.xml index 1b10ae2b..aa46b1ae 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/308.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/308.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/309.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/309.xml index 42e1c9f6..bda3fe23 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/309.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/309.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310.xml index e2f55138..bd8d16ad 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310_1.xml index 690107d8..273eef50 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310_1.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310_1.xml @@ -1,10 +1,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310_2.xml index d5db6362..f32635e6 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/310_2.xml @@ -1,10 +1,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/311.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/311.xml index 8a39e8a4..60e70c5a 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/311.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/311.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/312.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/312.xml index 7f183f28..f972f1eb 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/312.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/312.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/313.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/313.xml index c6f197d8..5d183bf1 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/313.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/313.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/314.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/314.xml index 06ec69e6..7dfc188e 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/314.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/3/314.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/401.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/401.xml index 77b2222e..23f033e9 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/401.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/401.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/402.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/402.xml index ce8976a0..d46f6a02 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/402.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/402.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/403.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/403.xml index ad16b956..e290fe6b 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/403.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/403.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/404.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/404.xml index d807e2bd..274b634c 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/404.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/404.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/405.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/405.xml index dbacc065..0bc42a3c 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/405.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/405.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/406.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/406.xml index 7bac9be4..5d52a5c3 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/406.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/406.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/407.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/407.xml index 8d7b098b..ea2e4490 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/407.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/407.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/408.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/408.xml index f272c18f..bd1e70aa 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/408.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/408.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/409.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/409.xml index 3422154e..d0082666 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/409.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/409.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/410.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/410.xml index 37b097fc..054c97f2 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/410.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/410.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/411.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/411.xml index f3a58564..f5e0394a 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/411.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/411.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/412.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/412.xml index 52722023..eb298f66 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/412.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/412.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/413.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/413.xml index 13c7aa68..3d409390 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/413.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/413.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/414.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/414.xml index 77b2222e..23f033e9 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/414.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/414.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/415.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/415.xml index 23a293d8..d46f6a02 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/415.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/4/415.xml @@ -1,9 +1,9 @@ - + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/di(1).xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/di(1).xml index c0e648cb..8fe87885 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/di(1).xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/di(1).xml @@ -1,6 +1,8 @@ - + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/poker/poker12.5.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/poker/poker12.5.xml index 4da0a488..80e40f7a 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/poker/poker12.5.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/poker/poker12.5.xml @@ -1,5 +1,5 @@ - +