diff --git a/lua_probject/base_project/Game/View/ViewUtil.lua b/lua_probject/base_project/Game/View/ViewUtil.lua index 2bc7ded3..b37f07f2 100644 --- a/lua_probject/base_project/Game/View/ViewUtil.lua +++ b/lua_probject/base_project/Game/View/ViewUtil.lua @@ -152,19 +152,21 @@ function ViewUtil.HandCardSort3(a, b) return sort_a < sort_b end -function ViewUtil.CardPos(obj, area, oder, index, offset, isAdd) - offset = offset or 0 +function ViewUtil.CardPos(obj, area, oder, index, data) + local data = data or {} + local offset = data.offset or 0 + local gup = data.gup or 0 if oder == AreaOderType.left_right then obj.x = index * obj.width + offset elseif oder == AreaOderType.up_down then - obj.y = index * obj.height + offset + obj.y = index * obj.height + offset - index * gup elseif oder == AreaOderType.right_left then obj.x = (area.width - obj.width) - index * obj.width - offset elseif oder == AreaOderType.down_up then - if isAdd then + if data.isAdd then obj.y = area.height - obj.height - index * obj.height * 1.5 - offset else - obj.y = area.height - obj.height - index * obj.height - offset + obj.y = area.height - obj.height - index * obj.height - offset + index * gup end --obj.y = area.height - obj.height - index * obj.height - offset end diff --git a/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua b/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua index f685a679..e1ca7fcc 100644 --- a/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua @@ -73,7 +73,7 @@ function M:UpdateHandCard(getcard, mp, opcard) if opnum ~= -1 then loc = CardPos(obj, self._area_handcard_list, oder, loc, offset) else - ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset) + ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, {offset=offset}) end --改变左右两边的手牌的x值 if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then @@ -99,7 +99,7 @@ function M:UpdateHandCard(getcard, mp, opcard) local obj = UIPackage.CreateObject("Main_Majiang", comp) self:fillCard(obj,card,_player.card_list[i+1]) local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0) - ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset) + ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, {offset=offset}) --改变左右两边的手牌的x值 if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then obj.x = i * -7 diff --git a/lua_probject/extend_project/extend/poker/runfast/EXWitnessView.lua b/lua_probject/extend_project/extend/poker/runfast/EXWitnessView.lua index 4fcc92d2..1226be0f 100644 --- a/lua_probject/extend_project/extend/poker/runfast/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/EXWitnessView.lua @@ -387,7 +387,6 @@ function M:EventInit() head_info._view:GetChild("shengyu").text = card_number end end - head_info:SetBaoDan(card_number == 1) local card_info = self._player_card_info[index] card_info:SetOutCardInfo(p.out_card_list, false, true) card_info._ctr_time_clock.selectedIndex = 0 @@ -584,11 +583,8 @@ function M:EventInit() local player = info[i] local p = self._room:GetPlayerBySeat(player.seat) local head_info = self._player_info[self:GetPos(player.seat)] - head_info:SetBaoDan(false) head_info._view:GetChild('text_jifen').text = player.score - -- head_info:PlayScore(player.winscore, win_seat == player.seat) - head_info:PlayScore(player.card_score, win_seat == player.seat) end for i = 1, #info do @@ -737,7 +733,6 @@ function M:EventInit() local score = scoreList[i].pomSore local player = self._room:GetPlayerBySeat(scoreList[i].seat) local head_info = self._player_info[self:GetPos(scoreList[i].seat)] - head_info:PlayScore(score, true) head_info:UpdateScore(player.total_score) end end) diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index 0363d22a..17fa30c4 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -935,11 +935,6 @@ function M:EventInit() self.destory_win = nil self.destory_win = coroutine.start(function() - if win_seat == self._room.self_player.seat then - ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3") - else - ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/lose_music.mp3") - end coroutine.stop(self._leftClock_continue) for i = 1, #self._player_card_info do local card_info = self._player_card_info[i] @@ -983,32 +978,6 @@ function M:EventInit() local p = self._room:GetPlayerBySeat(player.seat) local head_info = self._player_info[self:GetPos(player.seat)] end - - for i = 1, #info do - local player = info[i] - local p = self._room:GetPlayerBySeat(player.seat) - local head_info = self._player_info[self:GetPos(player.seat)] - local card_info = self._player_card_info[self:GetPos(player.seat)] - - if player.seat ~= win_seat then - card_info.ctr_outpoker.selectedIndex = 0 - end - if player.seat ~= self._room.self_player.seat then - local oneTime = 7 / 60 - - -- card_info:UpdateHandPoker(player.cards, false, true) - - card_info._view_resultOut:RemoveChildrenToPool() - card_info._ctr_resultOut.selectedIndex = 1 - for i = 1, #player.handCards do - local child_card = card_info._view_resultOut:AddItemFromPool() - card_info:FillPoker(child_card, "", nil, player.handCards[i]) - ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/fanCard.mp3") - printlog("lingmeng oneTime", oneTime) - coroutine.wait(oneTime) - end - end - end self:ChangeBgmMusic(1) -- if over == 0 then -- if #self:GetSpringSeats(info) > 0 then diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua index 66d2b58e..3a4fd22b 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua @@ -447,9 +447,10 @@ function M:FillPoker(poker, prefix, num, code) if num ~= nil then code = self:ChangeCodeByTo(num) end - local suffix = code == 310 and - (DataManager.CurrenRoom.pai == 0 and (DataManager.CurrenRoom.room_config.Heart10 == 2 and "_1" or "") or "_2") or - "" + local suffix = "" + -- local suffix = code == 310 and + -- (DataManager.CurrenRoom.pai == 0 and (DataManager.CurrenRoom.room_config.Heart10 == 2 and "_1" or "") or "_2") or + -- "" code = code == 1 and "00" or code if not poker.icon then poker:GetChild('icon').url = string.format("ui://Extend_Poker_RunFastNew/%s%s%s", prefix, code, suffix) diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua index d9a569e4..5eeb0780 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -38,42 +38,38 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) ViewManager.ChangeView(ViewManager.View_Lobby) end - self._view:GetChild('btn_over1Close').onClick:Set(function() - if over == 0 then - self:Close() - else - self._view:GetController('over').selectedIndex = 1 - end - end) - - self._view:GetChild('btn_nextRound').onClick:Set(function() - if over == 0 then + local btn_confirm = self._view:GetChild('btn_confirm') + btn_confirm.onClick:Add( + function() local _gamectr = ControllerManager.GetController(GameController) _gamectr:ConformToNextGame() - self._root_runFast._ctr_inClear.selectedIndex = 0 self:Destroy() - else - self._view:GetController('over').selectedIndex = 1 end - end) + ) - self.ClearReady = function() - if over == 0 then - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:ConformToNextGame() - self._root_runFast:ClearOk() - self:Destroy() - else - self._view:GetController('over').selectedIndex = 1 - end - end + local btn_Show1 = self._view:GetChild('btn_Show1') + btn_Show1.onClick:Set(function() + self._view:GetController('over').selectedIndex = 1 + end) self._view:GetChild('btn_closeRound').onClick:Set(function() ViewManager.ChangeView(ViewManager.View_Lobby) end) - self._view:GetController('win').selectedIndex = win_seat == room.self_player.seat and 1 or 0 + local bgWindow = self._view:GetChild('bgWindow') + if win_seat == room.self_player.seat then + bgWindow.text = "胜利" + bgWindow:GetController('bianhui').selectedIndex = 0 + else + bgWindow.text = "失败" + bgWindow:GetController('bianhui').selectedIndex = 1 + end + -- self._view:GetController('win').selectedIndex = win_seat == room.self_player.seat and 1 or 0 + local rt = 1 + if room.hpOnOff == 1 then + rt = room.score_times + end local over0List = self._view:GetChild('list_over0') over0List:SetVirtual() over0List.itemRenderer = function(index, obj) @@ -82,37 +78,64 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) obj:GetChild('name').text = playerInfo.self_user.nick_name obj:GetChild('residue').text = #info.handCards obj:GetChild('bomb').text = info.thisboomnum - obj:GetChild('score').text = info.winscore > 0 and string.format("+%d", info.winscore) or info.winscore - obj:GetController('chuntian').selectedIndex = info.chuntian and 1 or 0 + obj:GetChild('piao').text = info.piao < 0 and 0 or info.piao + local roundScore = info.winCardScore + local jifen = "" + if roundScore >= 0 then + jifen = "+" .. roundScore + else + jifen = "" .. roundScore + end + jifen = jifen .. " " + + local tili = "" + if room.hpOnOff > 0 then + local need = roundScore * rt + tili = "(" + if roundScore > 0 then + tili = tili .. "+" .. tostring(need) + else + tili = tili .. tostring(need) + end + + tili = tili .. ")" + end + obj:GetChild('score').text = jifen .. tili + + local list_residue = obj:GetChild('list_residue') + list_residue:RemoveChildrenToPool() + for i, v in ipairs(info.handCards) do + local rc = list_residue:AddItemFromPool() + rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v) + rc:GetController('choose').selectedIndex = 0 + end + for i, v in ipairs(info.outCards) do + local rc = list_residue:AddItemFromPool() + rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v) + rc:GetController('choose').selectedIndex = 1 + end end over0List.numItems = #data - self._root_runFast._ctr_inClear.selectedIndex = 1 if over == 1 or (over == 2 and room.curren_round > 0) then - local bigSeat = 0 - local bigScore = 0 - for i = 1, #data do - if data[i].total_score > bigScore then - bigSeat = i - bigScore = data[i].total_score - end - end - self._view:GetChild('text_roomID').text = room.room_id - self._view:GetChild('text_time').text = os.date('%m-%d %H:%M', os.time()) - self._view:GetChild('text_groupID').text = room.group_id or 0 - self._view:GetController('num').selectedIndex = #data == 2 and 0 or 1 - self._view:GetController('isgroup').selectedIndex = room.group_id ~= 0 and 1 or 0 + self._view:GetController('lastRound').selectedIndex = 1 + self._view:GetChild('txt_room_id').text = '房号:' .. roomid + self._view:GetChild('txt_game_name').text = room.room_config:GetGameName() + self._view:GetChild('txt_game_data').text = os.date('%Y-%m-%d %H:%M', os.time()) + local str_roominfo = string.gsub(room.room_config:GetDes(), '\r', '') + self._view:GetChild('txt_play').text = str_roominfo for i = 1, #data do local info = data[i] local playerInfo = room:GetPlayerBySeat(info.seat) - printlog("lingmeng clear", playerInfo.nick_name, info.total_score, i == bigSeat) - self:FillPlayerInfoEnd(self._view:GetChild(string.format("comp_playerInfo%d_over1", i)), info, playerInfo, - i == bigSeat) + self:FillPlayerInfoEnd(self._view:GetChild(string.format("comp_playerInfo%d_over1", i)), info, playerInfo, rt, + bgWindow) + end + local list_residue = self._view:GetChild('list_residue') + list_residue:RemoveChildrenToPool() + for i, v in ipairs(remaincards) do + local rc = list_residue:AddItemFromPool() + rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v) end - coroutine.start(function() - coroutine.wait(2) - self._view:GetController('over').selectedIndex = 1 - end) end @@ -145,31 +168,52 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) GameApplication.Instance:CopyToClipboard(resultStr) end) end + + local btn_continue_game = self._view:GetChild('btn_continue_game') + if btn_continue_game then + local gid = room.group_id + if gid ~= 0 then + btn_continue_game.visible = true + local pid = room.room_config.pid + local game_id = room.game_id + btn_continue_game.onClick:Set( + function() + self:ContinueGame(gid, pid, game_id) + end + ) + end + end end -function M:FillPlayerInfoEnd(view, info, playerInfo, bigWin) +function M:FillPlayerInfoEnd(view, info, playerInfo, rt,bgWindow) local room = DataManager.CurrenRoom - self:FillPlayerHead(view:GetChild('comp_playerInfo'), playerInfo, bigWin) - - local detailList = view:GetChild('list_detail') - - self:FillDetailChild(detailList:AddItemFromPool(), 0, info.settle_log.maxscore) - self:FillDetailChild(detailList:AddItemFromPool(), 1, info.settle_log.boomnum) - self:FillDetailChild(detailList:AddItemFromPool(), 2, - string.format("%d赢%d输", info.settle_log.winnum, room.room_config.Times - info.settle_log.winnum)) - self:FillDetailChild(detailList:AddItemFromPool(), 3, info.total_score) -end - -function M:FillPlayerHead(view, playerInfo, bigWin) ImageLoad.Load(playerInfo.self_user.head_url, view:GetChild('btn_head')._iconObject) view:GetChild('text_name').text = ViewUtil.stringEllipsis(playerInfo.self_user.nick_name) - view:GetChild('text|_ID').text = playerInfo.self_user.account_id - view:GetController('bigWin').selectedIndex = bigWin and 1 or 0 + view:GetChild('text_ID').text = playerInfo.self_user.account_id + + local detailList = view:GetChild('list_detail') + self:FillDetailChild(detailList:AddItemFromPool(), "赢局数:", info.settle_log.winnum) + self:FillDetailChild(detailList:AddItemFromPool(), "打出炸弹数:", info.settle_log.boomnum) + self:FillDetailChild(detailList:AddItemFromPool(), "春天次数:", info.settle_log.springnum) + self:FillDetailChild(detailList:AddItemFromPool(), "当局最高分:", info.settle_log.maxscore * rt) + + view:GetChild('text_daniao').text = info.daniao + view:GetChild('text_toltalScore').text = info.total_score + view:GetChild('text_score').text = info.total_score - info.daniao + view:GetController('win').selectedIndex = info.total_score >= 0 and 1 or 0 + + if info.seat == room.self_player.seat and info.total_score >= 0 then + bgWindow.text = "胜利" + bgWindow:GetController('bianhui').selectedIndex = 0 + else + bgWindow.text = "失败" + bgWindow:GetController('bianhui').selectedIndex = 1 + end end function M:FillDetailChild(view, index, value) - view:GetController('ShowTitle').selectedIndex = index + view:GetChild('text_title').text = index view:GetChild('text_value').text = value end diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 85d74c7e..4b6c91ac 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -158,10 +158,10 @@ function M:UpdateHandCard(getcard, mp) local _room = DataManager.CurrenRoom local people_num = _room.room_config.people_num local pos = ViewUtil.GetPos(_room.self_player.seat, _player.seat, people_num) - local gap = (pos == 3 and people_num == 4 or pos == 2 and people_num == 2) and 15 or 45 + local gap = (pos == 3 and people_num == 4 or pos == 2 and people_num == 2) and 38 or 45 local offset = getcard and (i == _player.hand_left_count - 1 and gap or 0) -- local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0) - ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset) + ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, {offset=offset}) --改变左右两边的手牌的x值 if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then @@ -193,7 +193,7 @@ function M:UpdateHandCard(getcard, mp) local offset = getcard and (i == _player.hand_left_count - 1 and 0 or 0) - ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset) + ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, {offset=offset}) --改变左右两边的手牌的x值 if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then @@ -294,7 +294,7 @@ function M:UpdateOutCardList(outcard, card_item, cursor) local obj = nil self._area_outcard_list:RemoveChildren(0, -1, true) - for i = 0, #outlist - 1 do + for i = 0,#outlist - 1 do obj = UIPackage.CreateObjectFromURL('ui://Main_Majiang/' .. comp) local row = math.floor(i / num) local col = math.floor(i % num) @@ -307,7 +307,7 @@ function M:UpdateOutCardList(outcard, card_item, cursor) end ViewUtil.CardPos(obj, self._area_outcard_list, oder, col) - ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row) + ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row,{gup=15}) if self._current_card_type == 2 then self:adjust3dOutPut(obj, self._area_outcard_list, oder, num, i) diff --git a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua index 9e2a455f..a5cc62d1 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua @@ -55,7 +55,7 @@ function M:init() end function M:setHandCardPos(btn_card, i, getcard) - btn_card.x = 71 + i * btn_card.width * 1.05 + (getcard and 20 or 0) + btn_card.x = 71 + i * btn_card.width + (getcard and 38 or 0) end function M:UpdateHandCard(getcard, mp) @@ -95,7 +95,7 @@ function M:UpdateHandCard(getcard, mp) local btn_card = UIPackage.CreateObject(self:GetCardObjPack(), "Btn_Card" .. b3d) - btn_card:SetScale(1.05, 1.05) + -- btn_card:SetScale(1.05, 1.05) -- btn_card.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. tem_card) self:fillCard(btn_card, "201_", tem_card) self:setHandCardPos(btn_card, i, i == #cards - 1 and getcard) @@ -132,7 +132,7 @@ function M:UpdateHandCard(getcard, mp) local mp_card = UIPackage.CreateObject("Main_Majiang", "Mp_self_card" .. b3d) -- mp_card.icon = UIPackage.GetItemURL("Main_Majiang", "202_" .. cards[i+1]) self:fillCard(mp_card, "202_", cards[i + 1]) - mp_card:SetScale(1.05, 1.05) + -- mp_card:SetScale(1.05, 1.05) -- mp_card.x = i * mp_card.width + (i == #cards - 1 and getcard and 20 or 0) self:setHandCardPos(mp_card, i, i == #cards - 1 and getcard) _lit:AddChild(mp_card) diff --git a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua index 4e455f6f..d70e1d8e 100644 --- a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua +++ b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua @@ -21,6 +21,7 @@ function MJSettingViewNew.new(blur_view, show_dialect) self.cd_time = 0 self._btn_dismiss_room_enable = true self._full = true + self._full_offset = false self._anim_pop = 2 self._close_zone = true self._show_dialect = show_dialect diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json index 4560ef85..5a74b1fc 100644 --- a/wb_new_ui/.objs/fonts.json +++ b/wb_new_ui/.objs/fonts.json @@ -13,6 +13,7 @@ ui://27vd145bz5om44 ui://27vd145bik9v7ing ui://27vd145bcv577ioj ui://27vd145bik9v7imb +ui://27vd145byffn7iqf ui://3qr8nmi47q1m2h ui://fnuxqeflkllg1u ui://fnuxqeflkllg1v diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info index 54a8b71c..f4c95feb 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -9,15 +9,11 @@ "n87_q50p": { "hidden": true }, - "n86_q50p": { - "collapsed": true - }, "n179_yffn": { "collapsed": true }, "n131_ckvb": { - "hidden": true, - "collapsed": true + "hidden": true }, "n164_ukp7": { "locked": true, diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m9y.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m9y.info new file mode 100644 index 00000000..8cb8bf3d --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m9y.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n4_snta": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7mgp.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7mgp.info new file mode 100644 index 00000000..39b8e1c5 --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7mgp.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n5_n6cm": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/Common/UIPanel.xml b/wb_new_ui/assets/Common/UIPanel.xml index 568e630c..5ea1c0d0 100644 --- a/wb_new_ui/assets/Common/UIPanel.xml +++ b/wb_new_ui/assets/Common/UIPanel.xml @@ -1,17 +1,15 @@ - + - + - - diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Btn_chat.xml b/wb_new_ui/assets/Common/component/Btn_chat.xml similarity index 100% rename from wb_new_ui/assets/Extend_Poker_RunFastNew/Btn_chat.xml rename to wb_new_ui/assets/Common/component/Btn_chat.xml diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/phone_info/Component3(1).xml b/wb_new_ui/assets/Common/component/Component3(1).xml similarity index 82% rename from wb_new_ui/assets/Extend_Poker_RunFastNew/component/phone_info/Component3(1).xml rename to wb_new_ui/assets/Common/component/Component3(1).xml index ac5aa5c5..c6c3cc86 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/phone_info/Component3(1).xml +++ b/wb_new_ui/assets/Common/component/Component3(1).xml @@ -2,13 +2,13 @@ - + - + - + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Gcm_chat.xml b/wb_new_ui/assets/Common/component/Gcm_chat.xml similarity index 86% rename from wb_new_ui/assets/Extend_Poker_RunFastNew/Gcm_chat.xml rename to wb_new_ui/assets/Common/component/Gcm_chat.xml index 160e057e..d13b4984 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Gcm_chat.xml +++ b/wb_new_ui/assets/Common/component/Gcm_chat.xml @@ -3,10 +3,10 @@ - +