diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua index d0597da6..7b48efeb 100644 --- a/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua @@ -5,80 +5,73 @@ 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:InitMaPai() + self.xiPaiCtr = self._view:GetController("xipai") + + self:InitMaPai() return self end - function M:InitMaPai() - self.maPaiCtr=self._view:GetController("mapai") - self.maPaiCtr.selectedIndex=0 - - self.maPaiList={} - - for i=1,10 do - local tempMP=self._view:GetChild("niao"..i) - table.insert(self.maPaiList,tempMP) - end - -end + self.maPaiCtr = self._view:GetController("mapai") + self.maPaiCtr.selectedIndex = 0 + self.maPaiList = {} -function M:IsMapaiShow(niao,isShow) - if niao then - niao.visible=isShow + for i = 1, 10 do + local tempMP = self._view:GetChild("niao" .. i) + table.insert(self.maPaiList, tempMP) end end - -function M:SetMaPaiValue(niao,value) +function M:IsMapaiShow(niao, isShow) if niao then - niao.icon='ui://Main_Majiang/' ..get_majiang_prefix(DataManager.CurrenRoom.game_id).."201_"..value + niao.visible = isShow end end -function M:SetMaPaiColor(niao,num) - niao:GetController("color").selectedIndex=num +function M:SetMaPaiValue(niao, value) + if niao then + niao.icon = 'ui://Main_Majiang/' .. get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. value + end +end + +function M:SetMaPaiColor(niao, num) + niao:GetController("color").selectedIndex = num end function M:HideAllMapai() - for i=1,#self.maPaiList do - self:IsMapaiShow(self.maPaiList[i],false) - self:SetMaPaiColor(self.maPaiList[i],0) + for i = 1, #self.maPaiList do + self:IsMapaiShow(self.maPaiList[i], false) + self:SetMaPaiColor(self.maPaiList[i], 0) end end - - function M:ShowSelectMaPai(niaoList) printlog("ccccccccccccccccccaaaaaaaaaaaaaa00") pt(niaoList) - if niaoList and #niaoList>0 then - self.maPaiCtr.selectedIndex=1 + if niaoList and #niaoList > 0 then + self.maPaiCtr.selectedIndex = 1 self:HideAllMapai() - for i=1,#niaoList do - self:IsMapaiShow(self.maPaiList[i],true) - self:SetMaPaiValue(self.maPaiList[i],niaoList[i].card) - if niaoList[i].score>0 then - self:SetMaPaiColor(self.maPaiList[i],2) + for i = 1, #niaoList do + self:IsMapaiShow(self.maPaiList[i], true) + self:SetMaPaiValue(self.maPaiList[i], niaoList[i].card) + if niaoList[i].score > 0 then + self:SetMaPaiColor(self.maPaiList[i], 2) end end else - self.maPaiCtr.selectedIndex=0 + self.maPaiCtr.selectedIndex = 0 end end - function M:InitData(over, room, result, total_result, callback) self._callback = callback local _overCtr = self._view:GetController("over") @@ -88,45 +81,46 @@ 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 round=DataManager.CurrenRoom.room_config.config.times or 1 - local xpconfig=DataManager.CurrenRoom.room_config.config.xi_pai - if xpconfig and round>1 then - self.xiPaiCtr.selectedIndex=1 + local paixingxiangqing = self._view:GetChild("btn_detal") + paixingxiangqing.visible = false + + local fanhuipaixing = self._view:GetChild("btn_fanhuipaixing") + fanhuipaixing.visible = false + + + local round = DataManager.CurrenRoom.room_config.config.times or 1 + local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai + if xpconfig and round > 1 then + self.xiPaiCtr.selectedIndex = 1 else - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 end - - + + if result then self:ShowSelectMaPai(result.niao) 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 - ViewUtil.ErrorTip(1000000,"申请洗牌成功") - end - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendXiPaiAction(xiPaiCallBack) - end) + local xiPaiCallBack = function() + xipai.touchable = false + self.xiPaiCtr.selectedIndex = 0 + ViewUtil.ErrorTip(1000000, "申请洗牌成功") + 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.liuju then ctr_type.selectedIndex = 3 else @@ -152,14 +146,14 @@ 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() _overCtr.selectedIndex = 1 _btnCtr.selectedIndex = 0 _sdkCtr.selectedIndex = 0 - self.maPaiCtr.selectedIndex=0 + self.maPaiCtr.selectedIndex = 0 if self._qsinfo_view then self._qsinfo_view:Dispose() end @@ -171,8 +165,8 @@ function M:InitData(over, room, result, total_result, callback) end else _overCtr.selectedIndex = 1 - self.xiPaiCtr.selectedIndex=0 - self.maPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 + self.maPaiCtr.selectedIndex = 0 btn_close.onClick:Add(function() ViewManager.ChangeView(ViewManager.View_Lobby) end) @@ -180,23 +174,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 - list_view1.lineGap = 54 - elseif #data == 2 then - list_view1.lineGap = 108 - end - if 1 == over then + -- if #data == 3 then + -- list_view1.lineGap = 54 + -- elseif #data == 2 then + -- list_view1.lineGap = 108 + -- end + if 1 == over then self:FillItemData2(room, total_data, list_view2) end elseif 2 == over then @@ -211,12 +205,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 @@ -224,21 +218,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 @@ -249,20 +243,20 @@ 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"] if total >= 0 then - item:GetChild("score2").text = "+"..total - item:GetChild("score2").grayed = false + item:GetChild("score2").text = "+" .. total + -- item:GetChild("score2").grayed = false else item:GetChild("score2").text = total - item:GetChild("score2").grayed = true + -- item:GetChild("score2").grayed = true end local hp_nonnegative = room:checkHpNonnegative() @@ -278,19 +272,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 @@ -299,70 +293,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 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) @@ -375,11 +370,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_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index b69db642..2f2a5112 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -15,6 +15,7 @@ function M.new() setmetatable(M, { __index = PKMainView }) local self = setmetatable({}, { __index = M }) self.class = "RunFast_MainView" + self._full = true self:init() self._gamectr = ControllerManager.GetController(GameController) return self 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 85f03107..e078dbbb 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 8d46756e..f8239774 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 78256ea4..ab4b6654 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 51849c74..0e96c4ac 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/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info index 686a1ec8..cfe95c07 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info @@ -1,10 +1,11 @@ { "objectStatus": { - "n54_lwcl": { - "hidden": true + "n28": { + "collapsed": true }, "n125_g8kk": { - "hidden": true + "hidden": true, + "collapsed": true }, "n122_g8kk": { "hidden": true @@ -15,7 +16,11 @@ "n89_goju": { "hidden": true }, + "n54_lwcl": { + "hidden": true + }, "n130_naup": { + "collapsed": true, "locked": true, "hidden": true }, diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info b/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info index aeb2b655..a20f97f3 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info @@ -3,6 +3,9 @@ "n24_cvc8": { "hidden": true }, + "n26_ht5v": { + "hidden": true + }, "n9_bqt1": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/9n9stu2e/prgzet.info b/wb_new_ui/.objs/metas/9n9stu2e/prgzet.info index b1e22b80..6af6ee2c 100644 --- a/wb_new_ui/.objs/metas/9n9stu2e/prgzet.info +++ b/wb_new_ui/.objs/metas/9n9stu2e/prgzet.info @@ -1,6 +1,6 @@ { "objectStatus": { - "n1": { + "n7": { "hidden": true }, "n20_qpk6": { @@ -9,9 +9,6 @@ "n15_qpk6": { "hidden": true }, - "n7": { - "hidden": true - }, "n21_n6fs": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 53873452..7e0bf609 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -25,7 +25,8 @@ "collapsed": true }, "n236_o6b1": { - "hidden": true + "hidden": true, + "collapsed": true }, "n154_cioe": { "hidden": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info index 232fd206..23b027c6 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info @@ -1,9 +1,12 @@ { "objectStatus": { - "n18_rpaz": { + "n16_rpaz": { "hidden": true }, - "n16_rpaz": { + "n20_rpaz": { + "hidden": true + }, + "n18_rpaz": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7mcu.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7mcu.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7mcu.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7mdo.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7mdo.info new file mode 100644 index 00000000..73222433 --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7mdo.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n0_tjnv": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info new file mode 100644 index 00000000..6a987a16 --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n40_ona1": { + "hidden": true + }, + "n31_piv9": { + "hidden": true + }, + "n79_uwvl": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png b/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png index 4a0ae6e0..a50c1718 100644 Binary files a/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png and b/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png differ diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml index 5f2d2332..a033541f 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml @@ -6,7 +6,9 @@ - + + + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml index 0a4c7bc2..0ba373b5 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml @@ -1,12 +1,12 @@ - + - - + + - - + + @@ -33,7 +33,7 @@ - + @@ -44,22 +44,23 @@ - + - + - + - + + - + - +