diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 1e06359..9ab68a5 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -42,7 +42,7 @@ function GroupInfoView.new(curGroup, fg_info) return self end --- 获取玩法名 +-- 获取具体玩法名 local function __getLayerName(self, pid) if pid == 0 then return '全 部' @@ -52,8 +52,18 @@ local function __getLayerName(self, pid) --end local p_data = self.curGroup:getPlay(pid) return p_data and p_data.name or '已删除' +end +-- 获取玩法名 +local function __getLayerName1(self, pid) + if pid == 0 then + return '全 部' + end + --if not self._get_data then + -- return self.playNames[pid] or '已删除' + --end + local p_data = self.curGroup:getPlay(pid) + return p_data and p_data.game_name or '已删除' end - -- 加载背景图 local bg_pref = 'base/newgroup/bg/bg0' local function __setBG(url) @@ -161,6 +171,8 @@ local function __fillRoomItem(self, index, item, room) local curGroup = self.curGroup local roomid = room.id local plist = room.plist + -- printlog("-------------------------------ssssssss------------------------------") + -- pt(plist) local state = room.status local str = nil local room_item = self.roomItems[item] @@ -229,6 +241,7 @@ local function __fillRoomItem(self, index, item, room) else p_item.visible = true local p = plist[i] + if isHidden == 0 then p_head.tex_name.text = ViewUtil.stringEllipsis(p.nick) p_head.tex_id.text = "ID:"..p.aid @@ -651,7 +664,7 @@ end function M:InitRoomInfoView() local room = self.roominfo.room if not room.default then - printlog("wwwwwwwwwww22222222222222222 ",room.round," ",room.times) + --printlog("wwwwwwwwwww22222222222222222 ",room.round," ",room.times) self.roominfo.view:GetChild('tex_round').text = string.format('(%s/%s)', room.round, room.times) local lst_player = self.roominfo.view:GetChild('lst_player') lst_player:RemoveChildrenToPool() @@ -690,10 +703,15 @@ end -- 玩法名字显示 local function __fillPlayItem(self, index, item) local tex_game = item:GetChild('tex_game') + local tex_jutifenleiName = item:GetChild('tex_jutifenleiName') local pipeijoin = item:GetChild('pipeijoin') + local tex_paiming = item:GetChild('tex_paiming') + if (index == 0) then tex_game.text = __getLayerName(self, 0) + tex_jutifenleiName.text = __getLayerName1(self,0) + tex_paiming.text = "1" else pipeijoin.onClick:Add( @@ -722,6 +740,9 @@ local function __fillPlayItem(self, index, item) end ) tex_game.text = __getLayerName(self, self.playIdList[index]) + tex_jutifenleiName.text = __getLayerName1(self,self.playIdList[index]) + tex_paiming.text = index + end end @@ -797,6 +818,7 @@ local function __fillGameItem(self, index, item) item.icon = 'ui://NewGroup/quyxtb' gameName=GetGameName(0) item:GetChild("n11").text=gameName + item:GetChild("n22").text=gameName if self.currentGameItemName==nil then item.icon = 'ui://NewGroup/quyxtb-1' end @@ -808,13 +830,15 @@ local function __fillGameItem(self, index, item) item.icon = iconName gameName=GetGameName(gameId) item:GetChild("n11").text=gameName + item:GetChild("n22").text=gameName end if item.icon==self.currentGameItemName then item.icon=self.currentGameItemName.."-1" item:GetChild("n11").text=gameName + item:GetChild("n22").text=gameName end - item:GetChild("n22").text=index+1 + end @@ -985,7 +1009,10 @@ function M:InitView(url) self._view:GetChild('tex_id').text = "ID:"..self.curGroup.id - self._view:GetChild('tex_name').text = self.curGroup.name + self._view:GetChild('tex_name1').text = self.curGroup.name + +printlog("-----------------------sss--------------------") +pt(self.curGroup) -- self._view:GetChild('tex_p_name').text = ViewUtil.stringEllipsis(DataManager.SelfUser.nick_name) @@ -1132,9 +1159,11 @@ function M:InitView(url) self:__startGame("",currentPlayID, false) end ) - + self.tex_SelectRoom = self._view:GetChild('tex_SelectRoom') -- 选择玩法按钮 local btn_choose = self._view:GetChild('btn_choose') + local tex_Selec_yd = self._view:GetController('tex_Selec_yd') + tex_Selec_yd.selectedIndex = 1 btn_choose.onClick:Set( function () -- self.lstgameVisible = not self.lstgameVisible @@ -1144,23 +1173,30 @@ function M:InitView(url) -- self.lst_game:TweenMove(Vector2.New(3,1232), 0.3) -- end - self.lstgameVisible = not self.lstgameVisible + -- self.lstgameVisible = not self.lstgameVisible - -- 获取 btn_choose 的当前 Y 坐标 - local targetY = btn_choose.y + -- -- 获取 btn_choose 的当前 Y 坐标 + -- local targetY = btn_choose.y - local lst_game_height = self.lst_game.height - local offset = 5 -- 间距 + -- local lst_game_height = self.tex_SelectRoom.height + -- local offset = 5 -- 间距 - if (self.lstgameVisible) then - -- 显示:移动到 btn_choose 上方 - self.lst_game:TweenMove(Vector2.New(btn_choose.x, targetY - lst_game_height - offset), 0.3) + -- if (self.lstgameVisible) then + -- -- 显示:移动到 btn_choose 上方 + -- self.tex_SelectRoom:TweenMove(Vector2.New(btn_choose.x, targetY - lst_game_height - offset), 0.3) + -- else + -- -- 隐藏:移出屏幕可视区域 + -- self.tex_SelectRoom:TweenMove(Vector2.New(btn_choose.x, targetY + lst_game_height + 100), 0.3) + -- end + if tex_Selec_yd.selectedIndex == 1 then + tex_Selec_yd.selectedIndex = 0 else - -- 隐藏:移出屏幕可视区域 - self.lst_game:TweenMove(Vector2.New(btn_choose.x, targetY + lst_game_height + 100), 0.3) + tex_Selec_yd.selectedIndex = 1 end + + - end + end -- function() -- local sgv = -- GroupSetDefaultGameView.new( diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info index 667e9f6..95ed694 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info @@ -1,42 +1,39 @@ { "objectStatus": { - "n122_g8kk": { + "n113_ker3": { "hidden": true }, - "n120_g8kk": { - "hidden": true - }, - "n89_goju": { - "hidden": true - }, - "n130_naup": { - "locked": true - }, - "n142_syg7": { - "hidden": true - }, - "n111_ker3": { - "locked": true - }, - "n50_lwcl": { + "n52_lwcl": { "hidden": true }, "n138_csp4": { "hidden": true }, - "n113_ker3": { + "n130_naup": { + "locked": true + }, + "n51_lwcl": { "hidden": true }, - "n100_lumr": { + "n122_g8kk": { + "hidden": true + }, + "n142_syg7": { + "hidden": true + }, + "n120_g8kk": { "hidden": true }, "n139_csp4": { "hidden": true }, - "n119_g8kk": { + "n111_ker3": { + "locked": true + }, + "n100_lumr": { "hidden": true }, - "n51_lwcl": { + "n119_g8kk": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 1991555..499fece 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -1,46 +1,19 @@ { "objectStatus": { - "n154_cioe": { + "n130_w111": { + "collapsed": true + }, + "n233_o6b1": { + "hidden": true + }, + "n191_xsk4": { "hidden": true }, "n238_dg1v": { "hidden": true }, - "n235_o6b1": { - "hidden": true - }, - "n204_jvvo": { - "hidden": true - }, - "n88_kxzv": { - "hidden": true - }, - "n175_mn85": { - "hidden": true - }, - "n200_isix": { - "hidden": true - }, - "n153_cioe": { - "hidden": true - }, - "n233_o6b1": { - "hidden": true - }, - "n216_ovii": { - "hidden": true - }, - "n171_mpll": { - "hidden": true - }, "n78_i7lq": { "hidden": true - }, - "n234_o6b1": { - "hidden": true - }, - "n160_qlxi": { - "hidden": true } }, "fitScreen": "FitSize" diff --git a/wb_new_ui/.objs/metas/m7iejg46/jiu8hef.info b/wb_new_ui/.objs/metas/m7iejg46/jiu8hef.info index 87e1cb9..2850205 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/jiu8hef.info +++ b/wb_new_ui/.objs/metas/m7iejg46/jiu8hef.info @@ -1,6 +1,9 @@ { "objectStatus": { - "n18_pw15": { + "n28_wqg2": { + "hidden": true + }, + "n27_wqg2": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/oviii0w.info b/wb_new_ui/.objs/metas/m7iejg46/oviii0w.info index 8a160c1..9e26dfe 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/oviii0w.info +++ b/wb_new_ui/.objs/metas/m7iejg46/oviii0w.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n2_ovii": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/p0pdhvp.info b/wb_new_ui/.objs/metas/m7iejg46/p0pdhvp.info new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/p0pdhvp.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/pw157i8w.info b/wb_new_ui/.objs/metas/m7iejg46/pw157i8w.info new file mode 100644 index 0000000..fd21df7 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/pw157i8w.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n4_pw15": { + "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 ccbb44f..c9ddd3c 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -5,12 +5,11 @@ "ui://2d9xdj6zfn7fao", "ui://2zlli80mw9te0", "ui://m7iejg4610snh5j", - "ui://m7iejg46jvvohyf", - "ui://m7iejg46ep9w7iah", - "ui://m7iejg46ep9w7iai", - "ui://m7iejg46ul317ia3", - "ui://m7iejg46ul317ia4", - "ui://m7iejg46ul317ia5" + "ui://m7iejg46p0pdhvp", + "ui://m7iejg46jiu8hef", + "ui://m7iejg4694qg7icy", + "ui://m7iejg46pw157i8w", + "ui://m7iejg46csp47i3z" ], "test.device": "Xiaomi 9", "canvasColor": 10066329, @@ -18,38 +17,44 @@ "doc.activeDoc": "ui://m7iejg4610snh5j", "libview.twoColumn": false, "libview.expandedNodes": [ - "27vd145b", + "1hl55dqm", "/", - "27vd145b", - "/buttons/", - "27vd145b", - "/font/", - "27vd145b", - "/font/images/", - "27vd145b", - "/font/images/win/", - "egnzysm7", + "du0ovweo", "/", - "0khx14ar", + "iwpp66na", "/", - "0khx14ar", - "/images/", - "2d9xdj6z", + "70k0xjl0", "/", - "2d9xdj6z", - "/component/", - "2d9xdj6z", - "/component/index/", - "2d9xdj6z", - "/images/", - "2d9xdj6z", - "/images/LobbyMui/", - "2zlli80m", + "v09du5dj", + "/", + "d1qrzqpr", + "/", + "lv2le67t", + "/", + "fm39zduw", + "/", + "qubt49z8", + "/", + "eyxz924g", + "/", + "v2emygzo", + "/", + "4wmd3o8g", + "/", + "dbnd189a", + "/", + "z3z0ysur", + "/", + "96mvx2ml", + "/", + "ac1fkfb1", + "/", + "jnrucnxa", + "/", + "okksar3v", + "/", + "boq0ohep", "/", - "2zlli80m", - "/images/", - "2zlli80m", - "/images/LoginMui/", "m7iejg46", "/", "m7iejg46", @@ -57,8 +62,6 @@ "m7iejg46", "/component/Lst_info/", "m7iejg46", - "/component/Lst_room/", - "m7iejg46", "/images/", "m7iejg46", "/images/NGXiangTangMui/", diff --git a/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png b/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png index 74a9cf1..9b04ebd 100644 Binary files a/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png and b/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png differ diff --git a/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1_1.png b/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1_1.png new file mode 100644 index 0000000..74a9cf1 Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1_1.png differ diff --git a/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png b/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png index 310ee52..f142a96 100644 Binary files a/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png and b/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png differ diff --git a/wb_new_ui/assets/Info_MJ_ChangSha/icon1_1.png b/wb_new_ui/assets/Info_MJ_ChangSha/icon1_1.png new file mode 100644 index 0000000..310ee52 Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_ChangSha/icon1_1.png differ diff --git a/wb_new_ui/assets/Info_MJ_ChangSha/package.xml b/wb_new_ui/assets/Info_MJ_ChangSha/package.xml index 553214b..af937e6 100644 --- a/wb_new_ui/assets/Info_MJ_ChangSha/package.xml +++ b/wb_new_ui/assets/Info_MJ_ChangSha/package.xml @@ -5,13 +5,15 @@ - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png b/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png index 74a9cf1..9b04ebd 100644 Binary files a/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png and b/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png differ diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1_1.png b/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1_1.png new file mode 100644 index 0000000..74a9cf1 Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1_1.png differ diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png b/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png index 310ee52..f142a96 100644 Binary files a/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png and b/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png differ diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/icon1_1.png b/wb_new_ui/assets/Info_MJ_HongZhong/icon1_1.png new file mode 100644 index 0000000..310ee52 Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HongZhong/icon1_1.png differ diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/package.xml b/wb_new_ui/assets/Info_MJ_HongZhong/package.xml index 2d3924b..b3a53b7 100644 --- a/wb_new_ui/assets/Info_MJ_HongZhong/package.xml +++ b/wb_new_ui/assets/Info_MJ_HongZhong/package.xml @@ -5,13 +5,15 @@ - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png index 74a9cf1..9b04ebd 100644 Binary files a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png differ diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1_1.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1_1.png new file mode 100644 index 0000000..74a9cf1 Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1_1.png differ diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png index 310ee52..f142a96 100644 Binary files a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png differ diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1_1.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1_1.png new file mode 100644 index 0000000..310ee52 Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1_1.png differ diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/package.xml b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/package.xml index a7efb8b..69d20bf 100644 --- a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/package.xml +++ b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/package.xml @@ -4,14 +4,16 @@ - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png index 74a9cf1..9b04ebd 100644 Binary files a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png and b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png differ diff --git a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1_1.png b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1_1.png new file mode 100644 index 0000000..74a9cf1 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png index 310ee52..f142a96 100644 Binary files a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png and b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png differ diff --git a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1_1.png b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1_1.png new file mode 100644 index 0000000..310ee52 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/package.xml b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/package.xml index ea2b74b..1c78c1c 100644 --- a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/package.xml +++ b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/package.xml @@ -115,9 +115,11 @@ - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png index 74a9cf1..9b04ebd 100644 Binary files a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png and b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png differ diff --git a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1_1.png b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1_1.png new file mode 100644 index 0000000..74a9cf1 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png index 310ee52..f142a96 100644 Binary files a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png and b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png differ diff --git a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1_1.png b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1_1.png new file mode 100644 index 0000000..310ee52 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_FuLuShou/package.xml b/wb_new_ui/assets/Info_Poker_FuLuShou/package.xml index d4bcf9f..b88ffb1 100644 --- a/wb_new_ui/assets/Info_Poker_FuLuShou/package.xml +++ b/wb_new_ui/assets/Info_Poker_FuLuShou/package.xml @@ -4,8 +4,8 @@ - - + + @@ -26,6 +26,8 @@ + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1.png b/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1.png index 74a9cf1..9b04ebd 100644 Binary files a/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1.png and b/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1.png differ diff --git a/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1_1.png b/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1_1.png new file mode 100644 index 0000000..74a9cf1 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1.png b/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1.png index 310ee52..f142a96 100644 Binary files a/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1.png and b/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1.png differ diff --git a/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1_1.png b/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1_1.png new file mode 100644 index 0000000..310ee52 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_HSRunBeard/package.xml b/wb_new_ui/assets/Info_Poker_HSRunBeard/package.xml index e83786e..7d802fb 100644 --- a/wb_new_ui/assets/Info_Poker_HSRunBeard/package.xml +++ b/wb_new_ui/assets/Info_Poker_HSRunBeard/package.xml @@ -15,9 +15,11 @@ - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png b/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png index 74a9cf1..9b04ebd 100644 Binary files a/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png and b/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png differ diff --git a/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1_1.png b/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1_1.png new file mode 100644 index 0000000..74a9cf1 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png b/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png index 310ee52..f142a96 100644 Binary files a/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png and b/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png differ diff --git a/wb_new_ui/assets/Info_Poker_RunBeard/icon1_1.png b/wb_new_ui/assets/Info_Poker_RunBeard/icon1_1.png new file mode 100644 index 0000000..310ee52 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_RunBeard/icon1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_RunBeard/package.xml b/wb_new_ui/assets/Info_Poker_RunBeard/package.xml index ed651db..5190ade 100644 --- a/wb_new_ui/assets/Info_Poker_RunBeard/package.xml +++ b/wb_new_ui/assets/Info_Poker_RunBeard/package.xml @@ -21,8 +21,8 @@ - - + + @@ -54,6 +54,8 @@ + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1.png b/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1.png index 74a9cf1..9b04ebd 100644 Binary files a/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1.png and b/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1.png differ diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1_1.png b/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1_1.png new file mode 100644 index 0000000..74a9cf1 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/icon1.png b/wb_new_ui/assets/Info_Poker_RunFastNew/icon1.png index 310ee52..f142a96 100644 Binary files a/wb_new_ui/assets/Info_Poker_RunFastNew/icon1.png and b/wb_new_ui/assets/Info_Poker_RunFastNew/icon1.png differ diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/icon1_1.png b/wb_new_ui/assets/Info_Poker_RunFastNew/icon1_1.png new file mode 100644 index 0000000..310ee52 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_RunFastNew/icon1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/icon_1.png b/wb_new_ui/assets/Info_Poker_RunFastNew/icon_1_1.png similarity index 100% rename from wb_new_ui/assets/Info_Poker_RunFastNew/icon_1.png rename to wb_new_ui/assets/Info_Poker_RunFastNew/icon_1_1.png diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/package.xml b/wb_new_ui/assets/Info_Poker_RunFastNew/package.xml index 8c0f93a..295d60e 100644 --- a/wb_new_ui/assets/Info_Poker_RunFastNew/package.xml +++ b/wb_new_ui/assets/Info_Poker_RunFastNew/package.xml @@ -16,9 +16,9 @@ - - - + + + @@ -27,6 +27,8 @@ + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1.png b/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1.png index 74a9cf1..9b04ebd 100644 Binary files a/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1.png and b/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1.png differ diff --git a/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1_1.png b/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1_1.png new file mode 100644 index 0000000..74a9cf1 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1.png b/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1.png index 310ee52..f142a96 100644 Binary files a/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1.png and b/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1.png differ diff --git a/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1_1.png b/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1_1.png new file mode 100644 index 0000000..310ee52 Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1_1.png differ diff --git a/wb_new_ui/assets/Info_Poker_YueYangWHZ/package.xml b/wb_new_ui/assets/Info_Poker_YueYangWHZ/package.xml index f02634b..ae7cf05 100644 --- a/wb_new_ui/assets/Info_Poker_YueYangWHZ/package.xml +++ b/wb_new_ui/assets/Info_Poker_YueYangWHZ/package.xml @@ -15,8 +15,8 @@ - - + + @@ -26,6 +26,8 @@ + + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/Main.xml b/wb_new_ui/assets/Lobby/Main.xml index d22a661..0f6ad69 100644 --- a/wb_new_ui/assets/Lobby/Main.xml +++ b/wb_new_ui/assets/Lobby/Main.xml @@ -33,22 +33,18 @@