diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua index 7a58a891..194964c2 100644 --- a/lua_probject/base_project/Game/View/ResultView.lua +++ b/lua_probject/base_project/Game/View/ResultView.lua @@ -257,7 +257,7 @@ function M:InitBigResult(room, fontsize) big_result:GetChild('txt_room_id').text = '房号:' .. self._resultInfo.room_id big_result:GetChild('txt_game_name').text = self._resultInfo.game_name big_result:GetChild('txt_game_data').text = os.date('%Y-%m-%d %H:%M', os.time()) - + local str_roominfo = string.gsub(room.room_config:GetDes(), '\r', '') big_result:GetChild('txt_play').text = str_roominfo diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameInfo.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameInfo.lua index 1969f2d8..0b7d099e 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameInfo.lua @@ -114,6 +114,7 @@ function M:SelectedConfigData() _data['opt'] = round -- 1 2 8局 16 局 _data['AA'] = Cost _data['maxPlayers'] = renshu + _data['mode'] = round --模式： _data['shoupai'] = shoupai --手牌 _data["choupai"] = choupai --抽牌 _data['hunum'] = hunum --胡息计算 diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 0e87a94f..b47e451c 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -724,7 +724,17 @@ function M:__TipAction(context) local td = data[2] local tip_hu = data[3] local list = tip.tip_map_type[td.weight] + printlog("tipaction :") + pt(list) + printlog(list[1]['bi_list']==nil) if (#list > 1) or td.type == 1 then + if list[1]['bi_list']==nil then + _gamectr:SendAction(list[1]["id"]) + self:__CloseTip() + local info = self._player_card_info[1] + info:UpdateIsOnClick(false) + return + end self:_ChiView( list, tip_hu, @@ -983,8 +993,10 @@ function M:OnFangziAction(...) effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'peng') elseif fz.type == RB_FZType.Chi then -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "chi") + printlog("jefe self RB_FZType 3=======") self:PlaySound(player.self_user.sex, 'F_Chi') effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'chi') + printlog("jefe self RB_FZType 4=======") elseif fz.type == RB_FZType.Wei then -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "wei") self:PlaySound(player.self_user.sex, 'F_GuoSao') @@ -1002,6 +1014,7 @@ function M:OnFangziAction(...) effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'ti') -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "ti") end + printlog("jefe self RB_FZType 5=======") effect.touchable = false effect.x, effect.y = 0, 0 effect:GetTransition('t0'):Play() @@ -1012,6 +1025,7 @@ function M:OnFangziAction(...) effect:Dispose() end ) + printlog("jefe self RB_FZType 6=======") end if (player == self._room.self_player) then coroutine.start( @@ -1022,18 +1036,24 @@ function M:OnFangziAction(...) end ) end + printlog("seft rbtpe1") local removeOutcard = _player_card_info[self:GetPos(fz.from_seat)] local p = self._room:GetPlayerBySeat(fz.from_seat) + printlog("seft rbtpe133") if p.DiceCard ~= nil and fz.active_card == p.DiceCard then + printlog("seft rbtpeeee2") removeOutcard:ClearOutCard() + printlog("seft rbtpeeee") p.DiceCard = nil end + printlog("seft rbtpe2") local list = self._room.player_list for i = 1, #list do local p = list[i] local info = self._player_info[self:GetPos(p.seat)] info._view:GetChild('huxi').text = p.hu_xi end + printlog("seft rbtpe3") self._popEvent = true coroutine.start( function() @@ -1042,6 +1062,7 @@ function M:OnFangziAction(...) info:UpdateIsOnClick(true) end ) + printlog("seft rbtpe4") end function M:ReloadRoom() diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXRoomConfig.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXRoomConfig.lua index 97b963a0..238eeebb 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXRoomConfig.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXRoomConfig.lua @@ -51,125 +51,9 @@ function M:GetDes(sp) str = str .. sp end end - if (self.mode==3) then - str = str .. "全名堂" - str = str .. sp - str = str .. (self.tun).."囤" - str = str .. sp - if self.fengding == 0 then - str = str .. "不封顶" - str = str .. sp - elseif self.fengding == 1 then - str = str .. "100封顶" - str = str .. sp - elseif self.fengding == 2 then - str = str .. "200封顶" - str = str .. sp - elseif self.fengding == 3 then - str = str .. "300封顶" - str = str .. sp - elseif self.fengding == 4 then - str = str .. "500封顶" - str = str .. sp - elseif self.fengding == 5 then - str = str .. "1000封顶" - str = str .. sp - end - if self.tuanyuan == 1 then - str = str .. "大团圆" - str = str .. sp - end - if self.hanghangxi == 1 then - str = str .. "行行息" - str = str .. sp - end - if self.siqi == 1 then - str = str .. "四七红" - str = str .. sp - end - if self.shuahou == 1 then - str = str .. "耍猴" - str = str .. sp - end - if self.huangfan == 1 then - str = str .. "黄番" - str = str .. sp - end - if self.jiaxingxing == 1 then - str = str .. "假行行" - str = str .. sp - end - if self.tinghu == 1 then - str = str .. "听胡" - str = str .. sp - end - if self.back == 1 then - str = str .. "背靠背" - str = str .. sp - end - if self.yuan == 1 then - str = str .. "圆" - str = str .. sp - end - elseif (self.mode == 2 ) then - str = str .. "红黑点" - str = str .. sp - str = str .. (self.tun).."囤" - str = str .. sp - if self.duizifu == 1 then - str = str .. "对子胡" - str = str .. sp - end - if self.fengding == 0 then - str = str .. "不封顶" - str = str .. sp - elseif self.fengding == 1 then - str = str .. "单局20封顶" - str = str .. sp - elseif self.fengding == 2 then - str = str .. "单局40封顶" - str = str .. sp - end - elseif (self.mode == 1 ) then - str = str .. "跑胡子 十五息起胡 一息一囤 明偎 天地胡 30胡翻倍 大小字 碰碰胡 一点胡 红黑胡" - str = str .. sp - -- if self.tianhu == 1 then - -- str = str .. "天胡" - -- str = str .. sp - -- end - -- if self.dihu == 1 then - -- str = str .. "地胡" - -- str = str .. sp - -- end - -- if self.haihu == 1 then - -- str = str .. "海湖" - -- str = str .. sp - -- end - -- if self.tinghu == 1 then - -- str = str .. "听胡" - -- str = str .. sp - -- end - -- if self.huangfan == 1 then - -- str = str .. "黄番" - -- str = str .. sp - -- end - - -- str = str .. (self.tun).."囤" - str = str .. sp - if self.fengding == 0 then - str = str .. "不封顶" - str = str .. sp - elseif self.fengding == 1 then - str = str .. "60封顶" - str = str .. sp - elseif self.fengding == 2 then - str = str .. "80封顶" - str = str .. sp - end - end - - str = str.sub(str,1,string.len(str)-string.len(sp)) + str = str .. "娄底放炮罚 十五息起胡 明偎 天地胡 30胡翻倍 红黑胡" + str = str .. sp return str end 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 8d2f56d8..e4fc4f60 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -14,7 +14,7 @@ function FanPaoFa_ResultView.new(blur_view, index) end self._close_zone = false - self:init('ui://Extend_Poker_FanPaoFa/clearing') + self:init("ui://Extend_Poker_FanPaoFa/clearing") self.xiPaiCtr=self._view:GetController("xipai") return self end @@ -22,7 +22,9 @@ end function M:init(url) printlog("init view fanpaofa") ResultView.init(self, url) + printlog("init view fanpaofa2") local btn_share = self._view:GetChild('btn_share') + printlog("init view fanpaofa3") btn_share.onClick:Set( function() ShareScreenShot() @@ -69,6 +71,8 @@ function M:InitData(over, room, result, total_result, callback) xipai.text="洗牌 积分x"..result.xipai_score end + printlog("resultsss") + if result ~= nil and result.liuju == true then _icon.icon = 'ui://Main_RunBeard/liuju' _btnCtr.selectedIndex = 0 @@ -257,11 +261,12 @@ function M:FillLiuJuItemData(room, data) end function M:FillItemData(room, data, item) + printlog("FillItemData") local dipai_list = self._view:GetChild('dipai_list') dipai_list:RemoveChildren(0, -1, true) if data.left_card ~= nil and #data.left_card > 0 then for i = 1, #data.left_card do - local dipais = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Qipai') + local dipais = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Qipais') dipais:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/202_', data.left_card[i]) dipai_list:AddChild(dipais) end @@ -659,10 +664,13 @@ function M:FillItemData2(room, data, list) player_list[i].param[2].key = '胡息总数:' player_list[i].param[2].value = tostring(hxcount) end + local round = room.room_config.round self:GenerateRoomResultInfo(round, room.room_config:GetGameName(), room.room_id, room.create_time, player_list) self:SetGSListlineGap(5) + self:InitBigResult(room, 26) + DataManager.CurrenRoom = nil -- list:RemoveChildrenToPool() -- for i =1, #data do diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua index caf23451..c689ec32 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua @@ -203,7 +203,7 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat) outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300" else outcards:GetChild("icon").icon =self:getCardItem("ui://Main_RunBeard/203_",outcard) - self._bgview.selectedIndex=1 + -- self._bgview.selectedIndex=1 end outcards.x,outcards.y = 0,0 local show_di_bg = outcards:GetChild("show_di_bg") diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index 1b551428..b124a8c8 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -302,7 +302,7 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat) show_di_bg.visible = false end self._area_outcard_list:AddChild(outcards) - self._bgview.selectedIndex = 1 + --self._bgview.selectedIndex = 1 end --弃牌 @@ -324,7 +324,7 @@ end function M:PlayingOutCardAnima( card) coroutine.start(function() coroutine.wait(0.1) - self._bgview.selectedIndex = 1 + -- self._bgview.selectedIndex = 1 self:ClearOutCard() end) end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua index c26f6689..1dcd0832 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua @@ -61,7 +61,6 @@ end function M:Clear() self._area_outcard_list:RemoveChildren(0, -1, true) - self._bgview.selectedIndex=0 self._area_fz_list:RemoveChildren(0, -1, true) self._area_handcard_list:RemoveChildren(0, -1, true) self._area_qipai_list:RemoveChildren(0, -1, true) @@ -76,7 +75,6 @@ end function M:ClearOutCard() self._area_outcard_list:RemoveChildren(0, -1, true) - self._bgview.selectedIndex = 0 end --弃牌 @@ -251,7 +249,7 @@ function M:UpdateOutCardList(outcard) end outcards.x,outcards.y = 0,0 self._area_outcard_list:AddChild(outcards) - self._bgview.selectedIndex=1 + -- self._bgview.selectedIndex=1 end --摸牌动画 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 0177cb63..828f042e 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -60,7 +60,7 @@ function M:init() self._room = DataManager.CurrenRoom self._area_handcard_list = view:GetChild('area_handcard_list') self._area_outcard_list = view:GetChild('area_outcard_list') - self._bgview = view:GetController("bgview") + -- self._bgview = view:GetController("bgview") self._area_fz_list = view:GetChild('area_fz_list') self._area_qipai_list = view:GetChild('windcard_list') self._mask_liangpai = view:GetChild('mask_liangpai') @@ -135,7 +135,7 @@ end function M:Clear() self.outcard_button = nil self._area_outcard_list:RemoveChildren(0, -1, true) - self._bgview.selectedIndex = 0 + -- self._bgview.selectedIndex = 0 self._area_fz_list:RemoveChildren(0, -1, true) self._area_handcard_list:RemoveChildren(0, -1, true) self._area_qipai_list:RemoveChildren(0, -1, true) @@ -852,7 +852,7 @@ end function M:ClearOutCard() self._area_outcard_list:RemoveChildren(0, -1, true) - self._bgview.selectedIndex = 0 + -- self._bgview.selectedIndex = 0 end --出牌 function M:UpdateOutCardList(outcard) @@ -865,7 +865,7 @@ function M:UpdateOutCardList(outcard) end outcards.x, outcards.y = 0, 0 self._area_outcard_list:AddChild(outcards) - self._bgview.selectedIndex = 1 + -- self._bgview.selectedIndex = 1 end --弃牌 @@ -888,7 +888,7 @@ function M:PlayingOutCardAnima(card) coroutine.start( function() coroutine.wait(0.1) - self._bgview.selectedIndex = 1 + -- self._bgview.selectedIndex = 1 self:ClearOutCard() end ) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua index ecddb3a7..f0865ca8 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua @@ -253,7 +253,7 @@ function M:UpdateIndex() elseif n == 8 then c1.selectedIndex = 3 else - c1.selectedIndex = 6 + c1.selectedIndex = 2 end end end diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index e078dbbb..85f03107 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index f8239774..8d46756e 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index ab4b6654..78256ea4 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 0e96c4ac..51849c74 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info b/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info new file mode 100644 index 00000000..e64d38e1 --- /dev/null +++ b/wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n33_n1ry": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/aen81b0.info b/wb_new_ui/.objs/metas/v6yvqp7w/aen81b0.info index b1e3551b..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/v6yvqp7w/aen81b0.info +++ b/wb_new_ui/.objs/metas/v6yvqp7w/aen81b0.info @@ -1,13 +1 @@ -{ - "objectStatus": { - "n11_tjnv": { - "collapsed": true - }, - "n14_tjnv": { - "collapsed": true - }, - "n34_aen8": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/aen81bc.info b/wb_new_ui/.objs/metas/v6yvqp7w/aen81bc.info new file mode 100644 index 00000000..c33f1522 --- /dev/null +++ b/wb_new_ui/.objs/metas/v6yvqp7w/aen81bc.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n15_n12b": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info index 3d14a8aa..22178475 100644 --- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info +++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info @@ -1,8 +1,3 @@ { - "objectStatus": { - "n45_j34t": { - "collapsed": true - } - }, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qw4.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qw4.info index 1bbfc643..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qw4.info +++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qw4.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n33_e7qn": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info index 279642d4..78463cc0 100644 --- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info +++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info @@ -10,8 +10,7 @@ "hidden": true }, "n163_o49p": { - "hidden": true, - "collapsed": true + "hidden": true }, "n152_8th3": { "hidden": true diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 7445f5ed..45b6c99e 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -8,38 +8,51 @@ ], "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg4610snh5j", - "ui://0khx14are0py2", - "ui://2d9xdj6zfn7fao", - "ui://2d9xdj6zlumrgj", - "ui://m7iejg46kwi0hma", - "ui://27vd145bm16m7iji", - "ui://27vd145bh1uu3i", - "ui://m7iejg46gltdhc9", - "ui://m7iejg46hsbhhjn", - "ui://2zlli80mw9te0" - ], - "packageGroup.mine": [ - "m7iejg46" + "ui://ppu1wv76j4mf9j", + "ui://ppu1wv76j4mf9d", + "ui://ppu1wv76j4mf9e", + "ui://ppu1wv76j4mf9f", + "ui://ppu1wv76gzvy9q", + "ui://v6yvqp7waen81b0" ], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46kwi0hma", + "doc.activeDoc": "ui://ppu1wv76j4mf9j", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", "/", "27vd145b", + "/buttons/", + "27vd145b", "/component/", "27vd145b", - "/component/create_room/", + "/component/head/", "27vd145b", - "/component/create_room/image/", - "m7iejg46", + "/component/head/image/", + "27vd145b", + "/component/share/", + "27vd145b", + "/component/share/images/", + "27vd145b", + "/font/", + "27vd145b", + "/font/images/", + "ppu1wv76", "/", - "m7iejg46", - "/images/" + "ppu1wv76", + "/component/", + "ppu1wv76", + "/component/cards/", + "ppu1wv76", + "/component/clearing/", + "ppu1wv76", + "/component/clearing/image/", + "ppu1wv76", + "/component/clearing/images/", + "ppu1wv76", + "/component/effect/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml index 938cd170..b7510f5c 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml @@ -3,18 +3,18 @@ - - - - - - + - - - - + + + + + + + + + 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 ac483f4b..d98d2581 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 @@ -6,10 +6,11 @@ - + + - + @@ -23,79 +24,27 @@