diff --git a/lua_probject/base_project/Game/View/Common/BaseWindow.lua b/lua_probject/base_project/Game/View/Common/BaseWindow.lua index 8dfe694c..f85d7ee2 100644 --- a/lua_probject/base_project/Game/View/Common/BaseWindow.lua +++ b/lua_probject/base_project/Game/View/Common/BaseWindow.lua @@ -2,251 +2,252 @@ --author：-- BaseWindow = { - --view description - _view = nil, + --view description + _view = nil, - --View 是否被销毁 - _is_destroy = false, - --是否播放动画 - _animation = true, - --弹出动画，0关闭，1左边，2右边 - _anim_pop = 0, - --关闭摧毁 - _close_destroy = false, + --View 是否被销毁 + _is_destroy = false, + --是否播放动画 + _animation = true, + --弹出动画，0关闭，1左边，2右边 + _anim_pop = 0, + --关闭摧毁 + _close_destroy = false, - --点击窗口以外关闭 - _close_zone = true, + --点击窗口以外关闭 + _close_zone = true, - --队列 - _queue = true, - --全屏 - _full = false, - --全屏偏移 - _full_offset = true, - --新窗口隐藏队列 - _new_hide = true, - --模糊组件对象 - _put_map = true + --队列 + _queue = true, + --全屏 + _full = false, + --全屏偏移 + _full_offset = true, + --新窗口隐藏队列 + _new_hide = true, + --模糊组件对象 + _put_map = true } --window 列表 local WindowMap = { - + } -local WindowQueue= { - +local WindowQueue = { + } local M = BaseWindow -function BaseWindow.new(url,blur_view) - local self = setmetatable({}, {__index = M}) - self.class = "BaseWindow" - -- self._blur_view = blur_view - self:init(url) - return self +function BaseWindow.new(url, blur_view) + local self = setmetatable({}, { __index = M }) + self.class = "BaseWindow" + -- self._blur_view = blur_view + self:init(url) + return self end local win_url = { - "ui://Common/Gcm_Window", - "ui://Common/Gcm_Window_Full" + "ui://Common/Gcm_Window", + "ui://Common/Gcm_Window_Full" } function M:init(url) - self._root_view = UIPackage.CreateObjectFromURL(self._full and win_url[2] or win_url[1]) - local contentPane = self._root_view:GetChild("contentPane") - local ctr_hide_bg = self._root_view:GetController("hide_bg") - if self._anim_pop ~= 0 then - ctr_hide_bg.selectedIndex = 1 - PopPanel = contentPane:GetChild("PopPanel") - else - ctr_hide_bg.selectedIndex = 0 - end - self._view = UIPackage.CreateObjectFromURL(url) - -- self._view.fairyBatching = true - local btn_close = self._view:GetChild("btn_close") - if(btn_close) then - btn_close.onClick:Set(function() - self:CloseEvent() - end) - end + self._root_view = UIPackage.CreateObjectFromURL(self._full and win_url[2] or win_url[1]) + local contentPane = self._root_view:GetChild("contentPane") + local ctr_hide_bg = self._root_view:GetController("hide_bg") + if self._anim_pop ~= 0 then + ctr_hide_bg.selectedIndex = 1 + PopPanel = contentPane:GetChild("PopPanel") + else + ctr_hide_bg.selectedIndex = 0 + end + self._view = UIPackage.CreateObjectFromURL(url) + -- self._view.fairyBatching = true + local btn_close = self._view:GetChild("btn_close") + if (btn_close) then + btn_close.onClick:Set(function() + self:CloseEvent() + end) + end - - local win_mode = self._root_view:GetChild("win_mode") - win_mode.onClick:Set(function() - if not self._close_zone then - return - end - win_mode.touchable = false - self:CloseEvent() - end) - if self._full then - local offset = get_offset(self._full_offset) - if self._anim_pop == 0 then - self._view:AddRelation(contentPane, RelationType.Size) - contentPane:AddChild(self._view) - else - contentPane:RemoveRelation(self._root_view, RelationType.Center_Center) - contentPane:AddRelation(self._root_view, RelationType.Middle_Middle) - PopPanel:AddChild(self._view) - local click_item = PopPanel:GetChild("click_item") - if self._anim_pop == 1 then - contentPane:AddRelation(self._root_view, RelationType.Left_Left) - self._view.x = 0 - elseif self._anim_pop == 2 then - contentPane:AddRelation(self._root_view, RelationType.Right_Right) - self._view.x = GRoot.inst.width - self._view.width - offset - end - self._view.y = (PopPanel.height - self._view.height) * 0.5 - click_item.xy = self._view.xy - click_item.width = self._view.width - click_item.height = self._view.height - end - else - contentPane:AddChild(self._view) - contentPane.height = self._view.height - contentPane.width = self._view.width - contentPane:Center() - end - self._contentPane = contentPane - if self._put_map then - WindowMap[#WindowMap + 1] = self - end + local win_mode = self._root_view:GetChild("win_mode") + win_mode.onClick:Set(function() + if not self._close_zone then + return + end + win_mode.touchable = false + self:CloseEvent() + end) + + if self._full then + local offset = get_offset(self._full_offset) + if self._anim_pop == 0 then + self._view:AddRelation(contentPane, RelationType.Size) + contentPane:AddChild(self._view) + self._view:Center() + else + contentPane:RemoveRelation(self._root_view, RelationType.Center_Center) + contentPane:AddRelation(self._root_view, RelationType.Middle_Middle) + PopPanel:AddChild(self._view) + local click_item = PopPanel:GetChild("click_item") + if self._anim_pop == 1 then + contentPane:AddRelation(self._root_view, RelationType.Left_Left) + self._view.x = 0 + elseif self._anim_pop == 2 then + contentPane:AddRelation(self._root_view, RelationType.Right_Right) + self._view.x = GRoot.inst.width - self._view.width - offset + end + self._view.y = (PopPanel.height - self._view.height) * 0.5 + click_item.xy = self._view.xy + click_item.width = self._view.width + click_item.height = self._view.height + end + else + contentPane:AddChild(self._view) + contentPane.height = self._view.height + contentPane.width = self._view.width + contentPane:Center() + end + self._contentPane = contentPane + if self._put_map then + WindowMap[#WindowMap + 1] = self + end end -- 显示窗口 function M:Show() - local contentPane = self._root_view:GetChild("contentPane") - if self._anim_pop == 1 then - contentPane:GetTransition("left_pop"):Play() - elseif self._anim_pop == 2 then - contentPane:GetTransition("right_pop"):Play() - elseif self._animation then - local ani_in = self._root_view:GetTransition("in") - if ani_in then - ani_in:Play() - end - end - -- if self._blur_view then - -- BlurView(self._blur_view,true) - -- end + local contentPane = self._root_view:GetChild("contentPane") + if self._anim_pop == 1 then + contentPane:GetTransition("left_pop"):Play() + elseif self._anim_pop == 2 then + contentPane:GetTransition("right_pop"):Play() + elseif self._animation then + local ani_in = self._root_view:GetTransition("in") + if ani_in then + ani_in:Play() + end + end + -- if self._blur_view then + -- BlurView(self._blur_view,true) + -- end - -- 判断当前窗口是否已经在队列中，如果在就不重复添加 - local _inQueue = false + -- 判断当前窗口是否已经在队列中，如果在就不重复添加 + local _inQueue = false - if self._new_hide then - for i=1,#WindowQueue do - local win = WindowQueue[i] - if win == self then - _inQueue = true - end - if win._queue then - win._root_view:RemoveFromParent() - end - end - end - if self._queue and not _inQueue then - WindowQueue[#WindowQueue + 1] = self - end - AddPanel(self._root_view) - if self._full then - local offset = get_offset(self._full_offset) - self._contentPane.width = GRoot.inst.width - 2 * offset - self._contentPane.height = GRoot.inst.height - self._contentPane.x = offset - end + if self._new_hide then + for i = 1, #WindowQueue do + local win = WindowQueue[i] + if win == self then + _inQueue = true + end + if win._queue then + win._root_view:RemoveFromParent() + end + end + end + if self._queue and not _inQueue then + WindowQueue[#WindowQueue + 1] = self + end + AddPanel(self._root_view) + if self._full then + local offset = get_offset(self._full_offset) + self._contentPane.width = GRoot.inst.width - 2 * offset + self._contentPane.height = GRoot.inst.height + self._contentPane.x = offset + end end -- 关闭窗口 function M:Close() - -- if self._blur_view then - -- BlurView(self._blur_view,false) - -- end - if self._queue then - for i,v in ipairs(WindowQueue) do - if v == self then - table.remove(WindowQueue,i) - break - end - end - end + -- if self._blur_view then + -- BlurView(self._blur_view,false) + -- end + if self._queue then + for i, v in ipairs(WindowQueue) do + if v == self then + table.remove(WindowQueue, i) + break + end + end + end - if self._new_hide then - local win = WindowQueue[#WindowQueue] - if win and win._queue then - AddPanel(win._root_view) - end - end - self._root_view:RemoveFromParent() + if self._new_hide then + local win = WindowQueue[#WindowQueue] + if win and win._queue then + AddPanel(win._root_view) + end + end + self._root_view:RemoveFromParent() end local _destroy_all = false -- 销毁窗口 function M:Destroy() - if self._is_destroy then - return - end - if not _destroy_all then - self:Close() - if self._put_map then - for i,v in ipairs(WindowMap) do - if v == self then - table.remove(WindowMap,i) - break - end - end - end - end - self._is_destroy = true - self._root_view:Dispose() + if self._is_destroy then + return + end + if not _destroy_all then + self:Close() + if self._put_map then + for i, v in ipairs(WindowMap) do + if v == self then + table.remove(WindowMap, i) + break + end + end + end + end + self._is_destroy = true + self._root_view:Dispose() end function M:CloseEvent() - local win_mode = self._root_view:GetChild("win_mode") - if self._anim_pop == 0 then - if self._close_destroy then - self:Destroy() - else - self:Close() - win_mode.touchable = true - end - else - self:ActionWithAnim(function() - if self._close_destroy then - self:Destroy() - else - self:Close() - win_mode.touchable = true - end - end) - end + local win_mode = self._root_view:GetChild("win_mode") + if self._anim_pop == 0 then + if self._close_destroy then + self:Destroy() + else + self:Close() + win_mode.touchable = true + end + else + self:ActionWithAnim(function() + if self._close_destroy then + self:Destroy() + else + self:Close() + win_mode.touchable = true + end + end) + end end function M:ActionWithAnim(callback) - local contentPane = self._root_view:GetChild("contentPane") - if self._anim_pop == 1 then - contentPane:GetTransition("left_pop_back"):Play() - elseif self._anim_pop == 2 then - contentPane:GetTransition("right_pop_back"):Play() - end - if callback then - coroutine.start(function() - coroutine.wait(0.3) - callback() - end) - end + local contentPane = self._root_view:GetChild("contentPane") + if self._anim_pop == 1 then + contentPane:GetTransition("left_pop_back"):Play() + elseif self._anim_pop == 2 then + contentPane:GetTransition("right_pop_back"):Play() + end + if callback then + coroutine.start(function() + coroutine.wait(0.3) + callback() + end) + end end function BaseWindow.DestroyAll() - _destroy_all = true - local list = WindowMap - for i=1,#list do - local win = list[i] - win:Destroy() - end - _destroy_all = false - WindowQueue = {} - WindowMap = {} -end \ No newline at end of file + _destroy_all = true + local list = WindowMap + for i = 1, #list do + local win = list[i] + win:Destroy() + end + _destroy_all = false + WindowQueue = {} + WindowMap = {} +end diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua index 7404acf0..8c711d71 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua @@ -102,12 +102,12 @@ function M:SortPlayList(a, b) if a_play.gameType == b_play.gameType then if a_play.gameId == a_play.gameId then - return a_play.id < b_play.id + return a_play.id > b_play.id else - return a_play.gameId < b_play.gameId + return a_play.gameId > b_play.gameId end else - return a_play.gameType < b_play.gameType + return a_play.gameType > b_play.gameType end end diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 54dbf95a..f48694f7 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -1215,6 +1215,7 @@ function M:InitView(url) 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._view:GetChild('btn_start2'):GetController('isChoose').selectedIndex = 0 self:__startGame("", tonumber(showid), false) end ) @@ -1235,6 +1236,7 @@ function M:InitView(url) 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._view:GetChild('btn_start2'):GetController('isChoose').selectedIndex = 0 self:__startGame("", tonumber(showid), false) end ) diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupMailView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupMailView.lua index 8cf0f7a6..81fe312f 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupMailView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupMailView.lua @@ -6,24 +6,24 @@ local GroupMailView = {} local M = GroupMailView function GroupMailView.new(blur_view, curGroup) - setmetatable(M, {__index = BaseWindow}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) self.class = "GroupMailView" self._close_destroy = true self._blur_view = blur_view self.curGroup = curGroup self.mail_data = {} - self._full = true + -- self._full = true self:init("ui://NewGroup/Win_Mail") self:FillView() return self -end +end function M:FillView() - self.lst_mail = self._view:GetChild("lst_mail") - self.lst_mail:SetVirtual() + self.lst_mail = self._view:GetChild("lst_mail") + self.lst_mail:SetVirtual() self.lst_mail.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) + self:OnRenderItem(index, obj) end self.lst_mail.scrollPane.onPullUpRelease:Set(function() self:GetMailData(#self.mail_data) @@ -33,7 +33,7 @@ function M:FillView() local btn_delete = self._view:GetChild("btn_delete") btn_delete.onClick:Set(function() local msg_tip = MsgWindow.new(self._root_view, "确定要删除所有邮件吗？", MsgWindow.MsgMode.OkAndCancel) - msg_tip.onOk:Add(function() + msg_tip.onOk:Add(function() self:DelAllMail() end) msg_tip:Show() @@ -45,63 +45,64 @@ function M:GetMailData(index) local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GetMailList(self.curGroup.id, DataManager.SelfUser.account_id, index, 20, function(res) ViewUtil.CloseModalWait() - if res.ReturnCode == 0 then - if #res.Data.mail_list > 0 then - list_concat(self.mail_data, res.Data.mail_list) - self.lst_mail.numItems = #self.mail_data - end - else + if res.ReturnCode == 0 then + if #res.Data.mail_list > 0 then + list_concat(self.mail_data, res.Data.mail_list) + self.lst_mail.numItems = #self.mail_data + end + else ViewUtil.ErrorTip(res.ReturnCode, "获取邮件列表失败") - end - end) + end + end) end function M:DelAllMail() - ViewUtil.ShowModalWait(nil) - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_DelAllMail(self.curGroup.id, DataManager.SelfUser.account_id, function(res) + ViewUtil.ShowModalWait(nil) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_DelAllMail(self.curGroup.id, DataManager.SelfUser.account_id, function(res) ViewUtil.CloseModalWait() - if res.ReturnCode == 0 then - self.mail_data = {} - self.lst_mail.numItems = 0 - else + if res.ReturnCode == 0 then + self.mail_data = {} + self.lst_mail.numItems = 0 + else ViewUtil.ErrorTip(res.ReturnCode, "删除邮件失败") - end - end) + end + end) end function M:OnRenderItem(index, obj) - local tex_title = obj:GetChild("tex_title") - local tex_content = obj:GetChild("tex_content") - local data = json.decode(self.mail_data[index + 1]) - ImageLoad.Load(data.headurl, obj:GetChild("btn_head")._iconObject, self.class) - local nick = data.nick - local id = data.mgr_id - local hp = d2ad(data.hp) - if data.type == 1 then - local str_lev = data.lev == 3 and "合伙人" or "管理员" - local act = hp >= 0 and "给您增加了" or "扣除了您" - tex_title.text = "消息内容为:"--string.format("%s(%s) %s%s积分", nick, id, act, math.abs(hp)) - tex_content.text = string.format("%s [color=#08a446]%s[/color](%s) %s[color=#08a446] %s [/color]积分", str_lev, nick, id, act, math.abs(hp)) - else - tex_title.text = "消息内容为:"--string.format("%s(%s) 转账给您%s积分", nick, id, math.abs(hp)) - tex_content.text = string.format("[color=#08a446]%s[/color](%s) 转账给您[color=#08a446] %s [/color]积分", nick, id, math.abs(hp)) - end - obj:GetChild("tex_data").text = os.date("%Y-%m-%d %H:%M", data.time) + local tex_title = obj:GetChild("tex_title") + local tex_content = obj:GetChild("tex_content") + local data = json.decode(self.mail_data[index + 1]) + ImageLoad.Load(data.headurl, obj:GetChild("btn_head")._iconObject, self.class) + local nick = data.nick + local id = data.mgr_id + local hp = d2ad(data.hp) + if data.type == 1 then + local str_lev = data.lev == 3 and "合伙人" or "管理员" + local act = hp >= 0 and "给您增加了" or "扣除了您" + tex_title.text = "消息内容为:" --string.format("%s(%s) %s%s积分", nick, id, act, math.abs(hp)) + tex_content.text = string.format("%s [color=#08a446]%s[/color](%s) %s[color=#08a446] %s [/color]积分", str_lev, + nick, id, act, math.abs(hp)) + else + tex_title.text = "消息内容为:" --string.format("%s(%s) 转账给您%s积分", nick, id, math.abs(hp)) + tex_content.text = string.format("[color=#08a446]%s[/color](%s) 转账给您[color=#08a446] %s [/color]积分", nick, id, + math.abs(hp)) + end + obj:GetChild("tex_data").text = os.date("%Y-%m-%d %H:%M", data.time) 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) + BaseWindow.Destroy(self, remove_map) ImageLoad.Clear(self.class) end -return M \ No newline at end of file +return M diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json index ab35e696..2455e9f8 100644 --- a/wb_new_ui/.objs/fonts.json +++ b/wb_new_ui/.objs/fonts.json @@ -56,3 +56,4 @@ ui://4skil1l6vmtu1l8 ui://4skil1l6piv91ln ui://4skil1l6jsw9117 ui://m7iejg46eany7iev +ui://m7iejg46hz877im7 diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/lumrgj.info b/wb_new_ui/.objs/metas/2d9xdj6z/lumrgj.info index 64568734..82a50b32 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/lumrgj.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/lumrgj.info @@ -1,19 +1,22 @@ { "objectStatus": { - "n103_lumr": { - "hidden": true - }, - "n120_t3ax": { - "hidden": true - }, "n117_xbqu": { "hidden": true }, "n112_ker3": { "hidden": true }, + "n138_m16m": { + "hidden": true + }, "n137_csp4": { "hidden": true + }, + "n120_t3ax": { + "hidden": true + }, + "n103_lumr": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info index c10555a7..4171dcf4 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info +++ b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info @@ -1,13 +1,10 @@ { "objectStatus": { - "n93_t8gf": { + "n87_csp4": { "hidden": true }, "n79_ovii": { "hidden": true - }, - "n87_csp4": { - "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info index d85e1b98..06ae1e3c 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info @@ -1,10 +1,13 @@ { "objectStatus": { + "n69_jd7v": { + "hidden": true + }, "n145_imp5": { "hidden": true }, - "n132_z384": { - "hidden": true + "n46_tqi8": { + "collapsed": true }, "n35_rpaz": { "hidden": true @@ -12,7 +15,7 @@ "n33_rpaz": { "hidden": true }, - "n69_jd7v": { + "n132_z384": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info index c26de666..839671a7 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info @@ -1,8 +1,5 @@ { "objectStatus": { - "n81_jr1l": { - "hidden": true - }, "n80_jr1l": { "hidden": true }, @@ -12,8 +9,14 @@ "n96_imp5": { "hidden": true }, + "n104_nunk": { + "hidden": true + }, "n91_j5s5": { "hidden": true + }, + "n81_jr1l": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info index 23ec9e08..03c87dcb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info @@ -1,8 +1,14 @@ { "objectStatus": { + "n49_jd7v": { + "collapsed": true + }, "n35_rpaz": { "collapsed": true }, + "n45_tqi8": { + "collapsed": true + }, "n33_rpaz": { "collapsed": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info index 8556f7f5..26667d5b 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info @@ -3,14 +3,17 @@ "n86_kwi0": { "hidden": true }, - "n197_imp5": { + "n134_lcv1": { "collapsed": true }, - "n83_kwi0": { + "n197_imp5": { "collapsed": true }, "n157_sbng": { "hidden": true + }, + "n118_l679": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info index 4a17285b..7315c7f1 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info +++ b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info @@ -6,7 +6,10 @@ "n213_yvb2": { "hidden": true }, - "n181_b8zx": { + "n212_yvb2": { + "hidden": true + }, + "n220_yvb2": { "hidden": true }, "n184_b5ny": { @@ -18,7 +21,7 @@ "n214_yvb2": { "hidden": true }, - "n212_yvb2": { + "n181_b8zx": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info b/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info index bb44d701..b757f528 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info @@ -2,6 +2,9 @@ "objectStatus": { "n35_p747": { "hidden": true + }, + "n33_p747": { + "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 ce9da658..04ec7fab 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info @@ -3,12 +3,12 @@ "n118_fcju": { "hidden": true }, - "n104_kwi0": { - "collapsed": true - }, "n115_dfkc": { "hidden": true }, + "n120_t8gf": { + "hidden": true + }, "n108_kwi0": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info index 64925a0e..9cf90f1e 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info @@ -1,8 +1,5 @@ { "objectStatus": { - "n80_7b4q": { - "hidden": true - }, "n82_et16": { "hidden": true }, @@ -12,8 +9,11 @@ "n81_7b4q": { "hidden": true }, - "n75_s9vt": { - "collapsed": true + "n80_7b4q": { + "hidden": true + }, + "n88_vyn3": { + "hidden": true }, "n39_gltd": { "hidden": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info index 667cb6bb..72174507 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info @@ -1,7 +1,7 @@ { "objectStatus": { - "n86_kwi0": { - "hidden": true + "n121_l679": { + "collapsed": true }, "n142_m16m": { "hidden": true @@ -9,11 +9,14 @@ "n115_l679": { "hidden": true }, - "n121_l679": { - "collapsed": true - }, "n122_j120": { "hidden": true + }, + "n123_omkm": { + "hidden": true + }, + "n86_kwi0": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info index 9e26dfee..667057f8 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info +++ b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n33_p747": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/t1hqhy5.info b/wb_new_ui/.objs/metas/m7iejg46/t1hqhy5.info index 3da5c3e9..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/t1hqhy5.info +++ b/wb_new_ui/.objs/metas/m7iejg46/t1hqhy5.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n5_yvb2": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info index dc5fdc09..e6f1e907 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info @@ -2,9 +2,6 @@ "objectStatus": { "n68_tqi8": { "hidden": true - }, - "n83_cvc8": { - "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info b/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info index 97c320ee..04eb3948 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info +++ b/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info @@ -2,6 +2,9 @@ "objectStatus": { "n87_csp4": { "hidden": true + }, + "n79_ovii": { + "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 1fa1ff5e..def0c807 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info @@ -3,12 +3,12 @@ "n69_jd7v": { "hidden": true }, - "n46_tqi8": { - "locked": true - }, "n142_ufim": { "hidden": true }, + "n68_jd7v": { + "collapsed": true + }, "n86_t1hq": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 8d5f41f3..178ada53 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,27 +1,52 @@ { - "libview.firstColumnWidth": 522, + "libview.firstColumnWidth": 428, "libview.iconScale": 0, "doc.openedDocs": [ + "ui://m7iejg46ilon7ias", + "ui://m7iejg4610snh5j", + "ui://m7iejg46ilon7i9l", + "ui://m7iejg46ilon7i9m", + "ui://m7iejg46iaes7idc", + "ui://m7iejg46iaes7idk", + "ui://m7iejg46hwww2f", + "ui://m7iejg46iaes7idb", + "ui://m7iejg46iaes7idj", + "ui://m7iejg46yvb27ik0", + "ui://m7iejg46mpllhuq", + "ui://2zlli80mw9te0", + "ui://0khx14aryvb27i4z", + "ui://0khx14aryvb27i51", + "ui://0khx14are0py2", + "ui://27vd145bl0lz9", "ui://m7iejg46hsbhhjn", - "ui://m7iejg46t1hqhxw", "ui://m7iejg46t1hqhy5", - "ui://m7iejg46kwi0hm5", - "ui://m7iejg46l679hwn", "ui://m7iejg46gojuhh5", - "ui://m7iejg46l679hws" + "ui://m7iejg46jgh8hwv", + "ui://m7iejg46avqi7ijp", + "ui://m7iejg46r0qx7i6v", + "ui://m7iejg46imp57ih3", + "ui://m7iejg46imp57igy", + "ui://m7iejg46ilon7ibl", + "ui://m7iejg46imp57ihp", + "ui://m7iejg46kwi0hma", + "ui://m7iejg46ilon7ia2" ], "auxline1": true, "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46hsbhhjn", + "doc.activeDoc": "ui://m7iejg46hwww2f", "libview.twoColumn": false, "libview.expandedNodes": [ "m7iejg46", "/", "m7iejg46", - "/font/", + "/component/", "m7iejg46", - "/images/" + "/component/Lst_room/", + "m7iejg46", + "/images/", + "m7iejg46", + "/images/room/" ], "snapToGrid": true, "backgroundColor": 6710886, diff --git a/wb_new_ui/assets/Common/Gcm_Window_Full.xml b/wb_new_ui/assets/Common/Gcm_Window_Full.xml index b3268d26..a1028192 100644 --- a/wb_new_ui/assets/Common/Gcm_Window_Full.xml +++ b/wb_new_ui/assets/Common/Gcm_Window_Full.xml @@ -7,7 +7,7 @@ - + diff --git a/wb_new_ui/assets/Lobby/SettingWindow1.xml b/wb_new_ui/assets/Lobby/SettingWindow1.xml index e092b42d..3a5e1324 100644 --- a/wb_new_ui/assets/Lobby/SettingWindow1.xml +++ b/wb_new_ui/assets/Lobby/SettingWindow1.xml @@ -1,10 +1,10 @@ - - - - + +