diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index 575d578f..ba1f7fae 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -369,7 +369,7 @@ function M:Show() BaseView.Show(self) ViewUtil.PlaySoundBg() UpdateBeat:Add(self.OnUpdate, self) - + self:InitClip() -- 如果在圈子内的房间，显示tip local user = DataManager.SelfUser local tem = user.notices diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 74b98408..76873339 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -691,6 +691,7 @@ local function __fillPlayItem(self, index, item) -- tex_gameName.text = __getLayerName(self, 0) item:GetController('all').selectedIndex = 1 else + item:GetController('all').selectedIndex = 0 pipeijoin.onClick:Add( function() local currentPlayID = self:GetSelectedPlayID() 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 916c69d1..4515c129 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -12,7 +12,8 @@ local GroupMngFagPackView = import('../GroupMngFagPackView') local MngPermission = import('.MngPermission') local GroupMngMemberHpListView = { - numberMap = {} + numberMap = { {}, {} }, + backTable = {} } local M = GroupMngMemberHpListView @@ -26,7 +27,7 @@ function GroupMngMemberHpListView.new(group_id, blur_view) self.curGroup = DataManager.groups:get(self.group_id) self.member_data = {} self.online = 2 - self.stype = 1 + self.stype = 2 self:FillView() return self end @@ -80,6 +81,7 @@ function M:FillView() rtype.onClick:Set(function() self:GetMemberData(0) + self._ctr_search.selectedIndex = 0 --printlog("aaaaaaaa222222222222222222222222222222") end) @@ -96,12 +98,19 @@ function M:FillView() end ) + -- 初始化搜索成员列表 + self.lst_member_find = self._view:GetChild('lst_member_find') + self.lst_member_find:SetVirtual() + self.lst_member_find.itemRenderer = function(index, obj) + self:OnRenderItemFind(index, obj) + end + --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._ctr_search = self._view:GetController('search') self._view:GetChild('btn_search').onClick:Set( function() ViewUtil.ShowModalWait(nil) @@ -127,14 +136,13 @@ function M:FillView() ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') else self._view:GetChild('tex_id').text = '' - ctr_search.selectedIndex = 1 - local item_result = self._view:GetChild('lst_member_find') - item_result:RemoveChildrenToPool() + self._ctr_search.selectedIndex = 1 - for j = 1, #res.Data.members do - local tem = item_result:AddItemFromPool() - self:FillItem(tem, res.Data.members[j], true, j) - end + self.numberMap[2][qid] = res.Data.members + + ViewUtil.CloseModalWait() + table.insert(self.backTable, { 2, qid }) + self.lst_member_find.numItems = #res.Data.members end end, qnick @@ -144,7 +152,16 @@ function M:FillView() local btn_back = self._view:GetChild('btn_back') btn_back.onClick:Set( function() - self.lst_member.numItems = #self.member_data + print("ling btn_back", #self.backTable) + if #self.backTable > 1 then + table.remove(self.backTable) + local tempIndex = self.backTable[#self.backTable] + local tempTable = self.numberMap[tempIndex[1]][tempIndex[2]] + self.lst_member_find.numItems = #tempTable + else + self._ctr_search.selectedIndex = 0 + self.lst_member.numItems = #self.member_data + end end ) @@ -424,51 +441,35 @@ function M:FillItem(obj, member, refresh, index) local superBtn = obj:GetChild('super_btn') -- superBtn.visible = group.lev == 1 - -- obj:GetChild("super_btn").onClick:Set( - -- function() - -- ViewUtil.ShowModalWait(nil) - -- local text = member.uid - -- local qid, qnick - -- if text == "" then - -- ViewUtil.CloseModalWait() - -- ViewUtil.ErrorTip(nil, '输入不能为空') - -- return - -- end - -- qid = tonumber(text) or 0 - -- qnick = tostring(text) - -- local fgCtr = ControllerManager.GetController(NewGroupController) - -- fgCtr:FG_FindMember( - -- self.group_id, - -- qid, - -- function(res) - -- ViewUtil.CloseModalWait() - -- if self._is_destroy then - -- return - -- end - -- if res.ReturnCode ~= 0 then - -- ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') - -- else - -- self._view:GetChild('tex_id').text = '' - -- self._view:GetController('search').selectedIndex = 1 - -- local item_result = self._view:GetChild('lst_member_find') - -- item_result:RemoveChildrenToPool() + local superBtnUp = obj:GetChild('superior_btn_up') + obj:GetChild("superior_btn_up").onClick:Set( + function() + ViewUtil.ShowModalWait(nil) + local text = member.parentId + local tempNumberList = self.numberMap[2][text] + if tempNumberList == nil then + tempNumberList = {} + for j = 1, #self.member_data do + local number = self.member_data[j] + if number.uid == text then + table.insert(tempNumberList, number) + end + end + self.numberMap[2][text] = tempNumberList + end + self._view:GetChild('tex_id').text = '' + self._view:GetController('search').selectedIndex = 1 - -- for j = 1, #res.Data.members do - -- local tem = item_result:AddItemFromPool() - -- self:FillItem(tem, res.Data.members[j], true, j) - -- end - -- end - -- end, - -- qnick, - -- 1 - -- ) - -- end - -- ) + ViewUtil.CloseModalWait() + table.insert(self.backTable, { 2, text }) + self.lst_member_find.numItems = #tempNumberList + end + ) obj:GetChild("super_btn").onClick:Set( function() ViewUtil.ShowModalWait(nil) local text = member.uid - local tempNumberList = self.numberMap[text] + local tempNumberList = self.numberMap[1][text] if tempNumberList == nil then tempNumberList = {} for j = 1, #self.member_data do @@ -477,18 +478,14 @@ function M:FillItem(obj, member, refresh, index) table.insert(tempNumberList, number) end end - self.numberMap[text] = tempNumberList + self.numberMap[1][text] = tempNumberList end self._view:GetChild('tex_id').text = '' self._view:GetController('search').selectedIndex = 1 - local item_result = self._view:GetChild('lst_member_find') - item_result:RemoveChildrenToPool() ViewUtil.CloseModalWait() - for j = 1, #tempNumberList do - local tem = item_result:AddItemFromPool() - self:FillItem(tem, tempNumberList[j], true, j) - end + table.insert(self.backTable, { 1, text }) + self.lst_member_find.numItems = #tempNumberList end ) end @@ -501,6 +498,16 @@ function M:OnRenderItem(index, obj) end end +function M:OnRenderItemFind(index, obj) + --printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww ",index) + local lastKey = self.backTable[#self.backTable] + local tempTable = self.numberMap[lastKey[1]][lastKey[2]] + local member = tempTable[index + 1] + if member then + self:FillItem(obj, member, true, index + 1) + end +end + --获取申请列表 function M:GetJoinsData() local group = DataManager.groups:get(self.group_id) 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 0e86a816..0073812b 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua @@ -323,7 +323,7 @@ function M:FillItem(obj, member, refresh) --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) + obj:GetChild('tex_last_login').text = '加入时间' .. os.date('%Y/%m/%d', member.join_time) end -- end @@ -448,7 +448,7 @@ function M:FillItem(obj, member, refresh) local btnBxx = obj:GetChild('btn_bxx') btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and - not (DataManager.SelfUser.account_id == member.uid) + not (DataManager.SelfUser.account_id == member.uid) --btnBxx.visible = not (DataManager.SelfUser.account_id == member.uid) obj:GetChild('btn_bxx').onClick:Set( function() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/TimeSettingPanelTog.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/TimeSettingPanelTog.lua new file mode 100644 index 00000000..34bd3fc6 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/TimeSettingPanelTog.lua @@ -0,0 +1,123 @@ +-- 选择时间按钮、选择时间界面 +local TimeSettingPanel = {} + +local M = TimeSettingPanel + +function TimeSettingPanel.new(parent, btn_date1, btn_date2, posX, posY, callback, flag) + local self = setmetatable({}, { __index = M }) + self.class = "TimeSettingPanel" + self.parent = parent + self.btn1 = btn_date1 + self.btn2 = btn_date2 + self.posX = posX or 0 + self.posY = posY or 0 + self.callback = callback + self.show_day = flag and 7 or 7 + self:initView() + return self +end + +local function initButton(self, btn_date, today) + btn_date.data = today + btn_date.title = os.date("%Y年%m月%d日", today) + btn_date.onClick:Set(function() + self:ShowSetDatePanel(btn_date) + end) +end + +function M:initView() + 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 }) + initButton(self, self.btn1, today) + initButton(self, self.btn2, today) +end + +function M:GetDate() + local time1 = self.btn1.data + local time2 = self.btn2.data + local begin_time = math.min(time1, time2) + local end_time = math.max(time1, time2) + 86400 + return begin_time, end_time +end + +function M:SetTenDay() + 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 nine_day_ago = today - 86400 * 9 + self.btn1.data = nine_day_ago + self.btn1.title = os.date("%Y年%m月%d日", nine_day_ago) + self.btn2.data = today + self.btn2.title = os.date("%Y年%m月%d日", today) +end + +local max_pos, min_pos = 0.2, 2.2 +-- 添加列表特效：中部的组件放大，两边的渐渐透明 +local function addListEffect(lst) + local mid_y = 0.5 * lst.height + local cnt = lst.numChildren + for i = 0, cnt - 1 do + local item = lst:GetChildAt(i) + local index = lst.scrollPane.percY * (lst.numChildren - 5) + local dist = math.abs(index + 2 - i) -- 距离列表中点的位置 + if dist <= max_pos then + item.alpha = 1 + item:GetChild("title"):SetScale(1, 1) + elseif dist <= min_pos then + local scale = dist / min_pos + item.alpha = 1 - 0.7 * scale + item:GetChild("title"):SetScale(1 - 0.5 * scale, 1 - 0.5 * scale) + else + item.alpha = 0.3 + item:GetChild("title"):SetScale(0.5, 0.5) + end + lst.data = lst:GetChildAt(2).data - math.floor(index + 0.5) * 86400 + end +end +-- 显示日期 +-- +/-2的原因是列表中需要两个看不见的组件 +local function initList(lst, date, show_day) + 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 }) + lst:RemoveChildrenToPool() + local index = -1 + local num = show_day - 1 + for i = 0 - 2, num + 2 do + local item = lst:AddItemFromPool() + if i >= 0 and i <= num then + local time = today - 86400 * i + item.data = time + item.title = os.date("%Y年%m月%d日", time) + if time == date then + index = i + end + else + item.title = " " + end + end + lst.scrollPane.percY = index / num + addListEffect(lst) + lst.scrollPane.onScroll:Add(function() + addListEffect(lst) + end) +end + +-- 显示设置时间面板 +function M:ShowSetDatePanel(btn) + local date = btn.data + local com_set_date = UIPackage.CreateObjectFromURL("ui://NewGroup/com_set_time") + local lst_y = com_set_date:GetChild("lst_year") + initList(lst_y, date, self.show_day) + com_set_date:GetChild("btn_confirm").onClick:Set(function() + local time = os.date("%Y年%m月%d日", lst_y.data) + btn.title = time + btn.data = lst_y.data + com_set_date:Dispose() + if self.callback then self.callback() end + end) + AddPanel(com_set_date) + -- self.parent:AddChild(com_set_date) + -- com_set_date.x = self.posX + -- com_set_date.y = GRoot.inst.height - com_set_date.height - (GRoot.inst.height - self.parent.height) * 0.5 + self.posY +end + +return M diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index 28852ee0..fb5d3952 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -87,13 +87,13 @@ function M:InitPoker(pokerList, isPlayAni, open) -- self.zhizhanmustPutMaxCard=0 -- self.zhizhanplay=0 -- self.zhizhanzdts=0 - local cs = 1.25 + local cs = 1.35 if DataManager.CurrenRoom.cardsize == 0 then - cs = 1.35 + cs = 1.45 elseif DataManager.CurrenRoom.cardsize == 1 then - cs = 1.25 + cs = 1.35 elseif DataManager.CurrenRoom.cardsize == 2 then - cs = 1.15 + cs = 1.25 end if self.cor_init_poker ~= nil then diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info b/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info index a20f97f3..d7433b51 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info @@ -1,11 +1,23 @@ { "objectStatus": { - "n24_cvc8": { + "n8_nlwc": { + "hidden": true + }, + "n14_mkh9": { "hidden": true }, "n26_ht5v": { "hidden": true }, + "n24_cvc8": { + "hidden": true + }, + "n6_nlwc": { + "hidden": true + }, + "n13_mkh9": { + "hidden": true + }, "n9_bqt1": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/9n9stu2e/jdf3hy.info b/wb_new_ui/.objs/metas/9n9stu2e/jdf3hy.info new file mode 100644 index 00000000..74534a65 --- /dev/null +++ b/wb_new_ui/.objs/metas/9n9stu2e/jdf3hy.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n6_rfcn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/9n9stu2e/prgz88.info b/wb_new_ui/.objs/metas/9n9stu2e/prgz88.info index 774b3d4a..794f6bdd 100644 --- a/wb_new_ui/.objs/metas/9n9stu2e/prgz88.info +++ b/wb_new_ui/.objs/metas/9n9stu2e/prgz88.info @@ -6,15 +6,15 @@ "n56_dg1i": { "hidden": true }, + "n63_i3h6": { + "collapsed": true + }, "n53_g618": { "hidden": true }, "n57_pgkj": { "hidden": true }, - "n51_g618": { - "collapsed": true - }, "n61_agiz": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/9n9stu2e/prgzab.info b/wb_new_ui/.objs/metas/9n9stu2e/prgzab.info index 1c90b46b..cff97378 100644 --- a/wb_new_ui/.objs/metas/9n9stu2e/prgzab.info +++ b/wb_new_ui/.objs/metas/9n9stu2e/prgzab.info @@ -3,9 +3,6 @@ "n8": { "hidden": true }, - "n33_e7qn": { - "collapsed": true - }, "n41_i3h6": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 7e0bf609..58466713 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -1,41 +1,53 @@ { "objectStatus": { - "n204_jvvo": { + "n154_cioe": { + "hidden": true + }, + "n45_l0s4": { + "locked": true + }, + "n214_ovii": { "hidden": true }, "n233_o6b1": { "hidden": true }, - "n214_ovii": { - "hidden": true - }, - "n74_i7lq": { - "locked": true - }, - "n229_csp4": { + "n204_jvvo": { "hidden": true }, "n153_cioe": { "hidden": true }, - "n228_csp4": { - "hidden": true - }, "n175_mn85": { "collapsed": true }, - "n236_o6b1": { - "hidden": true, - "collapsed": true + "n74_i7lq": { + "locked": true }, - "n154_cioe": { + "n243_n6w8": { "hidden": true }, "n171_mpll": { "hidden": true }, + "n236_o6b1": { + "hidden": true, + "collapsed": true + }, + "n228_csp4": { + "hidden": true + }, + "n240_n6w8": { + "hidden": true + }, + "n229_csp4": { + "hidden": true + }, "n216_ovii": { "hidden": true + }, + "n241_n6w8": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info index dc5b38de..ab040c86 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info @@ -2,9 +2,6 @@ "objectStatus": { "n44_rpaz": { "collapsed": true - }, - "n26_kwi0": { - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info new file mode 100644 index 00000000..3c437259 --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n108_go7q": { + "hidden": true + }, + "n107_go7q": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8r.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8r.info new file mode 100644 index 00000000..74534a65 --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8r.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n6_rfcn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Clock.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Clock.xml index f9e81426..d2234c84 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Clock.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Clock.xml @@ -1,9 +1,11 @@ - - - + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml index 0ba373b5..afad74ce 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml @@ -2,11 +2,11 @@ - + - - + + @@ -33,12 +33,12 @@ - - + + - - + + @@ -46,16 +46,16 @@ - + - + - + - +