diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 74723722..83cf978e 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -92,7 +92,7 @@ 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 注释两行 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..a7f7ad05 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,21 +204,21 @@ 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 @@ -235,21 +230,18 @@ function M:FillLiuJuItemData(room, data,item) 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,14 +249,13 @@ 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:RemoveChildrenToPool() - - for k = 1, #data.info_list[i].opCardList do + 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() @@ -272,9 +263,9 @@ function M:FillLiuJuItemData(room, data,item) 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) + 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 @@ -290,33 +281,33 @@ function M:FillLiuJuItemData(room, data,item) 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) + 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) + 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) + 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 = @@ -324,7 +315,6 @@ function M:FillLiuJuItemData(room, data,item) 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 = '将' @@ -337,7 +327,7 @@ function M:FillLiuJuItemData(room, data,item) 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() @@ -357,8 +347,6 @@ function M:FillLiuJuItemData(room, data,item) item:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[j]) end end - - end end @@ -403,7 +391,7 @@ function M:FillLiuJuItemData(room, data,item) 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 = @@ -456,9 +444,9 @@ function M:FillLiuJuItemData(room, data,item) 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 = '将' + 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) @@ -467,10 +455,9 @@ function M:FillLiuJuItemData(room, data,item) 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 @@ -482,7 +469,6 @@ function M:FillLiuJuItemData(room, data,item) self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) end end - else hand_card = info_list[i].hand_card local cards = card_list:AddItemFromPool() @@ -491,15 +477,7 @@ function M:FillLiuJuItemData(room, data,item) cards:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[j]) end - end - - - - - - - end end end @@ -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 @@ -750,7 +728,6 @@ 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 @@ -759,15 +736,14 @@ function M:FillItemData(room, data, item) 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/202_', win_data.opCardList[i].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/202_', 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 = '散' @@ -821,9 +797,8 @@ function M:FillItemData(room, data, item) 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 + 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 @@ -881,7 +856,6 @@ function M:FillItemData(room, data, item) 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 @@ -892,7 +866,7 @@ function M:FillItemData(room, data, item) 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 @@ -907,7 +881,7 @@ function M:FillItemData(room, data, item) - -- 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 +912,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 +950,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 +1063,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/main/ZPPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua index df8663a6..1811f1b1 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -525,7 +525,7 @@ function M:UpdateOutLine() 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) diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index 3fd2f2d1..c0a6e44e 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -1,21 +1,12 @@ { "objectStatus": { - "n19_pt1r": { - "collapsed": true - }, "n85_rbpg": { "hidden": true }, - "n51_fmkv": { - "collapsed": true - }, "n84_rbpg": { "hidden": true }, - "n44_n1ry": { - "collapsed": true - }, - "n55_rx2e": { + "n64_pwj4": { "collapsed": true }, "n4_fux2": { diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info index 34ba557a..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info @@ -1,10 +1 @@ -{ - "objectStatus": { - "n89_ybf5": { - "collapsed": true - }, - "n33_e7qn": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ 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 index a0439d1e..bcd1c68f 100644 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info @@ -1,19 +1,7 @@ { "objectStatus": { - "n86_ybf5": { - "collapsed": true - }, - "n39_e7qn": { - "collapsed": true - }, "n57_r1mo": { "collapsed": true - }, - "n74_o49p": { - "collapsed": true - }, - "n49_lr5d": { - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 025eb461..b367ec0c 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,46 +1,86 @@ { - "libview.firstColumnWidth": 367, + "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ "ui://lkq9ne9speuq8b", - "ui://lkq9ne9speuq8n", - "ui://lkq9ne9speuq8c", - "ui://lkq9ne9speuq3z" + "ui://lkq9ne9speuq6e", + "ui://lkq9ne9speuq6r", + "ui://1utjt0r2ufu929", + "ui://1utjt0r2ufu92i", + "ui://1utjt0r2ufu923" ], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://lkq9ne9speuq8b", + "doc.activeDoc": "ui://1utjt0r2ufu92i", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", "/", "27vd145b", "/buttons/", - "27vd145b", + "1utjt0r2", + "/", + "1utjt0r2", + "/component/", + "1utjt0r2", + "/component/Main/", + "1utjt0r2", + "/component/Main/component/", + "1utjt0r2", + "/component/Main/component/new_ui/", + "1utjt0r2", + "/component/clearing/", + "1utjt0r2", + "/component/clearing/image/", + "1utjt0r2", "/images/", + "1utjt0r2", + "/mgr/", "lkq9ne9s", "/", "lkq9ne9s", - "/buttons/", - "lkq9ne9s", "/component/", "lkq9ne9s", + "/component/HuTip/", + "lkq9ne9s", "/component/Main/", "lkq9ne9s", "/component/Main/component/", "lkq9ne9s", + "/component/Main/component/Folder/", + "lkq9ne9s", + "/component/Main/component/Folder/component/", + "lkq9ne9s", + "/component/Main/component/Folder/component/phone_info/", + "lkq9ne9s", + "/component/Main/component/new_ui/", + "lkq9ne9s", "/component/Main/images/", "lkq9ne9s", + "/component/Main/new_ui/", + "lkq9ne9s", + "/component/chi/", + "lkq9ne9s", + "/component/chi/component/", + "lkq9ne9s", + "/component/chi/component/choose/", + "lkq9ne9s", + "/component/chi_peng_effect/", + "lkq9ne9s", "/component/game/", "lkq9ne9s", + "/component/option/", + "lkq9ne9s", + "/component/setting/", + "lkq9ne9s", + "/component/setting/images/", + "lkq9ne9s", "/image/", "lkq9ne9s", - "/image/main_2/", - "lkq9ne9s", "/images/", - "lkq9ne9s", - "/images/voice/" + "m7iejg46", + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/Main/component/new_ui/niyimh.png b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/Main/component/new_ui/niyimh.png index 83258382..5a84d07d 100644 Binary files a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/Main/component/new_ui/niyimh.png and b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/Main/component/new_ui/niyimh.png differ diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml index bee6a04f..01cf8a3a 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml @@ -1,96 +1,94 @@ - + - + - - + + + + - - - - +