From 53c34a0e8ffd062cee745e73fb9ce993d41f2116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Sat, 26 Jul 2025 04:49:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E5=86=B5=EF=BC=8C=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BF=AB=E9=80=9F=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base_project/Game/View/LoginView.lua | 8 +- .../Game/View/NewGroup/GroupFastGamesView.lua | 167 ++--- .../Game/View/NewGroup/GroupInfoView.lua | 626 +++++++++++------- .../Game/View/NewGroup/GroupMainView.lua | 4 + .../View/NewGroup/GroupManagerStagView.lua | 101 ++- .../base_project/Game/View/ViewUtil.lua | 4 +- wb_new_ui/.objs/fonts.json | 2 + wb_new_ui/.objs/metas/m7iejg46/10snh5j.info | 6 +- wb_new_ui/.objs/metas/m7iejg46/avqi7ijp.info | 8 +- wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info | 5 +- wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info | 3 + wb_new_ui/.objs/metas/m7iejg46/kwdo7i98.info | 7 + wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info | 6 + wb_new_ui/.objs/metas/m7iejg46/l679hwn.info | 3 + wb_new_ui/.objs/metas/m7iejg46/l679hws.info | 6 +- wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info | 7 + wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info | 6 + wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info | 5 +- wb_new_ui/.objs/workspace.json | 44 +- .../assets/Common/GlobalModalWaiting.xml | 6 +- wb_new_ui/assets/Hotupdate/Version.xml | 2 +- .../commpoent/GlobalModalWaiting.xml | 21 +- wb_new_ui/assets/NewGroup/Main_GroupInfo.xml | 26 +- wb_new_ui/assets/NewGroup/Win_Mail.xml | 2 +- wb_new_ui/assets/NewGroup/Win_ManagerView.xml | 22 +- .../assets/NewGroup/Win_ManagerView_old.xml | 7 +- .../assets/NewGroup/Win_PlayerInfoForAdd2.xml | 2 +- wb_new_ui/assets/NewGroup/Win_SelectGames.xml | 8 +- wb_new_ui/assets/NewGroup/Win_bxx.xml | 2 +- .../NewGroup/component/Lst_info/Btn_start.xml | 10 +- .../component/Lst_info/选择玩法.png | Bin 0 -> 8674 bytes .../component/Lst_room/Gcm_Play_desk1.xml | 2 +- .../component/Lst_room/Gcm_Play_desk2.xml | 2 +- .../component/Lst_room/Gcm_Play_desk3.xml | 2 +- .../NewGroup/component/Lst_room/Gcm_head.xml | 8 +- .../component/Lst_room/Play_room2.xml | 4 +- .../component/Lst_room/Play_room3.xml | 4 +- .../NewGroup/component/nav/Btn_menu_h.xml | 29 +- .../NewGroup/component/nav/Btn_menu_h2.xml | 4 +- .../NewGroup/component/nav/Btn_menu_v.xml | 2 +- .../NewGroup/component/nav/Rectangle 353.png | Bin 0 -> 514 bytes .../NewGroup/component/nav/button_08.png | Bin 11634 -> 846 bytes .../component/nav/match_left_btn_selected.png | Bin 18310 -> 16256 bytes .../assets/NewGroup/images/Group 468.png | Bin 0 -> 14711 bytes .../assets/NewGroup/images/Group 893.png | Bin 0 -> 33501 bytes .../assets/NewGroup/images/Group 894.png | Bin 0 -> 37663 bytes .../assets/NewGroup/images/Group 895.png | Bin 0 -> 36400 bytes .../assets/NewGroup/images/Group 896.png | Bin 0 -> 36492 bytes .../NewGroup/{ => images}/Rectangle 12.png | Bin .../NewGroup/{ => images}/Rectangle 13.png | Bin .../assets/NewGroup/images/Rectangle 350.png | Bin 0 -> 823 bytes .../assets/NewGroup/images/Rectangle 444.png | Bin 0 -> 274 bytes wb_new_ui/assets/NewGroup/images/Vector-1.png | Bin 0 -> 340 bytes wb_new_ui/assets/NewGroup/images/Vector.png | Bin 0 -> 374 bytes .../NewGroup/images/room/zuoziMajiang.png | Bin 52257 -> 70419 bytes .../NewGroup/images/room/zuoziMajiang@2x.png | Bin 180961 -> 227239 bytes .../assets/NewGroup/images/room/zuoziPuke.png | Bin 49597 -> 84618 bytes .../NewGroup/images/room/zuoziPuke@2x.png | Bin 180694 -> 262532 bytes .../NewGroup/images/room/zuoziZipai.png | Bin 52468 -> 79077 bytes .../NewGroup/images/room/zuoziZipai@2x.png | Bin 182538 -> 244737 bytes .../NewGroup/mgr/View_GroupMemberHpList.xml | 2 +- .../mgr/View_GroupMemberInviteAlone.xml | 88 +-- .../NewGroup/mgr/View_GroupMemberList1.xml | 37 +- .../assets/NewGroup/mgr/View_GroupMenKang.xml | 6 +- .../NewGroup/mgr/View_GroupPartnerList1.xml | 47 +- .../NewGroup/mgr/View_GroupPartnerStat.xml | 62 +- .../mgr/View_GroupPartnerStatAlone.xml | 2 +- .../NewGroup/mgr/View_GroupPersonStat.xml | 43 +- .../NewGroup/mgr/View_GroupPiLaoZhi.xml | 2 +- .../NewGroup/mgr/View_GroupPlayStat.xml | 21 +- .../assets/NewGroup/mgr/View_GroupStat.xml | 41 +- .../assets/NewGroup/mgr/Win_MemberFagLog.xml | 2 +- .../component/member/partner/btn_sort_3.xml | 22 +- .../partner/images/Arrow 1 (Stroke).png | Bin 641 -> 0 bytes .../partner/images/Arrow 2 (Stroke).png | Bin 601 -> 0 bytes .../partner/images/Arrow 3 (Stroke).png | Bin 589 -> 0 bytes .../member/partner/images/Vector.png | Bin 0 -> 457 bytes .../member/partner/images/Vector2.png | Bin 0 -> 468 bytes .../reward/item_partner_banplays.xml | 5 +- wb_new_ui/assets/NewGroup/package.xml | 74 ++- 80 files changed, 944 insertions(+), 693 deletions(-) create mode 100644 wb_new_ui/.objs/metas/m7iejg46/kwdo7i98.info create mode 100644 wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info create mode 100644 wb_new_ui/assets/NewGroup/component/Lst_info/选择玩法.png create mode 100644 wb_new_ui/assets/NewGroup/component/nav/Rectangle 353.png create mode 100644 wb_new_ui/assets/NewGroup/images/Group 468.png create mode 100644 wb_new_ui/assets/NewGroup/images/Group 893.png create mode 100644 wb_new_ui/assets/NewGroup/images/Group 894.png create mode 100644 wb_new_ui/assets/NewGroup/images/Group 895.png create mode 100644 wb_new_ui/assets/NewGroup/images/Group 896.png rename wb_new_ui/assets/NewGroup/{ => images}/Rectangle 12.png (100%) rename wb_new_ui/assets/NewGroup/{ => images}/Rectangle 13.png (100%) create mode 100644 wb_new_ui/assets/NewGroup/images/Rectangle 350.png create mode 100644 wb_new_ui/assets/NewGroup/images/Rectangle 444.png create mode 100644 wb_new_ui/assets/NewGroup/images/Vector-1.png create mode 100644 wb_new_ui/assets/NewGroup/images/Vector.png delete mode 100644 wb_new_ui/assets/NewGroup/mgr/component/member/partner/images/Arrow 1 (Stroke).png delete mode 100644 wb_new_ui/assets/NewGroup/mgr/component/member/partner/images/Arrow 2 (Stroke).png delete mode 100644 wb_new_ui/assets/NewGroup/mgr/component/member/partner/images/Arrow 3 (Stroke).png create mode 100644 wb_new_ui/assets/NewGroup/mgr/component/member/partner/images/Vector.png create mode 100644 wb_new_ui/assets/NewGroup/mgr/component/member/partner/images/Vector2.png diff --git a/lua_probject/base_project/Game/View/LoginView.lua b/lua_probject/base_project/Game/View/LoginView.lua index efc32378..0ca27ae5 100644 --- a/lua_probject/base_project/Game/View/LoginView.lua +++ b/lua_probject/base_project/Game/View/LoginView.lua @@ -41,7 +41,7 @@ function M:init() local _btn_login = view:GetChild("btn_wx") _btn_login.onClick:Add(function() - ViewUtil.ShowModalWait(true, "正在登录游戏...") + ViewUtil.ShowModalWait(true, "正在登录游戏...", 2) coroutine.start(function() coroutine.wait(8) if self.isWXCallBackMark then @@ -149,7 +149,7 @@ local function __login_response(self, response) local roomid = user.room_id if (string.len(roomid) > 1) then if user.group_id == 0 then - ViewUtil.ShowModalWait(true, "正在加入房间...") + ViewUtil.ShowModalWait(true, "正在加入房间...", 2) __join_room(roomid, response) return end @@ -198,7 +198,7 @@ function M:QuickLogin() local session_id = PlayerPrefs.GetString("session_id") print("session_id:" .. session_id) if session_id and string.len(session_id) > 3 then - ViewUtil.ShowModalWait(true, "正在登录游戏...") + ViewUtil.ShowModalWait(true, "正在登录游戏...", 2) local loginCtr = ControllerManager.GetController(LoginController) loginCtr:QuickLogin(session_id, function(response) __login_response(self, response) @@ -214,7 +214,7 @@ function M:LoginCallBack(result, data) --pt(data) if (not result) or result ~= 0 then if result == 10 then - ViewUtil.ShowModalWait(true) + ViewUtil.ShowModalWait(true, nil, 2) return end ViewUtil.CloseModalWait() diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua index 807e5185..7404acf0 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua @@ -4,105 +4,120 @@ local GroupFastGamesView = {} local M = GroupFastGamesView -function GroupFastGamesView.new(gid, blur_view, playIdList, uid) - setmetatable(M, { __index = BaseWindow }) - local self = setmetatable({}, { __index = M }) +function GroupFastGamesView.new(gid, blur_view, playIdList) + 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 + self.class = "GroupFastGamesView" + self._close_destroy = true + self.group_id = gid + self.blur_view = blur_view + self.playIdList = playIdList + self.allplays_data = {} + self.uid = DataManager.SelfUser.account_id + 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") + --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) + self:OnRenderAllPlaysItem(index, obj, self.showid) end - self:GetFlagPlaysData(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 - + local allplays = self.playIdList + self.allplays_data = allplays + table.sort(self.allplays_data, handler(self, self.SortPlayList)) + -- 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 = {} +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 = + 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() - +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() + if self.callback then + self.callback() + end + self:Destroy() end function M:SetCallback(callback) - self.callback = callback + self.callback = callback +end + +function M:SortPlayList(a, b) + local a_play = a + local b_play = b + + if a_play.gameType == b_play.gameType then + if a_play.gameId == a_play.gameId then + return a_play.id < b_play.id + else + return a_play.gameId < b_play.gameId + end + else + return a_play.gameType < b_play.gameType + end end -- 销毁窗口 function M:Destroy(remove_map) - if self.callback then - self.callback() - end - BaseWindow.Destroy(self, remove_map) - ImageLoad.Clear(self.class) + -- 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 5c850d05..54dbf95a 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -292,18 +292,73 @@ local function __fillRoomItem(self, index, item, room) if self.roominfo.view and not self.roominfo.view.isDisposed then self.roominfo.view:Dispose() end - local riv = UIPackage.CreateObjectFromURL('ui://NewGroup/Win_roomInfo') - self.roominfo.view = riv - self.roominfo.room = room - riv:GetChild('tex_room_id').text = room.id and '房间号:' .. room.id or '' - local play = self.curGroup:getPlay(room.pid) - riv:GetChild('tex_room_name').text = play.game_name - riv:GetController("mengzhu").selectedIndex = 1 - printlog("tex_room_name:") if self.curGroup.lev == 1 then - riv:GetController("mengzhu").selectedIndex = 0 - local jiesannum = riv:GetChild("jiesan_input") - riv:GetChild("btn_jiesan").onClick:Set( + local riv = UIPackage.CreateObjectFromURL('ui://NewGroup/Win_roomInfo') + self.roominfo.view = riv + self.roominfo.room = room + riv:GetChild('tex_room_id').text = room.id and '房间号:' .. room.id or '' + local play = self.curGroup:getPlay(room.pid) + riv:GetChild('tex_room_name').text = play.game_name + riv:GetController("mengzhu").selectedIndex = 1 + printlog("tex_room_name:") + if self.curGroup.lev == 1 then + riv:GetController("mengzhu").selectedIndex = 0 + local jiesannum = riv:GetChild("jiesan_input") + riv:GetChild("btn_jiesan").onClick:Set( + function() + local _curren_msg = + MsgWindow.new( + self._root_view, + '确定解散该桌子吗？\r(解散该桌子没有任何结算信息，请谨慎操作)', + MsgWindow.MsgMode.OkAndCancel + ) + _curren_msg.onOk:Add( + function() + ViewUtil.ShowModalWait(self._root_view) + local fgCtr = ControllerManager.GetController(NewGroupController) + local roomid = jiesannum.text + fgCtr:FG_RemoveRoom( + self.curGroup.id, + roomid, + function(res) + if self._is_destroy then + return + end + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, '删除房间失败！') + return + else + riv:Dispose() + end + end + ) + end + ) + _curren_msg:Show() + end + ) + end + local exconfig = ExtendManager.GetExtendConfig(play.gameId) + local data = json.decode(play.config) + local r = {} + exconfig:FillRoomConfig(r, data) + local gameStr = "" + gameStr = "[" .. play.name .. "]" .. string.gsub(r.room_config:GetDes(), "\r", "") + riv:GetChild("wafashuoming").text = gameStr + + self:InitRoomInfoView() + riv:GetChild('btn_enter').onClick:Set( + function() + riv:Dispose() + if room.default or isHidden == 1 then + self:__startGame(room.id, room.pid, false, isHidden) + else + self:__joinRoom(roomid, room) + end + end + ) + riv:GetChild('btn_del').onClick:Set( function() local _curren_msg = MsgWindow.new( @@ -315,7 +370,7 @@ local function __fillRoomItem(self, index, item, room) function() ViewUtil.ShowModalWait(self._root_view) local fgCtr = ControllerManager.GetController(NewGroupController) - local roomid = jiesannum.text + fgCtr:FG_RemoveRoom( self.curGroup.id, roomid, @@ -337,67 +392,20 @@ local function __fillRoomItem(self, index, item, room) _curren_msg:Show() end ) - end - local exconfig = ExtendManager.GetExtendConfig(play.gameId) - local data = json.decode(play.config) - local r = {} - exconfig:FillRoomConfig(r, data) - local gameStr = "" - gameStr = "[" .. play.name .. "]" .. string.gsub(r.room_config:GetDes(), "\r", "") - riv:GetChild("wafashuoming").text = gameStr - - self:InitRoomInfoView() - riv:GetChild('btn_enter').onClick:Set( - function() - riv:Dispose() - if room.default or isHidden == 1 then - self:__startGame(room.id, room.pid, false, isHidden) - else - self:__joinRoom(roomid, room) + riv:GetChild('btn_close').onClick:Set( + function() + riv:Dispose() end + ) + self._view:AddChild(riv) + riv:Center() + else + if room.default or isHidden == 1 then + self:__startGame(room.id, room.pid, false, isHidden) + else + self:__joinRoom(roomid, room) end - ) - riv:GetChild('btn_del').onClick:Set( - function() - local _curren_msg = - MsgWindow.new( - self._root_view, - '确定解散该桌子吗？\r(解散该桌子没有任何结算信息，请谨慎操作)', - MsgWindow.MsgMode.OkAndCancel - ) - _curren_msg.onOk:Add( - function() - ViewUtil.ShowModalWait(self._root_view) - local fgCtr = ControllerManager.GetController(NewGroupController) - - fgCtr:FG_RemoveRoom( - self.curGroup.id, - roomid, - function(res) - if self._is_destroy then - return - end - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, '删除房间失败！') - return - else - riv:Dispose() - end - end - ) - end - ) - _curren_msg:Show() - end - ) - riv:GetChild('btn_close').onClick:Set( - function() - riv:Dispose() - end - ) - self._view:AddChild(riv) - riv:Center() + end end @@ -653,7 +661,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 @@ -750,14 +758,13 @@ local function __fillPlayItem(self, index, item) if (index == 0) then -- tex_gameName.text = __getLayerName(self, 0) item:GetController('all').selectedIndex = 1 - + item.data = "" 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 @@ -858,7 +865,6 @@ 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) @@ -1104,7 +1110,6 @@ 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 @@ -1135,9 +1140,22 @@ function M:InitView(url) self.lst_layer.onClickItem:Add( function(context) - - self._view:GetChild('btn_start2').text = context.data.data - self:__loadPlayData() + if context.data.data == "" then + --如果点击了全部游戏，如果有本地配置则显示本地配置，否则显示全部开始 + local showid2 = Utils.LoadLocalFile("selectplay" .. DataManager.SelfUser.account_id) + if showid2 == nil or showid2 == "" then + self._view:GetChild('btn_start2'):GetController('isChoose').selectedIndex = 1 + self._view:GetChild('btn_start2').text = context.data.data + else + local gamename = Utils.LoadLocalFile("selectplayname" .. DataManager.SelfUser.account_id) + self._view:GetChild('btn_start2').text = gamename + end + else + --如果点击了玩法则显示快速开始 + self._view:GetChild('btn_start2'):GetController('isChoose').selectedIndex = 0 + self._view:GetChild('btn_start2').text = context.data.data + self:__loadPlayData() + end end ) @@ -1145,11 +1163,8 @@ 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 ) @@ -1193,69 +1208,92 @@ function M:InitView(url) 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) + 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 btn_start2.onClick:Set( 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 btn_start2:GetController('isChoose').selectedIndex == 1 then + local gfg = GroupFastGamesView.new(self.curGroup.id, self._root_view, self.curGroup.playList, + DataManager.SelfUser.account_id) - 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, '没有选择玩法1') + 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() + else + 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 - local p_data = self.curGroup:getPlay(pid) - local currentGameID = self:GetSelectedGameID() - if currentGameID == p_data.gameId then - currentPlayID = pid + + 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, '没有选择玩法1') + return + end + local p_data = self.curGroup:getPlay(pid) + local currentGameID = self:GetSelectedGameID() + if currentGameID == p_data.gameId then + currentPlayID = pid + end + end + if currentPlayID == 0 then + local gfg = GroupFastGamesView.new(self.curGroup.id, self._root_view, self.curGroup.playList, + self.playIdList) + + 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 - if currentPlayID == 0 then - - 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 - self:__startGame("", currentPlayID, false) + self:__startGame("", currentPlayID, false) + end end ) + --lingmeng 开始前读取本地日志，如果没有则显示选择玩法，如果有则显示在下方小字上 + local showid2 = Utils.LoadLocalFile("selectplay" .. DataManager.SelfUser.account_id) + if showid2 == nil or showid2 == "" then + btn_start2:GetController('isChoose').selectedIndex = 1 + else + local gamename = Utils.LoadLocalFile("selectplayname" .. DataManager.SelfUser.account_id) + self._view:GetChild('btn_start2').text = gamename + end -- 选择玩法按钮 local btn_choose = self._view:GetChild('btn_choose') @@ -1538,41 +1576,34 @@ function M:__joinRoom2(room_id) 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) + + + if response.ReturnCode == -2 then + self:__joinRoom2(room_id) + return + elseif response.ReturnCode ~= 0 then ViewUtil.CloseModalWait('join_room') - timer = 0 - end, - self.curGroup.id + 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) - - +function M:__joinRoom(room_id, room) if self.roominfo.view and not self.roominfo.view.isDisposed then self.roominfo.view:Dispose() end - local riv = UIPackage.CreateObjectFromURL('ui://NewGroup/Win_roomInfo') - self.roominfo.view = riv - self.roominfo.room = room - riv:GetChild('tex_room_id').text = room_id and '房间号:' .. room_id or '' local play = self.curGroup:getPlay(room.pid) local isHidden = 0 if play then @@ -1586,115 +1617,203 @@ function M:__joinRoom(room_id,room) end play.isHidden = isHidden end - riv:GetChild('tex_room_name').text = play.game_name - riv:GetController("mengzhu").selectedIndex = 1 - printlog("tex_room_name:") - riv:GetController("mengzhu").selectedIndex = 1 - local exconfig = ExtendManager.GetExtendConfig(play.gameId) - local data = json.decode(play.config) - local r = {} - exconfig:FillRoomConfig(r, data) - local gameStr = "" - gameStr = "[" .. play.name .. "]" .. string.gsub(r.room_config:GetDes(), "\r", "") - riv:GetChild("wafashuoming").text = gameStr - - self:InitRoomInfoView() local roomCtr = ControllerManager.GetController(RoomController) local _gameCtrl = ControllerManager.GetController(GameController) local _currentCtrl = ControllerManager.GetCurrenController() + if self.curGroup.lev == 1 then + local riv = UIPackage.CreateObjectFromURL('ui://NewGroup/Win_roomInfo') + self.roominfo.view = riv + self.roominfo.room = room - riv:GetChild('btn_enter').onClick:Set( - function() - riv:Dispose() - if room.default or isHidden == 1 then - self:__startGame(room.id, room.pid, false, isHidden) - else - -- self:__joinRoom(room_id,room) - printlog("join_room") + riv:GetChild('tex_room_id').text = room_id and '房间号:' .. room_id or '' - 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 + riv:GetChild('tex_room_name').text = play.game_name + riv:GetController("mengzhu").selectedIndex = 1 + printlog("tex_room_name:") + riv:GetController("mengzhu").selectedIndex = 1 + local exconfig = ExtendManager.GetExtendConfig(play.gameId) + local data = json.decode(play.config) + local r = {} + exconfig:FillRoomConfig(r, data) + local gameStr = "" + gameStr = "[" .. play.name .. "]" .. string.gsub(r.room_config:GetDes(), "\r", "") + riv:GetChild("wafashuoming").text = gameStr + + self:InitRoomInfoView() + + riv:GetChild('btn_enter').onClick:Set( + function() + riv:Dispose() + if room.default or isHidden == 1 then + self:__startGame(room.id, room.pid, false, isHidden) + else + -- self:__joinRoom(room_id,room) + printlog("join_room") + + 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:__joinRoom(room_id, room) + return + elseif response.ReturnCode ~= 0 then + ViewUtil.CloseModalWait('join_room') + ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败') + return + end + self.__join_room = true + self._view.visible = false + ImageLoad.Clear(self.class) + ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id) ViewUtil.CloseModalWait('join_room') - RestartGame() - return - end + timer = 0 + end, + self.curGroup.id + ) + end + ) + return + end + end - if response.ReturnCode == -2 then - self:__joinRoom(room_id, room) - return - elseif response.ReturnCode ~= 0 then - ViewUtil.CloseModalWait('join_room') - ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败') - return - end - self.__join_room = true - 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 - ) + 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:__joinRoom(room_id, room) + 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 + end + ) + + riv:GetChild('btn_close').onClick:Set( + function() + riv:Dispose() + end + ) + self._view:AddChild(riv) + riv:Center() + else + if room.default or isHidden == 1 then + self:__startGame(room.id, room.pid, false, isHidden) + else + -- self:__joinRoom(room_id,room) + printlog("join_room") + + 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:__joinRoom(room_id, room) + return + elseif response.ReturnCode ~= 0 then + ViewUtil.CloseModalWait('join_room') + ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败') + return + end + self.__join_room = true + 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 - 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:__joinRoom(room_id, room) - 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) + if response.ReturnCode == -2 then + self:__joinRoom(room_id, room) + return + elseif response.ReturnCode ~= 0 then ViewUtil.CloseModalWait('join_room') - timer = 0 - end, - self.curGroup.id - ) - end + 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 - ) + end - riv:GetChild('btn_close').onClick:Set( - function() - riv:Dispose() - end - ) - self._view:AddChild(riv) - riv:Center() --[[ ViewUtil.ShowModalWait(self._root_view, '正在加入游戏...', 'join_room') local roomCtr = ControllerManager.GetController(RoomController) @@ -1953,7 +2072,7 @@ function M:_evtInvited(...) self.curGroup.id, function(roomid) printlog("Into game") - self:__joinRoom(roomid,self.roominfo.room) + self:__joinRoom(roomid, self.roominfo.room) end ) imv:FillData(data) @@ -2321,7 +2440,6 @@ function M:__refreshPay() local currentGameID = self:GetSelectedGameID() if currentPlayID > 0 then - --self._view:GetChild("tex_name").text = __getLayerName(self,currentPlayID) ctr_all.selectedIndex = 0 else diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua index e73154bb..29bf0abc 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua @@ -109,6 +109,10 @@ function M:InitView(url) local lst_group = self._view:GetChild('lst_group') lst_group.onClickItem:Add(function(context) local curGroup = context.data.data + --点击进入亲友圈的时候清空亲友圈快捷玩法 + print("lingmeng selectplay", string.format("selectplay%d", DataManager.SelfUser.account_id)) + Utils.SaveLocalFile(string.format("selectplay%d", DataManager.SelfUser.account_id), "") + Utils.SaveLocalFile(string.format("selectplayname%d", DataManager.SelfUser.account_id), "") local info = GroupInfoView.new(curGroup, self.fg_info) self._groupInfoView = info info:SetCallBack(function() diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupManagerStagView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupManagerStagView.lua index fa7de7ea..63bb9363 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupManagerStagView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupManagerStagView.lua @@ -31,11 +31,10 @@ function M:InitInfo() { uid = DataManager.SelfUser.account_id, nick = DataManager.SelfUser.nick_name }, obj) -- obj:GetController('show').selectedIndex = 1 obj.data.selected = true - ViewUtil.ShowModalWait("正在获取成员中") + ViewUtil.ShowModalWait(true, "正在获取成员中", 0.01) self:RecursionGetNumber1(0, DataManager.SelfUser.account_id, {}) --将外面设置为最外圈页面 self.ctr_index.selectedIndex = #self.page_config - obj:GetController('arrow').selectedIndex = 1 self._data_selectedData = obj end @@ -48,68 +47,98 @@ function M:SetRecursionGetNumber1Info(id, tempTable) local obj = me.data.list:AddItemFromPool() self:PartnerRender(tempTable[i], obj) end - self:SetListShow(tempTable, 1) self:RecursionReSize(me) - self._viewList_partner.scrollPane:SetPosY(self.lastY and self.lastY - me.data.list.height or 0, true) + self:RecursionSetScrollPannel(me, 0) end function M:PartnerRender(data, obj) - obj:GetChild('text_name').text = string.format("ID:%d", data.uid) + obj:GetChild('text_name').text = string.format("%d", data.uid) obj:GetChild('text_id').text = data.nick + obj:GetChild('text_lev').text = data.partnerLev and data.partnerLev + 1 or 1 + obj:GetController('show').selectedIndex = data.partnerLev and 1 or 0 + obj:GetController('isLine').selectedIndex = 1 obj.data = {} obj.data.list = obj:GetChild('list') obj.data.info = data self._map_members[data.uid] = obj obj:GetChild('area').onClick:Set(function() - self.lastY = self._viewList_partner.scrollPane.posY - self._data_selectedData:GetController('arrow').selectedIndex = 0 - obj:GetController('arrow').selectedIndex = 1 - self._data_selectedData = obj - if obj.data.info.parentId then - self:SetListShow(self._map_members[obj.data.info.parentId].data.listInfo, 0, data.uid) - end - if obj.data.selected then - self:SetListShow(obj.data.listInfo, 0, data.uid) - obj.data.selected = false - self:RecursionReSize(obj, -1, true) - self:SetListShow(obj.data.listInfo, 1) + if obj.data.info.uid == DataManager.SelfUser.account_id then + if obj.data.info.uid ~= self._data_selectedData.data.info.uid then + self:RecursionReSize(self._data_selectedData, -1, true, obj.data.info.uid) + end else - obj.data.selected = true - self._data_choosePlayer = data - if obj.data.listNum then - self:RecursionReSize(obj) - else - ViewUtil.ShowModalWait("正在获取成员中") - self:RecursionGetNumber1(0, data.uid, {}) + if obj.data.info.parentId and obj.data.info.parentId ~= 0 then + if obj.data.info.parentId ~= self._data_selectedData.data.info.uid then + self:RecursionReSize(self._data_selectedData, -1, true, obj.data.info.parentId) + end + local father = self._map_members[obj.data.info.parentId] + for i = 1, father.data.listNum do + father.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 0 + end + obj:GetController('isLine').selectedIndex = 1 end end - -- obj:GetController('show').selectedIndex = 1 + + -- if obj.data.selected then + -- self:RecursionReSize(self._data_selectedData, -1, true, obj.data.info.uid) + -- self:RecursionSetScrollPannel(obj, 0) + -- else + self._data_choosePlayer = data + if obj.data.listNum then + self:RecursionReSize(obj) + self:RecursionSetScrollPannel(obj, 0) + else + ViewUtil.ShowModalWait(true, "正在获取成员中", 0.01) + self:RecursionGetNumber1(0, data.uid, {}) + end + -- end if self.ctr_index.selectedIndex == #self.page_config then self._view_map[#self.page_config + 1]:RefrenRecordData(data) else self.ctr_index.selectedIndex = #self.page_config end - self._ctr_tongji.selectedIndex = 1 + obj.data.selected = true + self._data_selectedData = obj + -- self._ctr_tongji.selectedIndex = 1 end) end -function M:RecursionReSize(obj, add, flag) +function M:RecursionReSize(obj, add, flag, tagFather) + --如果把小箭头取消选择状态 + if not add then + for i = 1, obj.data.listNum do + obj.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 1 + end + elseif add == -1 then + obj.data.selected = false + for i = 1, obj.data.listNum do + obj.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 0 + end + elseif add == 0 then + for i = 1, obj.data.listNum do + obj.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 0 + end + end + --递归把列表缩回 obj.data.list:ResizeToFit(flag and 0 or obj.data.childNum) if obj.data.info.parentId and obj.data.info.parentId ~= 0 then + if tagFather and obj.data.info.parentId == tagFather then + return + end local father = self._map_members[obj.data.info.parentId] father.data.childNum = father.data.childNum + obj.data.childNum * (add or 1) - self:RecursionReSize(father, add, false) + father:GetController('isLine').selectedIndex = 1 + self:RecursionReSize(father, add or 1, flag, tagFather) end end -function M:SetListShow(list, isShow, myID) - for i = 1, #list do - local obj = self._map_members[list[i].uid] - obj:GetController('show').selectedIndex = isShow - if isShow == 0 and obj.data.selected and list[i].uid ~= myID then - obj.data.selected = false - self:RecursionReSize(obj, -1, true) - end +function M:RecursionSetScrollPannel(obj, scrollIndex) + if obj.data.info.parentId and obj.data.info.parentId ~= 0 then + local father = self._map_members[obj.data.info.parentId] + self:RecursionSetScrollPannel(father, scrollIndex + father.data.list:GetChildIndex(obj) + 1) + else + print("lingmeng RecursionSetScrollPannel", scrollIndex, self._viewList_partner.scrollPane.posY, scrollIndex * 85) + self._viewList_partner.scrollPane:SetPosY(scrollIndex * 85, true) end end diff --git a/lua_probject/base_project/Game/View/ViewUtil.lua b/lua_probject/base_project/Game/View/ViewUtil.lua index 1eeaedb0..c6d9d211 100644 --- a/lua_probject/base_project/Game/View/ViewUtil.lua +++ b/lua_probject/base_project/Game/View/ViewUtil.lua @@ -42,12 +42,12 @@ end local modal_wait_win = nil -- local modal_wait_win_url = "ui://Common/GlobalModalWaiting" -function ViewUtil.ShowModalWait(blur_view, title) +function ViewUtil.ShowModalWait(blur_view, title, time) local flag = type(blur_view) == "boolean" ViewUtil.CloseModalWait() ViewUtil.continue = coroutine.start( function() - coroutine.wait(flag and 0.01 or 0.8) + coroutine.wait(flag and time or 0.8) ModalWaitingWindow.ShowModal(title) end ) diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json index af36c5ed..ab35e696 100644 --- a/wb_new_ui/.objs/fonts.json +++ b/wb_new_ui/.objs/fonts.json @@ -21,6 +21,8 @@ ui://v2hilfzbgq7mbt ui://v2hilfzbgq7mbs ui://v2hilfzbgq7m2k ui://v2hilfzbgq7ml +ui://1utjt0r2ufu98l +ui://1utjt0r2ufu98k ui://ppu1wv7699we4s ui://ppu1wv7699we2l ui://oubpz2r2ofil78 diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 51d59abb..50f90b8e 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -15,9 +15,6 @@ "n241_n6w8": { "hidden": true }, - "n74_i7lq": { - "locked": true - }, "n243_n6w8": { "hidden": true }, @@ -42,6 +39,9 @@ }, "n171_mpll": { "hidden": true + }, + "n271_avqi": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/avqi7ijp.info b/wb_new_ui/.objs/metas/m7iejg46/avqi7ijp.info index 9e26dfee..666de291 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/avqi7ijp.info +++ b/wb_new_ui/.objs/metas/m7iejg46/avqi7ijp.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n4_8h20": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info index 4171dcf4..c10555a7 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info +++ b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info @@ -1,10 +1,13 @@ { "objectStatus": { - "n87_csp4": { + "n93_t8gf": { "hidden": true }, "n79_ovii": { "hidden": true + }, + "n87_csp4": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info index db5d0af5..4a17285b 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info +++ b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n229_yvb2": { + "hidden": true + }, "n213_yvb2": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwdo7i98.info b/wb_new_ui/.objs/metas/m7iejg46/kwdo7i98.info new file mode 100644 index 00000000..acc44ae0 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/kwdo7i98.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n13_kwdo": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info index ea51502c..ce9da658 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info @@ -1,5 +1,11 @@ { "objectStatus": { + "n118_fcju": { + "hidden": true + }, + "n104_kwi0": { + "collapsed": true + }, "n115_dfkc": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info b/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info index e7479945..4f94dd54 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info @@ -2,6 +2,9 @@ "objectStatus": { "n98_k5m9": { "hidden": true + }, + "n100_m16m": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info index c93662a6..667cb6bb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info @@ -3,15 +3,15 @@ "n86_kwi0": { "hidden": true }, + "n142_m16m": { + "hidden": true + }, "n115_l679": { "hidden": true }, "n121_l679": { "collapsed": true }, - "n112_kwi0": { - "collapsed": true - }, "n122_j120": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info b/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info new file mode 100644 index 00000000..97c320ee --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n87_csp4": { + "hidden": true + } + } +} \ 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 fc088faa..1fa1ff5e 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info @@ -3,6 +3,9 @@ "n69_jd7v": { "hidden": true }, + "n46_tqi8": { + "locked": true + }, "n142_ufim": { "hidden": true }, @@ -15,6 +18,9 @@ "n33_rpaz": { "hidden": true }, + "n134_yscl": { + "hidden": true + }, "n35_rpaz": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info index 5765b7a7..deb9dd67 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info @@ -3,7 +3,7 @@ "n130_yre9": { "hidden": true }, - "n79_nk4v": { + "n136_iaes": { "hidden": true }, "n13_gls1": { @@ -17,6 +17,9 @@ }, "n20_gls1": { "hidden": true + }, + "n79_nk4v": { + "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 e389c081..8d5f41f3 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -3,49 +3,25 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://m7iejg46hsbhhjn", - "ui://m7iejg46c0or7i7d", - "ui://m7iejg46nwgkhx2", - "ui://m7iejg46nwgkhx0", - "ui://m7iejg46ozazhxs", - "ui://m7iejg46cioehos", - "ui://m7iejg468h207i99", - "ui://m7iejg46kwdo7i97", - "ui://m7iejg46cvc87i5y", - "ui://m7iejg46nk4vhwh", - "ui://m7iejg4610snh5j", - "ui://m7iejg46kwi0hk0", - "ui://m7iejg46qlxihsm", - "ui://m7iejg46kwi0hk1", - "ui://m7iejg46kwi0hkb", - "ui://m7iejg46ilon7ias", - "ui://m7iejg46i5987i75", - "ui://m7iejg46ilon7i9k", - "ui://m7iejg46ilon7ia2", - "ui://m7iejg46kwi0hkr", - "ui://m7iejg46z3847i6m", - "ui://m7iejg46kk3uhrk", - "ui://m7iejg46kk3uhrm", - "ui://m7iejg46tqi8hwa", - "ui://m7iejg46jr1l7i3c", - "ui://m7iejg46ilon7ibl", - "ui://m7iejg46k5m97i76", - "ui://m7iejg46taski05", - "ui://m7iejg46i9oq7i3m", - "ui://m7iejg46w111hhx", - "ui://m7iejg46avqi7ijp", - "ui://m7iejg46kk3uhrs", - "ui://m7iejg46irlqhyt" + "ui://m7iejg46t1hqhxw", + "ui://m7iejg46t1hqhy5", + "ui://m7iejg46kwi0hm5", + "ui://m7iejg46l679hwn", + "ui://m7iejg46gojuhh5", + "ui://m7iejg46l679hws" ], "auxline1": true, "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46z3847i6m", + "doc.activeDoc": "ui://m7iejg46hsbhhjn", "libview.twoColumn": false, "libview.expandedNodes": [ "m7iejg46", "/", "m7iejg46", - "/mgr/" + "/font/", + "m7iejg46", + "/images/" ], "snapToGrid": true, "backgroundColor": 6710886, diff --git a/wb_new_ui/assets/Common/GlobalModalWaiting.xml b/wb_new_ui/assets/Common/GlobalModalWaiting.xml index 5a02fa43..f4f7740d 100644 --- a/wb_new_ui/assets/Common/GlobalModalWaiting.xml +++ b/wb_new_ui/assets/Common/GlobalModalWaiting.xml @@ -3,9 +3,9 @@ - - - + + + diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml index f0e9297f..7328052f 100644 --- a/wb_new_ui/assets/Hotupdate/Version.xml +++ b/wb_new_ui/assets/Hotupdate/Version.xml @@ -34,7 +34,7 @@ - + diff --git a/wb_new_ui/assets/Hotupdate/commpoent/GlobalModalWaiting.xml b/wb_new_ui/assets/Hotupdate/commpoent/GlobalModalWaiting.xml index d8f0ec01..f9753e63 100644 --- a/wb_new_ui/assets/Hotupdate/commpoent/GlobalModalWaiting.xml +++ b/wb_new_ui/assets/Hotupdate/commpoent/GlobalModalWaiting.xml @@ -3,12 +3,23 @@ - - - - - + + + + + + + +