diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua new file mode 100644 index 00000000..0a84a7a1 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua @@ -0,0 +1,109 @@ +-- 能量包 + +local GroupFastGamesView = {} + +local M = GroupFastGamesView + +function GroupFastGamesView.new(gid, blur_view, playIdList, uid) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + + self.class = "GroupFastGamesView" + self._close_destroy = true + self.group_id = gid + self.blur_view = blur_view + self.playIdList = playIdList + self.allplays_data = {} + self.uid = uid + self.showid = 0 + self:init("ui://NewGroup/Win_SelectGames") + self:FillView() + return self +end + + +function M:FillView() + --lst_allplays + self.showid = Utils.LoadLocalFile("selectplay"..self.uid) + + self.lst_allplays = self._view:GetChild("lst_allplays") + self.lst_allplays:SetVirtual() + self.lst_allplays.itemRenderer = function(index, obj) + self:OnRenderAllPlaysItem(index, obj, self.showid) + end + printlog(self.showid) + self:GetFlagPlaysData(self.showid) +end + +-- 获取快速开始设置数据 +function M:GetFlagPlaysData(showid) + + local allplays = self.playIdList + self.allplays_data = allplays + local tmp = {} + for i=1,#allplays do + if showid==allplays[i].id.."" then + tmp = self.allplays_data[1] + self.allplays_data[1] = self.allplays_data[i] + self.allplays_data[i] = tmp + end + end + self.lst_allplays.numItems = #self.allplays_data + +end + +function M:OnRenderAllPlaysItem(index, obj,showid) + + local data = self.allplays_data[index+1] + local exconfig = ExtendManager.GetExtendConfig(data.gameId) + local datajson = json.decode(data.config) + local r = {} + exconfig:FillRoomConfig(r, datajson) + local gameStr = "" + gameStr = string.gsub(r.room_config:GetDes(), "\r", "") + obj:GetChild("tex_name").text = data.name + obj:GetChild("tex_display").text = gameStr + + if showid~=nil then + if data.id.."" == showid then + obj:GetChild("gxbtn").selected = true + else + obj:GetChild("gxbtn").selected = false + end + end + + obj:GetChild("gxbtn").onClick:Set(function() + self:SelectPlaysItem(data.id,index+1,data.name) + end) + --obj:GetChild("gxbtn").selected = +end + +function M:SelectPlaysItem(id,index,gamename) + self.lst_allplays = self._view:GetChild("lst_allplays") + Utils.SaveLocalFile("selectplay"..self.uid, id) + Utils.SaveLocalFile("selectplayname"..self.uid, gamename) + for key, value in pairs(self.playIdList) do + if key==index then + self.playIdList[index].show = true + else + self.playIdList[key].show = false + end + end + self:FillView() + +end + +function M:SetCallback(callback) + self.callback = callback +end + +-- 销毁窗口 +function M:Destroy(remove_map) + if self.callback then + self.callback() + end + BaseWindow.Destroy(self, remove_map) + ImageLoad.Clear(self.class) +end + +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 477035d4..05d678f1 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -17,6 +17,7 @@ local GroupMngMenKangView = import(".MngView.GroupMngMenKangView") local GroupMngPiLaoZhi = import(".MngView.GroupMngPiLaoZhi") local GroupShowMemberInfoView = import(".MngView.GroupShowMemberInfoView") -- local GroupPartnerRewardsView = import(".GroupPartnerRewardsView") +local GroupFastGamesView = import('.GroupFastGamesView') -- local HeadView = require('Game/View/LobbyHeadView') GroupNumberInputView_Game = import(".MngView.GroupNumberInputView") @@ -652,7 +653,7 @@ local function __fillRoomData(self) list_offline = {} if self.curGroup.lev < 3 then - pt(self.curRooms) + -- pt(self.curRooms) self.lst_room.numItems = #self.curRooms else if self.curGroup.show_num > 0 and #self.curRooms > self.curGroup.show_num then @@ -749,12 +750,14 @@ local function __fillPlayItem(self, index, item) if (index == 0) then -- tex_gameName.text = __getLayerName(self, 0) item:GetController('all').selectedIndex = 1 + else item:GetController('all').selectedIndex = 0 pipeijoin.onClick:Add( function() local currentPlayID = self:GetSelectedPlayID() if currentPlayID == 0 then + if self.lst_layer.selectedIndex == 0 and self.lst_game.selectedIndex > 0 then local pid = self.fg_info[tostring(self.curGroup.id)] if pid == 0 then @@ -855,6 +858,7 @@ local function __fillGameItem(self, index, item) if self.currentGameItemName == nil then item.icon = 'ui://NewGroup/quyxtb-1' end + else local gameId = self.gameIdList[index] local config = ExtendManager.GetExtendConfig(gameId) @@ -1098,6 +1102,7 @@ function M:InitView(url) self.lst_game.onClickItem:Add( function(pas) + if self.currentSelectItem == pas.data then return end local name = pas.data.icon self.currentSelectItem = pas.data @@ -1128,6 +1133,7 @@ function M:InitView(url) self.lst_layer.onClickItem:Add( function(context) + self._view:GetChild('btn_start2').text = context.data.data self:__loadPlayData() end @@ -1137,8 +1143,11 @@ function M:InitView(url) local btn_quanbu = self._view:GetChild('btn_quanbu') btn_quanbu.onClick:Set( function() + self.lst_layer.selectedIndex = 0 self:__loadPlayData() + + end ) @@ -1171,13 +1180,29 @@ function M:InitView(url) local pid = self.fg_info[tostring(self.curGroup.id)] if pid == 0 then - ViewUtil.ErrorTip(nil, '没有选择玩法') + ViewUtil.ErrorTip(nil, '没有选择玩法!') return end self:__startGame("", pid, false) end ) + local goselectgames = self._view:GetChild('goselectgames') + goselectgames.onClick:Set( + function() + local gfg = GroupFastGamesView.new(self.curGroup.id, self._root_view, self.curGroup.playList, + DataManager.SelfUser.account_id) + + gfg:SetCallback( + function() + local showid = Utils.LoadLocalFile("selectplay"..DataManager.SelfUser.account_id) + local gamename = Utils.LoadLocalFile("selectplayname"..DataManager.SelfUser.account_id) + self._view:GetChild('btn_start2').text = gamename + self:__startGame("",tonumber(showid), false) + end + ) + gfg:Show() + end) -- 快速开始按钮 local btn_start2 = self._view:GetChild('btn_start2') btn_start2.visible = true @@ -1185,10 +1210,19 @@ function M:InitView(url) function() local currentPlayID = self:GetSelectedPlayID() if currentPlayID == 0 then + local showid2 = Utils.LoadLocalFile("selectplay"..DataManager.SelfUser.account_id) + + if showid2~=nil then + local gamename = Utils.LoadLocalFile("selectplayname"..DataManager.SelfUser.account_id) + self._view:GetChild('btn_start2').text = gamename + self:__startGame("",tonumber(showid2), false) + return + end + if self.lst_layer.selectedIndex == 0 and self.lst_game.selectedIndex > 0 then local pid = self.fg_info[tostring(self.curGroup.id)] if pid == 0 then - ViewUtil.ErrorTip(nil, '没有选择玩法') + ViewUtil.ErrorTip(nil, '没有选择玩法1') return end local p_data = self.curGroup:getPlay(pid) @@ -1198,7 +1232,21 @@ function M:InitView(url) end end if currentPlayID == 0 then - ViewUtil.ErrorTip(nil, '没有选择玩法') + + local gfg = GroupFastGamesView.new(self.curGroup.id, self._root_view, self.curGroup.playList, + DataManager.SelfUser.account_id) + + gfg:SetCallback( + function() + local showid = Utils.LoadLocalFile("selectplay"..DataManager.SelfUser.account_id) + + currentPlayID = showid + self:__startGame("",tonumber(showid), false) + end + ) + gfg:Show() + + -- ViewUtil.ErrorTip(nil, '没有选择玩法2') return end end @@ -1430,6 +1478,88 @@ function M:__onUpdate() end end +function M:__joinRoom2(room_id) + ViewUtil.ShowModalWait(self._root_view, '正在加入游戏...', 'join_room') + local roomCtr = ControllerManager.GetController(RoomController) + local _gameCtrl = ControllerManager.GetController(GameController) + local _currentCtrl = ControllerManager.GetCurrenController() + if _gameCtrl == _currentCtrl then + if _gameCtrl.tmpRoomID ~= room_id then + _gameCtrl:LevelRoom( + function(res) + roomCtr:PublicJoinRoom( + Protocol.WEB_FG_JOIN_ROOM, + room_id, + false, + function(response) + if (response.ReturnCode == -1) then + ViewUtil.CloseModalWait('join_room') + RestartGame() + return + end + + if response.ReturnCode == -2 then + self:__joinRoom2(room_id) + return + elseif response.ReturnCode ~= 0 then + ViewUtil.CloseModalWait('join_room') + ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败') + return + end + self.__join_room = true + -- local mgr_ctr = ControllerManager.GetController(GroupMgrController) + -- mgr_ctr:disconnect() + self._view.visible = false + ImageLoad.Clear(self.class) + ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id) + ViewUtil.CloseModalWait('join_room') + timer = 0 + end, + self.curGroup.id + ) + end + ) + return + end + end + + + roomCtr:PublicJoinRoom( + Protocol.WEB_FG_JOIN_ROOM, + room_id, + false, + function(response) + printlog("进入房间返回事件==========》》》") + pt(response) + if (response.ReturnCode == -1) then + ViewUtil.CloseModalWait('join_room') + RestartGame() + return + end + + + if response.ReturnCode == -2 then + self:__joinRoom2(room_id) + return + elseif response.ReturnCode ~= 0 then + ViewUtil.CloseModalWait('join_room') + ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败') + return + end + self.__join_room = true + -- local mgr_ctr = ControllerManager.GetController(GroupMgrController) + -- mgr_ctr:disconnect() + self._view.visible = false + ImageLoad.Clear(self.class) + ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id) + ViewUtil.CloseModalWait('join_room') + timer = 0 + end, + self.curGroup.id + ) + +end + function M:__joinRoom(room_id,room) @@ -1829,6 +1959,7 @@ function M:_evtInvited(...) self._root_view, self.curGroup.id, function(roomid) + printlog("Into game") self:__joinRoom(roomid,self.roominfo.room) end ) @@ -2192,10 +2323,12 @@ function M:__refreshPay() local ctr_all = self._view:GetController('all') + local currentPlayID = self:GetSelectedPlayID() local currentGameID = self:GetSelectedGameID() if currentPlayID > 0 then + --self._view:GetChild("tex_name").text = __getLayerName(self,currentPlayID) ctr_all.selectedIndex = 0 else @@ -2267,7 +2400,7 @@ function M:Show() local roomid = user.room_id if user.group_id == self.curGroup.id and string.len(roomid) > 1 then - self:__joinRoom(roomid,self.roominfo.room) + self:__joinRoom2(roomid) user.group_id = 0 end end @@ -2283,8 +2416,6 @@ function M:SortPlayList(a, b) return a_play.gameId < b_play.gameId end else - pt(a_play) - pt(b_play) return a_play.gameType < b_play.gameType end end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua index 0156fc96..fdec4d37 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -352,7 +352,8 @@ function M:FillItem(obj, member, refresh, index) -- end - obj:GetChild('tex_zongchangci').text = member.total_round + obj:GetChild('tex_zongchangci').text = member.parentId + -- obj:GetChild('tex_pername').text = member.parentId_nick or "" obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time) --上级 diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua index 279dc908..cead37ed 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua @@ -327,8 +327,9 @@ function M:FillItem(obj, member, refresh) end -- end - - obj:GetChild('tex_zongchangci').text = member.total_round + --上级id + obj:GetChild('tex_zongchangci').text = member.parentId + obj:GetChild('tex_pername').text = member.parentId_nick or "" obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time) --上级 diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua index 4255deaf..7189a863 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua @@ -367,7 +367,8 @@ function M:FillItem(obj, member, refresh, index) -- end - obj:GetChild('tex_zongchangci').text = member.total_round + obj:GetChild('tex_zongchangci').text = member.parentId + obj:GetChild('tex_pername').text = member.parentId_nick or "" obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time) --上级 diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua index 1edc727b..ce509859 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua @@ -388,7 +388,8 @@ function M:FillItem(obj, member, refresh, index) -- end - obj:GetChild('tex_zongchangci').text = member.total_round + obj:GetChild('tex_zongchangci').text = member.parentId + obj:GetChild('tex_pername').text = member.parentId_nick or "" obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time) --上级 diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerBanPlaysView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerBanPlaysView.lua index 769cb833..17612ba9 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerBanPlaysView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerBanPlaysView.lua @@ -22,7 +22,6 @@ function M:initView(url) self.lst_allplays = self._view:GetChild("lst_allplays") self.lst_allplays:SetVirtual() self.lst_allplays.itemRenderer = function(index, obj) - self:OnRenderAllPlaysItem(index, obj) end self:GetBanPlaysData() @@ -77,8 +76,6 @@ function M:OnRenderAllPlaysItem(index, obj) end end) end) - - end return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua index b7e5b027..9a57f91c 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua @@ -95,9 +95,9 @@ MngPageConfig.Config = { }, { - { 20, 10, 21 }, - { 20, 10, 21 }, - { 20, 10, 21 }, + { 20, 21 }, + { 20, 21 }, + { 20, 21 }, }, --暂时弹出查看 { diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 981fe1cd..b976e14f 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -730,6 +730,7 @@ function M:__FangziTip(tip, _uid, fptype) end if fpao and zdhu then + self:PlaySound(p.self_user.sex, 'F_DianPao') _gamectr:SendAction(tip_id) _chipeng_tip:Dispose() self._chipeng_tip = nil diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index e078dbbb..85f03107 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index f8239774..8d46756e 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index ab4b6654..78256ea4 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 56e7d1a4..b821e7f0 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/m7iejg46/avqi7ijp.info b/wb_new_ui/.objs/metas/m7iejg46/avqi7ijp.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/avqi7ijp.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info index 2f150126..a0247861 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info @@ -6,6 +6,9 @@ "n33_rpaz": { "hidden": true }, + "n142_ufim": { + "hidden": true + }, "n86_t1hq": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info index 77c33874..98348b6f 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info @@ -1,6 +1,6 @@ { "objectStatus": { - "n57_ocx0": { + "n67_z384": { "hidden": true }, "n78_iaes": { @@ -15,8 +15,14 @@ "n72_mtk5": { "hidden": true }, + "n80_ufim": { + "hidden": true + }, "n58_ocx0": { "hidden": true + }, + "n57_ocx0": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info index 279642d4..3d00a0c3 100644 --- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info +++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info @@ -1,8 +1,5 @@ { "objectStatus": { - "n36_k3io": { - "collapsed": true - }, "n34_k3io": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 3df41c2c..5492dc26 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,61 +1,24 @@ { - "libview.firstColumnWidth": 297, - "expanded_nodes": [ - "27vd145b", - "/", - "m7iejg46", - "/" + "doc.openedDocs": [ + "ui://2zlli80mw9te0", + "ui://9n9stu2eprgzf0", + "ui://9n9stu2eprgzep" ], "libview.iconScale": 0, - "doc.openedDocs": [ - "ui://v6yvqp7wyfzf1h4", - "ui://v6yvqp7wcyprwq", -<<<<<<< HEAD - "ui://ppu1wv7699we8b", - "ui://v6yvqp7wf55qwa", - "ui://v6yvqp7wfgao1dn", - "ui://v6yvqp7wvoqg1dy", -======= - "ui://m7iejg46e5q7hu2", ->>>>>>> d72cae313154093171bc44630d103e84bf862c73 - "ui://v6yvqp7wlvh412c" - ], - "test.device": "720p Phone", - "canvasColor": 10066329, - "auxline2": true, -<<<<<<< HEAD - "doc.activeDoc": "ui://v6yvqp7wfgao1dn", -======= - "doc.activeDoc": "ui://m7iejg46e5q7hu2", ->>>>>>> d72cae313154093171bc44630d103e84bf862c73 - "libview.twoColumn": false, - "libview.expandedNodes": [ - "m7iejg46", - "/", -<<<<<<< HEAD - "v6yvqp7w", - "/images/", - "v6yvqp7w", - "/images/cards8/", - "v6yvqp7w", - "/images/clearing/" -======= - "m7iejg46", - "/component/", - "m7iejg46", - "/component/Lst_info/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/component/" ->>>>>>> d72cae313154093171bc44630d103e84bf862c73 - ], - "auxline1": true, - "snapToGrid": true, - "test.orientation": "landscape", - "backgroundColor": 6710886, + "doc.activeDoc": "ui://2zlli80mw9te0", "libview.currentGroup": "", - "hidden_packages": [], - "gridSize": 30, - "gridColor": 80 + "libview.expandedNodes": [ + "9n9stu2e", + "/", + "9n9stu2e", + "/component/", + "9n9stu2e", + "/component/Main/", + "9n9stu2e", + "/component/Main/component/", + "2zlli80m", + "/" + ], + "libview.firstColumnWidth": 297, + "libview.twoColumn": false } \ No newline at end of file diff --git a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml index b0beace6..1ac54b64 100644 --- a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml +++ b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml @@ -2,14 +2,14 @@ - + - + - + diff --git a/wb_new_ui/assets/Common/component/create_room/image/gou.png b/wb_new_ui/assets/Common/component/create_room/image/gou.png index 1d9c44a3..6eb32554 100644 Binary files a/wb_new_ui/assets/Common/component/create_room/image/gou.png and b/wb_new_ui/assets/Common/component/create_room/image/gou.png differ diff --git a/wb_new_ui/assets/Common/component/create_room/image/multiple_btn_n.png b/wb_new_ui/assets/Common/component/create_room/image/multiple_btn_n.png index 92380b7b..5adaf2e7 100644 Binary files a/wb_new_ui/assets/Common/component/create_room/image/multiple_btn_n.png and b/wb_new_ui/assets/Common/component/create_room/image/multiple_btn_n.png differ diff --git a/wb_new_ui/assets/Common/font/images/win/games.png b/wb_new_ui/assets/Common/font/images/win/games.png new file mode 100644 index 00000000..d81ae045 Binary files /dev/null and b/wb_new_ui/assets/Common/font/images/win/games.png differ diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 51998058..7ac9d150 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -1091,6 +1091,7 @@ + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 646.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 646.png index 5b3f5b9d..431ea053 100644 Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 646.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 646.png differ diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/images/xipai.png b/wb_new_ui/assets/Main_RunBeard/component/Main/images/xipai.png index 29ccdfb2..431ea053 100644 Binary files a/wb_new_ui/assets/Main_RunBeard/component/Main/images/xipai.png and b/wb_new_ui/assets/Main_RunBeard/component/Main/images/xipai.png differ diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml index faea00a9..b1d0aa34 100644 --- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml +++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml @@ -262,5 +262,8 @@ + + + \ No newline at end of file diff --git a/wb_new_ui/assets/NewGroup/Win_SelectGames.xml b/wb_new_ui/assets/NewGroup/Win_SelectGames.xml new file mode 100644 index 00000000..6a178528 --- /dev/null +++ b/wb_new_ui/assets/NewGroup/Win_SelectGames.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml b/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml index 3c2da8d2..6e4d2c07 100644 --- a/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml +++ b/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml @@ -14,15 +14,15 @@ - + - + - + @@ -52,11 +52,11 @@ - + - + diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml b/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml index a373df10..59824a9d 100644 --- a/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml +++ b/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml @@ -2,17 +2,18 @@ - + - + - + +