diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua index 6056d7cb..e385ef84 100644 --- a/lua_probject/base_project/Game/View/ResultView.lua +++ b/lua_probject/base_project/Game/View/ResultView.lua @@ -261,10 +261,10 @@ function M:InitBigResult(room, fontsize) local str_roominfo = string.gsub(room.room_config:GetDes(), '\r', '') big_result:GetChild('txt_play').text = str_roominfo - -- if room.hpOnOff == 1 and room.score_times ~= 1 then - big_result:GetChild('txt_time').text = '倍数：' .. tostring(room.score_times) - big_result:GetController('time').selectedIndex = 1 - -- end + -- if room.hpOnOff == 1 and room.score_times ~= 1 then + big_result:GetChild('txt_time').text = '倍数：' .. tostring(room.score_times) + big_result:GetController('time').selectedIndex = 1 + -- end local maxScore = 0 local isWin = false @@ -305,8 +305,8 @@ function M:InitBigResult(room, fontsize) if item:GetChild('txt_userid') then item:GetChild('txt_userid').text = player_info.userId end - - ImageLoad.Load(player_info.head_url, item:GetChild('head')._iconObject) + + -- ImageLoad.Load(player_info.head_url, item:GetChild('head')._iconObject) if player_info.entrust ~= nil and player_info.entrust == true then item:GetController('entrust').selectedIndex = 1 @@ -354,18 +354,18 @@ function M:InitBigResult(room, fontsize) pitem:GetChild('txt_key').text = player_info.param[i].key pitem:GetChild('txt_value').text = player_info.param[i].value - if fontsize ~= nil and fontsize > 0 then - pitem:GetChild('txt_key').textFormat.size = fontsize - pitem:GetChild('txt_value').textFormat.size = fontsize - else - if big then - pitem:GetChild('txt_key').textFormat.size = 30 - pitem:GetChild('txt_value').textFormat.size = 12 - else - pitem:GetChild('txt_key').textFormat.size = 24 - pitem:GetChild('txt_value').textFormat.size = 8 - end - end + -- if fontsize ~= nil and fontsize > 0 then + -- pitem:GetChild('txt_key').textFormat.size = fontsize + -- pitem:GetChild('txt_value').textFormat.size = fontsize + -- else + -- if big then + -- pitem:GetChild('txt_key').textFormat.size = 30 + -- pitem:GetChild('txt_value').textFormat.size = 12 + -- else + -- pitem:GetChild('txt_key').textFormat.size = 24 + -- pitem:GetChild('txt_value').textFormat.size = 8 + -- end + -- end end end diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index b95d8931..eb3a0f81 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -379,4 +379,4 @@ function printlog(...) if debug_print then print(...) end -end +end \ No newline at end of file diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 3b7825a7..b43f887e 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -57,7 +57,7 @@ function M:InitView(url) hx = 15 end - ZPMainView.InitView(self, 'ui://Main_RunBeard/Main_' .. _room.room_config.people_num, false, false, 1.2, hx) + ZPMainView.InitView(self, 'ui://Main_RunBeard/Main_' .. _room.room_config.people_num, false, false, 2, hx) self:PlayerChangeLineState() SettingView.onEXMainCallback = handler(self, self.UpdateCardDisplay) @@ -92,12 +92,14 @@ end function M:setBtn() local rightpanel = self._view:GetChild('right_panel') - local btn_rule = rightpanel:GetChild('btn_log') + local btn_rule = self._view:GetChild('btn_rule') local gcm_chat = self._view:GetChild('gcm_chat') + + -- # zlx 20260208 注释两行 local _btn_chat = gcm_chat:GetChild('n1') - _btn_chat:GetChild('icon').icon = 'ui://Main_RunBeard/chat_img' + -- # _btn_chat:GetChild('icon').icon = 'ui://Main_RunBeard/chat_img' local btn_record = gcm_chat:GetChild('btn_record') - btn_record:GetChild('icon').icon = 'ui://Main_RunBeard/yuyin_img' + -- # btn_record:GetChild('icon').icon = 'ui://Main_RunBeard/yuyin_img' if btn_rule ~= nil then btn_rule.onClick:Set( @@ -560,26 +562,19 @@ function M:EventInit() ) end ) - _gamectr:AddEventListener( GameEvent.ZPResult1, function(...) -- self._popEvent = true - --printlog("ZPResult111ssssssttteessssssttt") - self._left_time = 0 local arg = { ... } local result = arg[1] local liuju = result.liuju local data = result.info_list local x = {} - --printlog("ZPResult111sssssstttee") self._hu_tip:FillData(x) - --printlog("ZPResult111ssss6666") self:__CloseTip() - --printlog("ZPResult111") if self._clearingView == nil then - --printlog("ZPResult11122222") if liuju == true then self._clearingView = FanPaoFa_ResultView.new(self._view, 1) else @@ -590,7 +585,6 @@ function M:EventInit() function() coroutine.wait(0.5) -- if self._clearingView._is_destroy then return end - --printlog("ZPResult111qqqqqq") self._clearingView:Show() if _room.curren_round ~= _room.room_config.round then for i = 1, #data do @@ -605,7 +599,6 @@ function M:EventInit() card_info:Clear() info:UpdateScore() end - --printlog("ZPResult111sdddddd") local list = _room.player_list for i = 1, #list do local p = list[i] 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 d9f1f755..f71314c3 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -5,8 +5,8 @@ local FanPaoFa_ResultView = {} local M = FanPaoFa_ResultView function FanPaoFa_ResultView.new(blur_view, index) - setmetatable(M, {__index = ResultView}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = ResultView }) + local self = setmetatable({}, { __index = M }) self.class = 'FanPaoFa_ResultView' self._currenIndex = 0 if index ~= 1 then @@ -15,12 +15,11 @@ function FanPaoFa_ResultView.new(blur_view, index) self._close_zone = false self:init("ui://Extend_Poker_FanPaoFa/clearing") - self.xiPaiCtr=self._view:GetController("xipai") + self.xiPaiCtr = self._view:GetController("xipai") return self end function M:init(url) - ResultView.init(self, url) local btn_share = self._view:GetChild('btn_share') @@ -43,32 +42,31 @@ function M:InitData(over, room, result, total_result, callback) self._view:GetChild('tex_roomnum').text = room.room_id self._view:GetChild('tex_data').text = os.date('%Y-%m-%d %H:%M', os.time()) - local xpconfig=DataManager.CurrenRoom.room_config.config.xi_pai - if xpconfig then - self.xiPaiCtr.selectedIndex=1 - else - self.xiPaiCtr.selectedIndex=0 - end - - local xipai=self._view:GetChild("btn_xipai") - xipai.touchable=true - xipai.onClick:Add(function() - local xiPaiCallBack=function () - xipai.touchable=false - self.xiPaiCtr.selectedIndex=0 - -- ViewUtil.ErrorTip(1000000,"申请洗牌成功") + local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai + if xpconfig then + self.xiPaiCtr.selectedIndex = 1 + else + self.xiPaiCtr.selectedIndex = 0 + end + + local xipai = self._view:GetChild("btn_xipai") + xipai.touchable = true + xipai.onClick:Add(function() + local xiPaiCallBack = function() + xipai.touchable = false + self.xiPaiCtr.selectedIndex = 0 + -- ViewUtil.ErrorTip(1000000,"申请洗牌成功") local _gamectr = ControllerManager.GetController(GameController) _gamectr:PlayerReady() self:Close() - end local _gamectr = ControllerManager.GetController(GameController) _gamectr:SendXiPaiAction(xiPaiCallBack) end) - if result and result.xipai_score then - xipai.text="洗牌 积分x"..result.xipai_score - end + if result and result.xipai_score then + xipai.text = "洗牌 积分x" .. result.xipai_score + end if result ~= nil and result.liuju == true then _icon.icon = 'ui://Main_RunBeard/liuju' @@ -91,7 +89,7 @@ function M:InitData(over, room, result, total_result, callback) self:AddClearItem(room, result, nil, over) return else - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 _btnCtr.selectedIndex = 1 _sdkCtr.selectedIndex = 1 btn_result.onClick:Add( @@ -126,10 +124,9 @@ function M:InitData(over, room, result, total_result, callback) end end ) - + self:AddClearItem(room, result, nil, over) elseif over == 1 and result.liuju == false then - _icon.icon = 'ui://Main_RunBeard/jiesuan' _btnCtr.selectedIndex = 1 _sdkCtr.selectedIndex = 1 @@ -161,7 +158,6 @@ function M:InitData(over, room, result, total_result, callback) self:AddClearItem(room, result, total_result.info_list, over) else - if result ~= nil then if result.liuju == false then _icon.icon = 'ui://Main_RunBeard/jiesuan' @@ -178,7 +174,7 @@ function M:InitData(over, room, result, total_result, callback) _icon.icon = 'ui://Main_RunBeard/jiesuan' over = 2 _overCtr.selectedIndex = 3 - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 btn_close.onClick:Add( function() ViewManager.ChangeView(ViewManager.View_Lobby) @@ -195,12 +191,11 @@ function M:AddClearItem(room, data, total_data, over) local list_view2 = self._view:GetChild('player_list_2') if data ~= nil and data.liuju == true then - self:FillLiuJuItemData(room, data,list_view1) + self:FillLiuJuItemData(room, data, list_view1) if over == 1 then self:FillItemData2(room, total_data, list_view2) end else - if 0 == over or 1 == over and data.liuju == false then self:FillItemData(room, data, list_view1) if 1 == over then @@ -209,47 +204,44 @@ function M:AddClearItem(room, data, total_data, over) elseif 2 == over then self:FillItemData2(room, total_data, list_view2) end - end end function M:GetPos(room, seat) return ViewUtil.GetPos(room.self_player.seat, seat, room.room_config.people_num) end -function M:FillLiuJuItemData(room, data,item) + +function M:FillLiuJuItemData(room, data, item) --流局 local qipai_list = self._view:GetChild('qipai_listl') local _dipaiC = self._view:GetController('qipai') - + qipai_list:RemoveChildrenToPool() - - --[[ if data.throw_card ~= nil and #data.throw_card > 0 then + + --[[ if data.throw_card ~= nil and #data.throw_card > 0 then _dipaiC.selectedIndex = 1 local hand_card = PendulumRule.GetHandCard(data.throw_card, 3) 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 _dipaiC.selectedIndex = 0 end]] - + for i = 1, #data.info_list do - if data.info_list[i].seat == room.banker_seat then + if data.info_list[i].seat == room.banker_seat then local p = room:GetPlayerBySeat(data.info_list[i].seat) self._view:GetChild('WinerName').text = p.self_user.nick_name - self._view:GetChild("WinerID").text = "ID:"..p.self_user.account_id + self._view:GetChild("WinerID").text = "ID:" .. p.self_user.account_id local btn_head = self._view:GetChild('btn_head') ImageLoad.Load(p.self_user.head_url, btn_head._iconObject) end - printlog("ddddd==========") - printlog(room.banker_seat) - printlog(data.info_list[i].seat) - if data.info_list[i].seat == room.banker_seat then + if data.info_list[i].seat == room.banker_seat then local card_list - --[[if #data.info_list == 2 then + --[[if #data.info_list == 2 then card_list = self._view:GetChild('card_list_2') else if self:GetPos(room, data.info_list[i].seat) == 2 then @@ -257,87 +249,14 @@ function M:FillLiuJuItemData(room, data,item) else card_list = self._view:GetChild('card_list_3') end - end]] + end]] card_list = self._view:GetChild('card_list_2') - card_list.visible =true - + card_list.visible = true + 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 + if #data.info_list[i].hand_card >= 2 then hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3) for k = 1, #hand_card do local cards = card_list:AddItemFromPool() @@ -345,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 @@ -354,11 +273,80 @@ 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 end @@ -396,110 +384,100 @@ 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 + 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 @@ -527,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 @@ -561,11 +539,11 @@ function M:FillItemData(room, data, item) self._view:GetController('bank').selectedIndex = 1 end self._view:GetChild('WinerName').text = p.self_user.nick_name - self._view:GetChild("WinerID").text = "ID:"..p.self_user.account_id + self._view:GetChild("WinerID").text = "ID:" .. p.self_user.account_id --self._view:GetChild('chongtunshu').text = '充囤：' .. room.room_config.tun .. ' 囤' self._view:GetChild('huxi').text = '胡 息：+' .. win_data.hu_xi - -- self._view:GetChild('tunshu').text = '基础囤数：' .. win_data.tun - -- self._view:GetChild('zongtunshu').text = '总囤数：' .. win_data.total_tun + -- self._view:GetChild('tunshu').text = '基础囤数：' .. win_data.tun + -- self._view:GetChild('zongtunshu').text = '总囤数：' .. win_data.total_tun if win_data.total_score >= 0 then self._view:GetChild('score').text = '总胡息：+' .. win_data.total_score self._view:GetChild('score').grayed = false @@ -574,12 +552,12 @@ function M:FillItemData(room, data, item) self._view:GetChild('score').grayed = true end local hp_info = win_data.hp_info - + self._view:GetController("hudianpao").selectedIndex = win_data.hu_type - self._view:GetChild("fangpaoscore").text = "放炮扣息:-"..win_data.fangpaoscore + self._view:GetChild("fangpaoscore").text = "放炮扣息:-" .. win_data.fangpaoscore + - if (hp_info ~= nil and room.hpOnOff == 1 or room:checkHpNonnegative()) then local isupper_limit = hp_info.upper_limit -- // 输赢是否已达上限 @@ -589,7 +567,7 @@ function M:FillItemData(room, data, item) self._view:GetChild('yidashangxian').text = '' end end - + local btn_head = self._view:GetChild('btn_head') ImageLoad.Load(p.self_user.head_url, btn_head._iconObject) local fullname_list = self._view:GetChild('fullname_list') @@ -610,7 +588,7 @@ function M:FillItemData(room, data, item) end local card_list = self._view:GetChild('card_list') card_list:RemoveChildrenToPool() - --[[ if #win_data.cardList > 0 then + --[[ if #win_data.cardList > 0 then for i = 1, #win_data.cardList do -- 1 是对子 2 是三个的 local fztype = win_data.cardList[i].type @@ -659,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) @@ -686,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 = @@ -699,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 @@ -712,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 @@ -725,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 @@ -738,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 @@ -750,24 +728,22 @@ function M:FillItemData(room, data, item) self:getCardItem('ui://Main_RunBeard/201_', win_data.opCardList[i].card1) 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) - cards:GetChild('card_2').icon = - self:getCardItem('ui://Main_RunBeard/202_', win_data.opCardList[i].card1) - + cards:GetChild('card_1').icon = + self:getCardItem('ui://Main_RunBeard/201_', win_data.opCardList[i].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/201_', win_data.opCardList[i].card1) end end --printlog("FillItemData11333333") - --[[ if #win_data.hand_card > 0 then + --[[ if #win_data.hand_card > 0 then for i = 1, #win_data.hand_card, 4 do local cards = card_list:AddItemFromPool() cards:GetChild('card_type').text = '散' @@ -820,94 +796,90 @@ 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 + -- self._view:GetChild('score_shu').text = '总胡息：' .. info_list[i].total_score end --printlog("FillItemData1ssssseee1") @@ -938,28 +910,28 @@ function M:FillItemData2(room, data, list) local wcount = 0 --总胡次数 if (data[i].hupai_count ~= nil) then - wcount = data[i].hupai_count + wcount = data[i].hupai_count end local dpcount = 0 - + if (data[i].dianpao_count ~= nil) then - dpcount = data[i].dianpao_count + dpcount = data[i].dianpao_count end local tpcount = 0 if (data[i].tipai_count ~= nil) then - tpcount = data[i].tipai_count + tpcount = data[i].tipai_count end local ppcount = 0 if (data[i].paopai_count ~= nil) then - ppcount = data[i].paopai_count + ppcount = data[i].paopai_count end - local dncount =0 - if (data[i].niaoscore ~= nil) then - dncount = data[i].niaoscore + local dncount = 0 + if (data[i].niaoscore ~= nil) then + dncount = data[i].niaoscore end player_list[i].param[1] = {} @@ -976,27 +948,26 @@ function M:FillItemData2(room, data, list) player_list[i].param[4] = {} player_list[i].param[4].key = '跑牌总数:' - player_list[i].param[4].value = tostring(ppcount) + player_list[i].param[4].value = tostring(ppcount) player_list[i].param[5] = {} player_list[i].param[5].key = '打鸟总分:' - player_list[i].param[5].value = tostring(dncount) + player_list[i].param[5].value = tostring(dncount) player_list[i].param[6] = {} player_list[i].param[6].key = '[u][color=#0000FF]总胡息:[/color][/u]' - player_list[i].param[6].value = '[u][color=#0000FF]'..tostring(data[i].total_huxi)..'[/color][/u]' - + player_list[i].param[6].value = '[u][color=#0000FF]' .. tostring(data[i].total_huxi) .. '[/color][/u]' end - + local round = room.room_config.round self:GenerateRoomResultInfo(round, room.room_config:GetGameName(), room.room_id, room.create_time, player_list) - - self:SetGSListlineGap(0) - -- room.room_config.isNonnegative = 0 - self:InitBigResult(room, 30) - - + self:SetGSListlineGap(0) + -- room.room_config.isNonnegative = 0 + self:InitBigResult(room, 30) + + + DataManager.CurrenRoom = nil -- list:RemoveChildrenToPool() -- for i =1, #data do @@ -1090,6 +1061,7 @@ function M:LoadHead(p, room) end end end + function M:getCardItem(card_1, card_2) local _room = DataManager.CurrenRoom if _room ~= nil and _room.change_card_display ~= nil then diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index 634ba2b2..06b6dd2a 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -400,41 +400,41 @@ function M:UpdateFzList(fz_list, ispaly, seat, flag_pengPao) end function M:playAnim(fzitem, fzcards, size, i, ispaly, flag_pengPao) - print("lingmeng playAnim", fzitem, fzcards, size, i, ispaly, flag_pengPao) - if (ispaly == nil) then - ispaly = false - end - if (ispaly and i == size and not flag_pengPao) then - local fristCard = self.card_list[1].btn_card - print("lingmeng btn_card", self.card_list[1].index_X) - -- self._area_handcard_list:AddChild(fzcards) - fzcards:SetPivot(0.5, 0.5) - fzcards.rotation = 180 - fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) - --[[ - fzcards:TweenMove( - self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - - self._area_handcard_list.xy, 0.2) - fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) - --]] - fzcards:RemoveFromParent() - fzcards.xy = Vector2.zero - fzcards.rotation = 0 - fzcards:SetScale(1, 1) - fzitem:AddChild(fzcards) - self._area_fz_list:AddChildAt(fzitem, 0) - --[[ - coroutine.start( - function() - coroutine.wait(0.21) + -- print("lingmeng playAnim", fzitem, fzcards, size, i, ispaly, flag_pengPao) + -- if (ispaly == nil) then + -- ispaly = false + -- end + -- if (ispaly and i == size and not flag_pengPao) then + -- local fristCard = self.card_list[1].btn_card + -- print("lingmeng btn_card", self.card_list[1].index_X) + -- -- self._area_handcard_list:AddChild(fzcards) + -- fzcards:SetPivot(0.5, 0.5) + -- fzcards.rotation = 180 + -- fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) + -- --[[ + -- fzcards:TweenMove( + -- self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - + -- self._area_handcard_list.xy, 0.2) + -- fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) + -- --]] + -- fzcards:RemoveFromParent() + -- fzcards.xy = Vector2.zero + -- fzcards.rotation = 0 + -- fzcards:SetScale(1, 1) + -- fzitem:AddChild(fzcards) + -- self._area_fz_list:AddChildAt(fzitem, 0) + -- --[[ + -- coroutine.start( + -- function() + -- coroutine.wait(0.21) - end - ) - --]] - else - fzitem:AddChild(fzcards) - self._area_fz_list:AddChildAt(fzitem, 0) - end + -- end + -- ) + -- --]] + -- else + -- fzitem:AddChild(fzcards) + -- self._area_fz_list:AddChildAt(fzitem, 0) + -- end end --出牌提示动画 diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua index dc6411eb..d605fdaf 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua @@ -90,11 +90,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) local typeface = _data['game_cardsize'] local _gamectr = self._gamectr if typeface == 0 then - self._room.change_card_size = 1.3 + self._room.change_card_size = 2 elseif typeface == 1 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 1.5 elseif typeface == 2 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 1.5 end else self._room.change_card_size = change_card_size @@ -185,6 +185,40 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) --printlog("OneventResultinit8") self:InitXiPai1() --printlog("OneventResultinit9") + + local btn_safe = self._view:GetChild('btn_safe') + self.safe_arrow1 = btn_safe:GetChild("arrow1") + self.safe_arrow2 = btn_safe:GetChild("arrow2") + btn_safe.onClick:Set( + function() + self:BtnsSafe() + end + ) + self:BtnsSafe() +end + +-- zlx 20260208 +function M:BtnsSafe() + local btn_temp1 = self._view:GetChild("btn_back_lobby") + local btn_temp2 = self._view:GetChild("Btn_jiesan_lobby") + local btn_temp3 = self._view:GetChild("btn_leave_lobby") + local btn_temp4 = self._view:GetChild("btn_setting") + + btn_temp1.visible = not btn_temp1.visible + btn_temp2.visible = not btn_temp2.visible + btn_temp3.visible = not btn_temp3.visible + btn_temp4.visible = not btn_temp4.visible + + local safe = self._view:GetChild("safe_bg") + safe.visible = not safe.visible + + if safe.visible then + self.safe_arrow1.visible = false + self.safe_arrow2.visible = true + else + self.safe_arrow1.visible = true + self.safe_arrow2.visible = false + end end function M:InitXiPai() @@ -301,13 +335,13 @@ end -- 设置 更新 手牌大小 function M:UpdateCardSize(index) - -- print("lingmeng UpdateCardSize") + -- print("lingmeng UpdateCardSize") if index == 0 then - self._room.change_card_size = 1.3 + self._room.change_card_size = 2 elseif index == 1 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 1.5 elseif index == 2 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 1.5 end local info = self._player_card_info[1] info:UpdateCardSize() diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua index 7c0bdea3..1811f1b1 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -520,8 +520,12 @@ function M:UpdateOutLine() self._data_outLinePos = 90 - (116 * 3) elseif self:getCardSize() == 0.8 then self._data_outLinePos = 100 - (93 * 3) + elseif self:getCardSize() == 1.5 then + self._data_outLinePos = 90 - (143 * 3) + elseif self:getCardSize() == 2 then + self._data_outLinePos = 110 - (155 * 3) end - self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height + self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 220 end function M:UpdateIsOnClick(isOut) @@ -796,6 +800,10 @@ function M:GetHandCardPos(cards_view, cards) y = 90 - (110 * cards_view.index_Y) elseif self:getCardSize() == 0.8 then y = 100 - (85 * cards_view.index_Y) + elseif self:getCardSize() == 1.5 then + y = 90 - (137 * cards_view.index_Y) + elseif self:getCardSize() == 2 then + y = 90 - (182 * cards_view.index_Y) end return Vector2.New(x, y) end diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index d04551a1..17ce7d71 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -1,10 +1,16 @@ { "objectStatus": { + "n84_rbpg": { + "hidden": true + }, + "n51_fmkv": { + "collapsed": true + }, "n85_rbpg": { "hidden": true }, - "n84_rbpg": { - "hidden": true + "n19_pt1r": { + "collapsed": true }, "n4_fux2": { "hidden": true diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info new file mode 100644 index 00000000..816f7036 --- /dev/null +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n19_of6w": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info new file mode 100644 index 00000000..bcd1c68f --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n57_r1mo": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info new file mode 100644 index 00000000..18662af8 --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n76_ra9v": { + "collapsed": true + }, + "n77_ra9v": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/Common/font/images/win/shurukuang5.png b/wb_new_ui/assets/Common/font/images/win/shurukuang5.png index 964a98f9..7dddb9f9 100644 Binary files a/wb_new_ui/assets/Common/font/images/win/shurukuang5.png and b/wb_new_ui/assets/Common/font/images/win/shurukuang5.png differ diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml new file mode 100644 index 00000000..f936b351 --- /dev/null +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml @@ -0,0 +1,9 @@ + + + + + + + +