diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index 23eb25e7..eb974844 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -448,7 +448,7 @@ function M:InitClip() local taohua = self._view:GetChild('clip_bg') local taohuaIndex = 0 - local renwuEnd = 143 + local renwuEnd = 142 local renwuName = "ui://Lobby/renwu-AE_00" local renwu = self._view:GetChild('clip_renwu') local renwuIndex = 0 @@ -458,7 +458,7 @@ function M:InitClip() local puke = self._view:GetChild('btn_ChuangJian') local pukeIndex = 0 - local jiangbeiEnd = 149 + local jiangbeiEnd = 180 local jiangbeiName = "ui://Lobby/jiangbei_00" local jiangbei = self._view:GetChild('btn_more_group') local jiangbeiIndex = 0 @@ -471,11 +471,11 @@ function M:InitClip() coroutine.start( function() while true do - -- taohuaIndex = self:ReplaceClip1(taohuaEnd, taohua, taohuaIndex, taohuaName) + taohuaIndex = self:ReplaceClip1(taohuaEnd, taohua, taohuaIndex, taohuaName) renwuIndex = self:ReplaceClip1(renwuEnd, renwu, renwuIndex, renwuName) - -- pukeIndex = self:ReplaceClip2(pukeEnd, puke, pukeIndex, pukeName) - -- jiangbeiIndex = self:ReplaceClip2(jiangbeiEnd, jiangbei, jiangbeiIndex, jiangbeiName) - -- hechengIndex = self:ReplaceClip2(hechengEnd, hecheng, hechengIndex, hechengName) + pukeIndex = self:ReplaceClip2(pukeEnd, puke, pukeIndex, pukeName) + jiangbeiIndex = self:ReplaceClip2(jiangbeiEnd, jiangbei, jiangbeiIndex, jiangbeiName) + hechengIndex = self:ReplaceClip2(hechengEnd, hecheng, hechengIndex, hechengName) coroutine.wait(0.060) end end @@ -495,5 +495,5 @@ function M:ReplaceClip2(e, t, i, n) i = 0 end t.icon = string.format("%s%03d", n, i) - return i + 1 + return i + 2 end diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua index 0f419dea..4ee53ab7 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua @@ -147,10 +147,10 @@ function M:init(url, btn_type) anchor:AddChild(tem._view) -- tem._view.parent = anchor - local offset = get_offset(self._full_offset) - tem._view.width = GRoot.inst.width - 2 * offset - page_info.anchorOffset - tem._view.height = GRoot.inst.height - tem._view.x = 0 --offset + -- local offset = get_offset(self._full_offset) + -- tem._view.width = GRoot.inst.width - 2 * offset - page_info.anchorOffset + -- tem._view.height = GRoot.inst.height + -- tem._view.x = 0 --offset --tem._view:AddRelation(self._root_view, RelationType.Size) -- tem._view:MakeFullScreen() 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 f0de9f91..916c69d1 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -423,7 +423,7 @@ function M:FillItem(obj, member, refresh, index) ) local superBtn = obj:GetChild('super_btn') - superBtn.visible = group.lev == 1 + -- superBtn.visible = group.lev == 1 -- obj:GetChild("super_btn").onClick:Set( -- function() -- ViewUtil.ShowModalWait(nil) 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 1474a2a8..0e86a816 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua @@ -4,7 +4,7 @@ local GroupMemberFagLogView = import('.GroupMemberFagLogView') local GroupSetPermissionView = import('.GroupSetPermissionView') local GroupBanSameTableView = import('.GroupBanSameTableView') local GroupMemberOperateView = import('.GroupMemberOperateView') -local GroupAddMemberInfoView=import('.GroupAddMemberInfoView') +local GroupAddMemberInfoView = import('.GroupAddMemberInfoView') local GroupStatMember = import('.GroupStatMember') local GroupMngFagPackView = import('../GroupMngFagPackView') @@ -64,16 +64,15 @@ function M:FillView() local rtype = self._view:GetChild("n132") rtype.visible = false - rtype.onChanged:Set(function () + rtype.onChanged:Set(function() if tostring(self.online) == rtype.value then return end self.online = tonumber(rtype.value) self:GetMemberData(0) --printlog("aaaaaaaa222222222222222222222222222222") - end) - + -- 初始化成员列表 self.lst_member = self._view:GetChild('lst_member') self.lst_member:SetVirtual() @@ -86,11 +85,11 @@ function M:FillView() self:GetMemberData(self.lst_member.numItems) end ) - - --local n50=self._view:GetChild('n50') - --print(n50) - --n50.displayObject.gameObject.transform.localPosition.x=214 - --print(n50.displayObject.gameObject.transform.localPosition.x) + + --local n50=self._view:GetChild('n50') + --print(n50) + --n50.displayObject.gameObject.transform.localPosition.x=214 + --print(n50.displayObject.gameObject.transform.localPosition.x) -- 搜索玩家 local ctr_search = self._view:GetController('search') self._view:GetChild('btn_search').onClick:Set( @@ -123,8 +122,8 @@ function M:FillView() item_result:RemoveChildrenToPool() for j = 1, #res.Data.members do - local tem = item_result:AddItemFromPool() - self:FillItem(tem, res.Data.members[j], true) + local tem = item_result:AddItemFromPool() + self:FillItem(tem, res.Data.members[j], true) end end end, @@ -167,11 +166,11 @@ function M:FillView() self.group_id, tonumber(self._texnum_str), function(response) - printlog("响应获取添加玩家==》》》") - pt(response) + printlog("响应获取添加玩家==》》》") + pt(response) ViewUtil.CloseModalWait() if (response.ReturnCode and response.ReturnCode == 0) then - GroupAddMemberInfoView.new(self.group_id,tonumber(self._texnum_str)):SetAddMember(response.Data) + GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data) self:ClearNumTex() --ViewUtil.ShowBannerOnScreenCenter('添加成功!', 1) else @@ -195,18 +194,15 @@ function M:FillView() --ctr_page.selectedIndex = 1 --self.stype = 2 end - - + + --self._view:GetChild("n50").selected = true ctr_page.onChanged:Set( function() - self.stype = ctr_page.selectedIndex + 1 self:initData() end ) - - end -- 快速访问 @@ -217,8 +213,8 @@ end -- 获取成员数据 function M:GetMemberData(index) - --print("11111111111111111111") - --print(debug.traceback()) + --print("11111111111111111111") + --print(debug.traceback()) -- local iClear = false -- local rtype = self._view:GetChild("n132").value -- if tostring(self.online) ~= rtype then @@ -258,32 +254,32 @@ end local function __change_fag(gid, pid, is_add, cur_hp, callback) local gniv = GroupNumberInputView.new( - nil, - function(num) - num = ad2d((is_add and num or -num)) - ViewUtil.ShowModalWait() - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_ChangeFag( - gid, - pid, - num, - function(res1) - ViewUtil.CloseModalWait() - -- if gniv._is_destroy then - -- return - -- end - if (res1.ReturnCode == 0) then - callback(res1.Data) - else - ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败!') + nil, + function(num) + num = ad2d((is_add and num or -num)) + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_ChangeFag( + gid, + pid, + num, + function(res1) + ViewUtil.CloseModalWait() + -- if gniv._is_destroy then + -- return + -- end + if (res1.ReturnCode == 0) then + callback(res1.Data) + else + ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败!') + end end - end - ) - -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str - end, - is_add and 1 or 2, - cur_hp and d2ad(cur_hp) or nil - ) + ) + -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str + end, + is_add and 1 or 2, + cur_hp and d2ad(cur_hp) or nil + ) gniv:Show() end @@ -296,7 +292,7 @@ function M:FillItem(obj, member, refresh) -- obj.data = member.id -- 显示玩家标签,合伙人、管理员 local ctr_type = obj:GetController('type') - + if member.lev < 3 then ctr_type.selectedIndex = member.lev elseif member.partnerLev ~= 0 then @@ -313,36 +309,36 @@ function M:FillItem(obj, member, refresh) --obj:GetChild("tex_cost_count").text = d2ad(member.last_hp_cost) --if member.online == 1 then - -- obj:GetChild('tex_last_login').text = '在线' - -- else - if member.last_time ~= 0 then - -- local now_time = os.date("*t",now) - -- local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0}) - -- local cha = math.ceil((today - member.last_time) / (24 * 60 *60)) - -- if (cha > 0) then - -- obj:GetChild('tex_last_login').text = cha.."天前" --'最近登录\n' .. os.date('%Y/%m/%d', member.last_time) - -- else - -- obj:GetChild('tex_last_login').text = os.date('%Y/%m/%d', member.last_time) - -- end - --print("11111aaaaaaaaaaaaaaaaaaaa ",os.date('%Y/%m/%d', member.last_time)) - obj:GetChild('tex_last_login').text = "最近登录:"..os.date('%Y/%m/%d', member.last_time) - else - obj:GetChild('tex_last_login').text = '加入时间\n' .. os.date('%Y/%m/%d', member.join_time) - end - -- end - - + -- obj:GetChild('tex_last_login').text = '在线' + -- else + if member.last_time ~= 0 then + -- local now_time = os.date("*t",now) + -- local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0}) + -- local cha = math.ceil((today - member.last_time) / (24 * 60 *60)) + -- if (cha > 0) then + -- obj:GetChild('tex_last_login').text = cha.."天前" --'最近登录\n' .. os.date('%Y/%m/%d', member.last_time) + -- else + -- obj:GetChild('tex_last_login').text = os.date('%Y/%m/%d', member.last_time) + -- end + --print("11111aaaaaaaaaaaaaaaaaaaa ",os.date('%Y/%m/%d', member.last_time)) + obj:GetChild('tex_last_login').text = "最近登录:" .. os.date('%Y/%m/%d', member.last_time) + else + obj:GetChild('tex_last_login').text = '加入时间\n' .. os.date('%Y/%m/%d', member.join_time) + end + -- end + + obj:GetChild('tex_zongchangci').text = member.total_round obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time) - - --上级 - obj:GetChild('tex_shangjiName').text=member.parentId_nick or "" - if member.parentId==0 then - obj:GetChild('tex_shangjiID').text="" - else - obj:GetChild('tex_shangjiID').text=member.parentId - end - + + --上级 + obj:GetChild('tex_shangjiName').text = member.parentId_nick or "" + if member.parentId == 0 then + obj:GetChild('tex_shangjiID').text = "" + else + obj:GetChild('tex_shangjiID').text = member.parentId + end + local perm_array = MngPermission.getPermData(group.permission) -- 体力值操作按钮事件 @@ -427,40 +423,41 @@ function M:FillItem(obj, member, refresh) function() local mflv = GroupMemberOperateView.new( - self.group_id, - member, - function(delete) - if delete ~= nil and delete == true then - local group = DataManager.groups:get(self.group_id) - self.member_data = group.members - self.lst_member.numItems = #self.member_data - self._view:GetController('search').selectedIndex = 0 - else - self.lst_member.numItems = self.lst_member.numItems - if refresh then - self:FillItem(obj, member) + self.group_id, + member, + function(delete) + if delete ~= nil and delete == true then + local group = DataManager.groups:get(self.group_id) + self.member_data = group.members + self.lst_member.numItems = #self.member_data + self._view:GetController('search').selectedIndex = 0 + else + self.lst_member.numItems = self.lst_member.numItems + if refresh then + self:FillItem(obj, member) + end end + end, + function() + self:GetMemberData(0) end - end, - function() - self:GetMemberData(0) - end - ) + ) mflv:Show() end ) local btnBxx = obj:GetChild('btn_bxx') - btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and not (DataManager.SelfUser.account_id == member.uid) + btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and + not (DataManager.SelfUser.account_id == member.uid) --btnBxx.visible = not (DataManager.SelfUser.account_id == member.uid) obj:GetChild('btn_bxx').onClick:Set( function() - local ctrNum=1 + local ctrNum = 1 -- if not (member.lev == 3 and member.partnerLev == 0) then -- ctrNum = 2 -- end - ctrNum=2 - local gmv = GroupMngFagPackView.new(self.curGroup.id, self._root_view,ctrNum,member.uid) + ctrNum = 2 + local gmv = GroupMngFagPackView.new(self.curGroup.id, self._root_view, ctrNum, member.uid) gmv:SetCallback( function() btnBxx.selected = false @@ -471,7 +468,7 @@ function M:FillItem(obj, member, refresh) ) local superBtn = obj:GetChild('super_btn') - superBtn.visible = group.lev == 1 + -- superBtn.visible = group.lev == 1 obj:GetChild("super_btn").onClick:Set( function() ViewUtil.ShowModalWait(nil) @@ -502,8 +499,8 @@ function M:FillItem(obj, member, refresh) item_result:RemoveChildrenToPool() for j = 1, #res.Data.members do - local tem = item_result:AddItemFromPool() - self:FillItem(tem, res.Data.members[j], true) + local tem = item_result:AddItemFromPool() + self:FillItem(tem, res.Data.members[j], true) end end end, diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info index 1bc7c77d..2982f257 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info @@ -21,6 +21,9 @@ "n140_csp4": { "hidden": true }, + "n108_ker3": { + "hidden": true + }, "n50_lwcl": { "hidden": true }, @@ -30,9 +33,15 @@ "n100_lumr": { "hidden": true }, + "n138_csp4": { + "hidden": true + }, "n49_lwcl": { "hidden": true }, + "n110_ker3": { + "hidden": true + }, "n119_g8kk": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info index 79530278..63e79497 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info +++ b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info @@ -9,10 +9,10 @@ "n78_nk4v": { "hidden": true }, - "n111_myu9": { + "n98_yetw": { "hidden": true }, - "n98_yetw": { + "n108_sbng": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info b/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info index d844b294..e5ec0083 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info +++ b/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info @@ -1,9 +1,4 @@ { - "objectStatus": { - "n44_myu9": { - "hidden": true - } - }, "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/iaes7idj.info b/wb_new_ui/.objs/metas/m7iejg46/iaes7idj.info new file mode 100644 index 00000000..a8b21149 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/iaes7idj.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n12_n96g": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/iaes7idk.info b/wb_new_ui/.objs/metas/m7iejg46/iaes7idk.info new file mode 100644 index 00000000..a8b21149 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/iaes7idk.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n12_n96g": { + "hidden": true + } + } +} \ 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 9e26dfee..dc5fdc09 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info @@ -1 +1,10 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n68_tqi8": { + "hidden": true + }, + "n83_cvc8": { + "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 1a5adc8c..6a79376a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info @@ -15,9 +15,6 @@ "n35_rpaz": { "hidden": true }, - "n89_t1hq": { - "collapsed": true - }, "n88_t1hq": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info index 0f129b89..90c959bb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info @@ -6,9 +6,6 @@ "n57_ocx0": { "hidden": true }, - "n26_kwi0": { - "collapsed": true - }, "n44_rpaz": { "collapsed": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info index f0ac32ee..5765b7a7 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info @@ -1,18 +1,21 @@ { "objectStatus": { + "n130_yre9": { + "hidden": true + }, "n79_nk4v": { "hidden": true }, + "n13_gls1": { + "hidden": true + }, "n78_nk4v": { "hidden": true }, "n73_cioe": { "hidden": true }, - "n13_gls1": { - "hidden": true - }, - "n130_yre9": { + "n20_gls1": { "hidden": true } } diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml index d3a50aa7..060a4fa7 100644 --- a/wb_new_ui/assets/Hotupdate/Version.xml +++ b/wb_new_ui/assets/Hotupdate/Version.xml @@ -2,7 +2,7 @@ - + @@ -11,11 +11,14 @@ - - - + + + - + + + + diff --git a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml index bc9ddfc4..c645b00b 100644 --- a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml +++ b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml @@ -1,10 +1,10 @@ - + - + - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Hotupdate/denglu_bg_01.png b/wb_new_ui/assets/Hotupdate/denglu_bg_01.png index bc426a9d..c30aa7c0 100644 Binary files a/wb_new_ui/assets/Hotupdate/denglu_bg_01.png and b/wb_new_ui/assets/Hotupdate/denglu_bg_01.png differ diff --git a/wb_new_ui/assets/Hotupdate/images/Ellipse 91.png b/wb_new_ui/assets/Hotupdate/images/Ellipse 91.png new file mode 100644 index 00000000..7047fb3d Binary files /dev/null and b/wb_new_ui/assets/Hotupdate/images/Ellipse 91.png differ diff --git a/wb_new_ui/assets/Hotupdate/images/Union.png b/wb_new_ui/assets/Hotupdate/images/Union.png new file mode 100644 index 00000000..2735a36e Binary files /dev/null and b/wb_new_ui/assets/Hotupdate/images/Union.png differ diff --git a/wb_new_ui/assets/Hotupdate/package.xml b/wb_new_ui/assets/Hotupdate/package.xml index c72ed12b..908fd5e4 100644 --- a/wb_new_ui/assets/Hotupdate/package.xml +++ b/wb_new_ui/assets/Hotupdate/package.xml @@ -21,6 +21,8 @@ + + diff --git a/wb_new_ui/assets/Lobby/Main.xml b/wb_new_ui/assets/Lobby/Main.xml index 08a7a706..343a3bbc 100644 --- a/wb_new_ui/assets/Lobby/Main.xml +++ b/wb_new_ui/assets/Lobby/Main.xml @@ -10,43 +10,63 @@ - + - - - - - + + + + + + + - - - + + + + +