diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua index 2529480b..29f5b427 100644 --- a/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua @@ -85,7 +85,7 @@ function M:InitData(over, room, result, total_result, callback) room.room_config.round, os.date("%Y-%m-%d %H:%M:%S", os.time())) self._view:GetChild("tex_gameinfo").text = string.gsub(room.room_config:GetDes(), "\r", "") - self.bgWindow = self._view:GetChild('bgWindow') + self.bgWindow = self._view:GetChild('bgWindow') local paixingxiangqing = self._view:GetChild("btn_detal") paixingxiangqing.visible = false @@ -129,6 +129,7 @@ function M:InitData(over, room, result, total_result, callback) if result.liuju then ctr_type.selectedIndex = 3 + self.bgWindow:GetController('bianhui').selectedIndex = 1 else local info_list = result.info_list for i = 1, #info_list do @@ -136,8 +137,10 @@ function M:InitData(over, room, result, total_result, callback) if is_win then if info_list[i].seat == room.self_player.seat then ctr_type.selectedIndex = 1 + self.bgWindow:GetController('bianhui').selectedIndex = 0 else ctr_type.selectedIndex = 2 + self.bgWindow:GetController('bianhui').selectedIndex = 1 end end end @@ -210,7 +213,7 @@ function M:FillItemData(room, data, item, active_player, niao) local _gamectr = ControllerManager.GetController(GameController) local p = room:GetPlayerBySeat(data["seat"]) item:GetChild("playerName").text = p.self_user.nick_name - ImageLoad.Load(p.self_user.head_url,item:GetChild('head')._iconObject) + ImageLoad.Load(p.self_user.head_url, item:GetChild('head')._iconObject) -- 手牌 local hand_cards = data["hand_card"] table.sort(hand_cards, ViewUtil.HandCardSort) @@ -340,7 +343,7 @@ function M:FillItemData2(room, data, list) if #player_list == 3 then lst_p.columnGap = 108 elseif #player_list == 2 then - lst_p.columnGap = 208 + lst_p.columnGap = 323 end self:InitBigResult(room, 30) local show_detail = room.hpOnOff == 1 diff --git a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua index 3553848f..06d8380f 100644 --- a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua @@ -5,17 +5,17 @@ local EXClearingView = {} local M = EXClearingView function EXClearingView.new(blur_view) - setmetatable(M, {__index = ResultView}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = ResultView }) + local self = setmetatable({}, { __index = M }) self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 self._blur_view = blur_view self._close_zone = false - self.xiPaiCtr=self._view:GetController("xipai") - - + self.xiPaiCtr = self._view:GetController("xipai") + + return self end @@ -28,36 +28,39 @@ function M:InitData(over, room, result, total_result, callback) local _btnCtr = self._view:GetController("button") local _sdkCtr = self._view:GetController("sdk") local ctr_type = self._view:GetController("type") - self._view:GetChild("tex_roominfo").text = string.format("房号%s 局%s/%s %s", room.room_id, room.curren_round, room.room_config.round, os.date("%Y-%m-%d %H:%M:%S", os.time())) + self._view:GetChild("tex_roominfo").text = string.format("房号%s 局%s/%s %s", room.room_id, room.curren_round, + room.room_config.round, os.date("%Y-%m-%d %H:%M:%S", os.time())) self._view:GetChild("tex_gameinfo").text = string.gsub(room.room_config:GetDes(), "\r", "") - local paixingxiangqing=self._view:GetChild("btn_detal") - paixingxiangqing.visible=false - - local fanhuipaixing=self._view:GetChild("btn_fanhuipaixing") - fanhuipaixing.visible=false - - local xpconfig=DataManager.CurrenRoom.room_config.config.xi_pai + local paixingxiangqing = self._view:GetChild("btn_detal") + paixingxiangqing.visible = false + + local fanhuipaixing = self._view:GetChild("btn_fanhuipaixing") + fanhuipaixing.visible = false + + self.bgWindow = self._view:GetChild('bgWindow') + + local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai printlog("jefe xipa") printlog(xpconfig) if xpconfig then - self.xiPaiCtr.selectedIndex=1 + self.xiPaiCtr.selectedIndex = 1 else - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 end - + if over ~= 2 then - local xipai=self._view:GetChild("btn_xipai") - xipai.touchable=true - + local xipai = self._view:GetChild("btn_xipai") + xipai.touchable = true + xipai.onClick:Add(function() - local xiPaiCallBack=function () - xipai.touchable=false - self.xiPaiCtr.selectedIndex=0 + local xiPaiCallBack = function() + xipai.touchable = false + self.xiPaiCtr.selectedIndex = 0 local _gamectr = ControllerManager.GetController(GameController) _gamectr:PlayerReady() self:DestroyWithCallback() - + --ViewUtil.ErrorTip(1000000,"申请洗牌成功") end local _gamectr = ControllerManager.GetController(GameController) @@ -65,11 +68,12 @@ function M:InitData(over, room, result, total_result, callback) end) if result and result.xipai_score then - xipai.text="洗牌 积分x"..result.xipai_score + xipai.text = "洗牌 积分x" .. result.xipai_score end - + if result.liuju then ctr_type.selectedIndex = 3 + self.bgWindow:GetController('bianhui').selectedIndex = 1 else local info_list = result.info_list for i = 1, #info_list do @@ -77,8 +81,10 @@ function M:InitData(over, room, result, total_result, callback) if is_win then if info_list[i].seat == room.self_player.seat then ctr_type.selectedIndex = 1 + self.bgWindow:GetController('bianhui').selectedIndex = 0 else ctr_type.selectedIndex = 2 + self.bgWindow:GetController('bianhui').selectedIndex = 1 end end end @@ -93,7 +99,7 @@ function M:InitData(over, room, result, total_result, callback) end) self:AddClearItem(room, result.info_list, nil, over, result.niao, result.active_player) elseif over == 1 then - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 _btnCtr.selectedIndex = 1 _sdkCtr.selectedIndex = 1 btn_result.onClick:Add(function() @@ -111,7 +117,7 @@ function M:InitData(over, room, result, total_result, callback) end else _overCtr.selectedIndex = 1 - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 btn_close.onClick:Add(function() ViewManager.ChangeView(ViewManager.View_Lobby) end) @@ -119,23 +125,23 @@ function M:InitData(over, room, result, total_result, callback) end end -function M:AddClearItem(room, data, total_data,over, niao, active_player) +function M:AddClearItem(room, data, total_data, over, niao, active_player) local n = over + 1 local list_view1 = self._view:GetChild("player_list_1") local list_view2 = self._view:GetChild("player_list_2") if 0 == over or 1 == over then - table.sort(data, function(a,b) return a.seat > b.seat end) + table.sort(data, function(a, b) return a.seat > b.seat end) list_view1:RemoveChildrenToPool() - for i=1,#data do + for i = 1, #data do local item = list_view1:AddItemFromPool() self:FillItemData(room, data[i], item, active_player, niao) end - if #data == 3 then + if #data == 3 then list_view1.lineGap = 54 elseif #data == 2 then list_view1.lineGap = 108 end - if 1 == over then + if 1 == over then self:FillItemData2(room, total_data, list_view2) end elseif 2 == over then @@ -150,12 +156,12 @@ function M:FillItemData(room, data, item, active_player, niao) -- 手牌 local hand_cards = data["hand_card"] - table.sort( hand_cards, ViewUtil.HandCardSort) + table.sort(hand_cards, ViewUtil.HandCardSort) local hand_list_view = item:GetChild("hand_card_list") hand_list_view:RemoveChildrenToPool() - for i=1,#hand_cards do + for i = 1, #hand_cards do local card = hand_list_view:AddItemFromPool() - card.icon = "ui://Main_Majiang/202_"..hand_cards[i] + card.icon = "ui://Main_Majiang/202_" .. hand_cards[i] end hand_list_view.width = 52 * #hand_cards @@ -163,21 +169,21 @@ function M:FillItemData(room, data, item, active_player, niao) local fz_card_list = item:GetChild("fz_card_list") fz_card_list.width = 157 * #fz_card * 0.8 fz_card_list:RemoveChildrenToPool() - for i=1,#fz_card do + for i = 1, #fz_card do if fz_card[i].type == FZType.Peng then local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") - for j=1,3 do + for j = 1, 3 do local card = item:GetChild("card_" .. j) - card.icon = "ui://Main_Majiang/202_"..fz_card[i].card + card.icon = "ui://Main_Majiang/202_" .. fz_card[i].card end elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4") - for j=1,4 do + for j = 1, 4 do local card = item:GetChild("card_" .. j) if fz_card[i].type == FZType.Gang_An and j == 4 then card.icon = "ui://Main_Majiang/202_00" else - card.icon = "ui://Main_Majiang/202_"..fz_card[i].card + card.icon = "ui://Main_Majiang/202_" .. fz_card[i].card end end end @@ -188,11 +194,11 @@ function M:FillItemData(room, data, item, active_player, niao) local birdadd = data["niao_score"] local total = data["round_score"] local sp = " " - local str = "胡:"..huadd.."分" - str = str..sp.."杠:"..gangadd.."分" - str = str..sp.."扎鸟:"..birdadd.."分" + local str = "胡:" .. huadd .. "分" + str = str .. sp .. "杠:" .. gangadd .. "分" + str = str .. sp .. "扎鸟:" .. birdadd .. "分" if data["piao_niao_score"] then - str = str..sp.."飘鸟:"..data["piao_niao_score"].."分" + str = str .. sp .. "飘鸟:" .. data["piao_niao_score"] .. "分" end item:GetChild("score1").text = str -- local total_score = data["total_score"] @@ -217,19 +223,19 @@ function M:FillItemData(room, data, item, active_player, niao) local is_win = data["is_win"] or false item:GetController("win").selectedIndex = is_win and 0 or 1 - if p.self_user.account_id == active_player and is_win == false and total < 0 then - item:GetController("win").selectedIndex = 2 + if p.self_user.account_id == active_player and is_win == false and total < 0 then + item:GetController("win").selectedIndex = 2 end local win_card = item:GetChild("win_card") - if is_win then - win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] + if is_win then + win_card.icon = "ui://Main_Majiang/202_" .. data["win_card"] local lst_niao = item:GetChild("list_niao") lst_niao:RemoveChildrenToPool() for i = 1, #niao do if niao[i].score > 0 then local card_niao = lst_niao:AddItemFromPool() - card_niao.icon = "ui://Main_Majiang/202_" .. niao[i].card - end + card_niao.icon = "ui://Main_Majiang/202_" .. niao[i].card + end end end if p.seat == room.banker_seat then @@ -238,70 +244,71 @@ function M:FillItemData(room, data, item, active_player, niao) end function M:FillItemData2(room, data, list) - -- 赋值result_info，聊天室分享需要 - local player_list = {} - for i = 1, #data do - player_list[i] = {} - local user = room:GetPlayerBySeat(data[i].seat).self_user - player_list[i].id = user.account_id - player_list[i].hp_info = data[i].hp_info - player_list[i].score = data[i].total_score - player_list[i].house = room.owner_id == player_list[i].id and 1 or 0 - player_list[i].nick = user.nick_name - player_list[i].head_url = user.head_url + -- 赋值result_info，聊天室分享需要 + local player_list = {} + for i = 1, #data do + player_list[i] = {} + local user = room:GetPlayerBySeat(data[i].seat).self_user + player_list[i].id = user.account_id + player_list[i].hp_info = data[i].hp_info + player_list[i].score = data[i].total_score + player_list[i].house = room.owner_id == player_list[i].id and 1 or 0 + player_list[i].nick = user.nick_name + player_list[i].head_url = user.head_url - local settle_log = data[i].settle_log - player_list[i].param = {} - player_list[i].param[1]={} - player_list[i].param[1].key = "自摸次数：" - player_list[i].param[1].value = tostring(data[i].settle_log.zimo) - player_list[i].param[2]={} - player_list[i].param[2].key = "接炮次数：" - player_list[i].param[2].value = tostring(data[i].settle_log.jie_pao) - player_list[i].param[3]={} - player_list[i].param[3].key = "点炮次数：" - player_list[i].param[3].value = tostring(data[i].settle_log.dian_pao) - player_list[i].param[4]={} - player_list[i].param[4].key = "暗杠次数：" - player_list[i].param[4].value = tostring(data[i].settle_log.an_kong) - player_list[i].param[5]={} - player_list[i].param[5].key = "明杠次数：" - player_list[i].param[5].value = tostring(data[i].settle_log.ming_kong) - end - local round = room.room_config.round - self:GenerateRoomResultInfo(round, room.room_config:GetGameName(), room.room_id, room.create_time, player_list) + local settle_log = data[i].settle_log + player_list[i].param = {} + player_list[i].param[1] = {} + player_list[i].param[1].key = "自摸次数：" + player_list[i].param[1].value = tostring(data[i].settle_log.zimo) + player_list[i].param[2] = {} + player_list[i].param[2].key = "接炮次数：" + player_list[i].param[2].value = tostring(data[i].settle_log.jie_pao) + player_list[i].param[3] = {} + player_list[i].param[3].key = "点炮次数：" + player_list[i].param[3].value = tostring(data[i].settle_log.dian_pao) + player_list[i].param[4] = {} + player_list[i].param[4].key = "暗杠次数：" + player_list[i].param[4].value = tostring(data[i].settle_log.an_kong) + player_list[i].param[5] = {} + player_list[i].param[5].key = "明杠次数：" + player_list[i].param[5].value = tostring(data[i].settle_log.ming_kong) + end + local round = room.room_config.round + self:GenerateRoomResultInfo(round, room.room_config:GetGameName(), room.room_id, room.create_time, player_list) local big_result = self._view:GetChild("big_result") - big_result:GetChild("txt_room_info").text = string.format("%s 房号%s 局%s/%s", os.date("%Y/%m/%d", os.time()), room.room_id, room.curren_round, room.room_config.round) - local lst_p = big_result:GetChild("player_list") - if #player_list == 3 then + big_result:GetChild("txt_room_info").text = string.format("%s 房号%s 局%s/%s", os.date("%Y/%m/%d", os.time()), + room.room_id, room.curren_round, room.room_config.round) + local lst_p = big_result:GetChild("player_list") + if #player_list == 3 then lst_p.columnGap = 108 elseif #player_list == 2 then - lst_p.columnGap = 208 + lst_p.columnGap = 323 end - self:InitBigResult(room, 30) + self:InitBigResult(room, 30) local show_detail = room.hpOnOff == 1 - for i = 1, lst_p.numChildren do - local com_p = lst_p:GetChildAt(i - 1) - local list_param = com_p:GetChild("list_param") - for j = 1, list_param.numChildren do - local tem = list_param:GetChildAt(j - 1) - tem:GetChild("txt_value").textFormat.size = 30 - end - if show_detail then - local score = 0 - if com_p:GetController("pn").selectedIndex == 0 then - score = com_p:GetChild("txt_navigate").text - else - score = com_p:GetChild("txt_positive").text - end - score = score / room.score_times - com_p:GetChild("tex_detail_score").text = string.format("%s × %s倍", score, room.score_times) - end - end - if room.group_id ~= 0 then - big_result:GetController("group").selectedIndex = 1 - end - DataManager.CurrenRoom = nil + for i = 1, lst_p.numChildren do + local com_p = lst_p:GetChildAt(i - 1) + local list_param = com_p:GetChild("list_param") + for j = 1, list_param.numChildren do + local tem = list_param:GetChildAt(j - 1) + tem:GetChild("txt_value").textFormat.size = 30 + end + if show_detail then + local score = 0 + if com_p:GetController("pn").selectedIndex == 0 then + score = com_p:GetChild("txt_navigate").text + else + score = com_p:GetChild("txt_positive").text + end + score = score / room.score_times + com_p:GetChild("tex_detail_score").text = string.format("%s × %s倍", score, room.score_times) + end + end + if room.group_id ~= 0 then + big_result:GetController("group").selectedIndex = 1 + end + DataManager.CurrenRoom = nil end function M:LoadHead(p, room) @@ -314,11 +321,11 @@ function M:LoadHead(p, room) end end -function M:DestroyWithCallback() +function M:DestroyWithCallback() if self._callback then self._callback() end self:Destroy() end -return M \ No newline at end of file +return M 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 3a4fd22b..edc81978 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua @@ -452,10 +452,18 @@ function M:FillPoker(poker, prefix, num, code) -- (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) + if DataManager.CurrenRoom.pai == 0 then + if not poker.icon then + poker:GetChild('icon').url = string.format("ui://Extend_Poker_RunFastNew/%s%s%s", prefix, code, suffix) + else + poker.icon = string.format("ui://Extend_Poker_RunFastNew/%s%s%s", prefix, code, suffix) + end else - poker.icon = string.format("ui://Extend_Poker_RunFastNew/%s%s%s", prefix, code, suffix) + if not poker.icon then + poker:GetChild('icon').url = string.format("ui://Main_Poker/%s%s%s_2", prefix, code, suffix) + else + poker.icon = string.format("ui://Main_Poker/%s%s%s_2", prefix, code, suffix) + end end end diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index 4922628a..b96ee468 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -218,6 +218,7 @@ function M:InitPoker(pokerList, isPlayAni, open) self._ctr_canSendCard.selectedIndex = 1 self._flag_ruleCard = false self._view_handCard:RemoveChildren(0, -1, true) + -- table.sort(pokerList) if isPlayAni == true then self.cor_init_poker = coroutine.start( @@ -314,7 +315,8 @@ end function M:updatePoker() local templist = {} - for i = 1, #self.card_list do + + for i = #self.card_list,1,-1 do templist[#templist + 1] = self.card_list[i].card_code_flower end self:InitPoker(templist, false, 0) @@ -498,9 +500,9 @@ function M:TouchMoveEnd(context) ._flag_ruleCard }) - -- self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0 - -- else - -- self._ctr_canSendCard.selectedIndex = 0 + -- self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0 + -- else + -- self._ctr_canSendCard.selectedIndex = 0 end end @@ -855,9 +857,9 @@ function M:UpdateHandCardsColor() if #send_card > 0 then table.sort(send_card, tableSortNumber) self._cardCheck:initCards(send_card, { flag = false, flag_allCards = #send_card == self._view_handCard.numItems }) - -- self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0 - -- else - -- self._ctr_canSendCard.selectedIndex = 0 + -- self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0 + -- else + -- self._ctr_canSendCard.selectedIndex = 0 end end 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 b9cb4224..867a5208 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -82,7 +82,6 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) local roundScore = info.winCardScore local hp_nonnegative = room:checkHpNonnegative() - local roundScore = playerInfo.winCardScore roundScore = roundScore or 0 if hp_nonnegative then local jifen = "" @@ -250,13 +249,13 @@ function M:FillPlayerInfoEnd(view, info, playerInfo, rt, bgWindow) view:GetChild('text_score').text = playerInfo.total_score - info.daniao view:GetController('win').selectedIndex = playerInfo.total_score >= 0 and 1 or 0 - if info.seat == room.self_player.seat and playerInfo.total_score >= 0 then - bgWindow.text = "胜利" - bgWindow:GetController('bianhui').selectedIndex = 0 - else - bgWindow.text = "失败" - bgWindow:GetController('bianhui').selectedIndex = 1 - end + -- if info.seat == room.self_player.seat and playerInfo.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) diff --git a/lua_probject/main_project/main/poker/PKSettingView.lua b/lua_probject/main_project/main/poker/PKSettingView.lua index 4a2e3b95..b94129ec 100644 --- a/lua_probject/main_project/main/poker/PKSettingView.lua +++ b/lua_probject/main_project/main/poker/PKSettingView.lua @@ -19,6 +19,7 @@ function PKSettingView.new(blur_view, show_type, isjiesan,url,cardSizeHandle) self.cd_time = 0 self._btn_dismiss_room_enable = true self._full = true + self._full_offset = false self._close_zone = true self._anim_pop = 2 self._close_destroy = true diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json index 24e3f43f..453068c0 100644 --- a/wb_new_ui/.objs/fonts.json +++ b/wb_new_ui/.objs/fonts.json @@ -1,3 +1,5 @@ +ui://27vd145bhez87j26 +ui://27vd145bhez87j25 ui://27vd145btjnvcfo ui://27vd145btjnvcfn ui://27vd145bik9v7imk @@ -13,6 +15,8 @@ ui://27vd145bz5om44 ui://27vd145bik9v7ing ui://27vd145bcv577ioj ui://27vd145bik9v7imb +ui://27vd145bu50h7j1a +ui://27vd145bh46p7iza ui://27vd145bvbut7iri ui://27vd145bvbut7ir5 ui://27vd145byffn7iqf diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info index 010e7abe..98ebda7a 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info @@ -1,8 +1,7 @@ { "objectStatus": { "n111_ker3": { - "hidden": true, - "collapsed": true + "hidden": true }, "n100_lumr": { "hidden": true diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info index 73dae4d0..6cbc974a 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -1,9 +1,12 @@ { "objectStatus": { + "n87_q50p": { + "hidden": true + }, "n155_diqo": { "collapsed": true }, - "n87_q50p": { + "n166_ukp7": { "hidden": true }, "n179_yffn": { @@ -11,12 +14,6 @@ }, "n131_ckvb": { "hidden": true - }, - "n166_ukp7": { - "hidden": true - }, - "n93_eclw": { - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index da5d235b..b6dfaa9d 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -2,6 +2,12 @@ "objectStatus": { "n259_imp5": { "collapsed": true + }, + "n78_i7lq": { + "hidden": true + }, + "n251_ilon": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/h46p7ish.info b/wb_new_ui/.objs/metas/m7iejg46/h46p7ish.info new file mode 100644 index 00000000..a6d0f289 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/h46p7ish.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n53_n96g": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index a61c32fc..fcedc18b 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,12 +1,19 @@ { "libview.firstColumnWidth": 413, "libview.iconScale": 0, - "doc.openedDocs": [], + "doc.openedDocs": [ + "ui://8wph7p8nyffnnp", + "ui://27vd145bst2l7ijp" + ], "test.device": "Huawei Mate20", "canvasColor": 10066329, "auxline2": true, + "doc.activeDoc": "ui://8wph7p8nyffnnp", "libview.twoColumn": false, - "libview.expandedNodes": [], + "libview.expandedNodes": [ + "8wph7p8n", + "/" + ], "auxline1": true, "snapToGrid": true, "test.orientation": "landscape", diff --git a/wb_new_ui/assets/Common/component/playerDetail.xml b/wb_new_ui/assets/Common/component/playerDetail.xml index 3cdd18ef..d3870915 100644 --- a/wb_new_ui/assets/Common/component/playerDetail.xml +++ b/wb_new_ui/assets/Common/component/playerDetail.xml @@ -1,30 +1,32 @@ - + - - - - - - - - - + +