diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua index 9d9841c2..7736aacb 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua @@ -204,31 +204,31 @@ function M:init(url) local pic = member.ban == 1 and "mng_del_ban" or "mng_ban" btn_ban.icon = "ui://NewGroup/" .. pic btn_ban.onClick:Set(function() - if not CheckPermission(group.lev, perm_array[MngPermissionList.BanPlaying]) then - return - end + -- if not CheckPermission(group.lev, perm_array[MngPermissionList.BanPlaying]) then + -- return + -- end - local str = member.ban == 1 and "确定恢复娱乐吗?" or "确定禁止娱乐吗?" - local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) - _curren_msg.onOk:Add(function() - ViewUtil.ShowModalWait() - local val = 1 - member.ban - fgCtr:FG_BanMember(self.group_id, member.uid, val, 1, function(res1) - if self._is_destroy then - return - end - ViewUtil.CloseModalWait() - if res1.ReturnCode == 0 then - member.ban = val - pic = member.ban == 1 and "mng_del_ban" or "mng_ban" - btn_ban.icon = "ui://NewGroup/" .. pic - self.callBack() - else - ViewUtil.ErrorTip(res1.ReturnCode,"禁止娱乐失败!") - end - end) - end) - _curren_msg:Show() + -- local str = member.ban == 1 and "确定恢复娱乐吗?" or "确定禁止娱乐吗?" + -- local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) + -- _curren_msg.onOk:Add(function() + -- ViewUtil.ShowModalWait() + -- local val = 1 - member.ban + -- fgCtr:FG_BanMember(self.group_id, member.uid, val, 1, function(res1) + -- if self._is_destroy then + -- return + -- end + -- ViewUtil.CloseModalWait() + -- if res1.ReturnCode == 0 then + -- member.ban = val + -- pic = member.ban == 1 and "mng_del_ban" or "mng_ban" + -- btn_ban.icon = "ui://NewGroup/" .. pic + -- self.callBack() + -- else + -- ViewUtil.ErrorTip(res1.ReturnCode,"禁止娱乐失败!") + -- end + -- end) + -- end) + -- _curren_msg:Show() end) end @@ -247,27 +247,27 @@ function M:init(url) -- end - local str = member.group_ban == 1 and "确定恢复该合伙人整组娱乐吗?" or "确定禁止该合伙人整组娱乐吗?" - local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) - _curren_msg.onOk:Add(function() - ViewUtil.ShowModalWait() - local val = member.group_ban == 1 and 0 or 1 - fgCtr:FG_BanMember(self.group_id, member.uid, val, 2, function(res1) - if self._is_destroy then - return - end - ViewUtil.CloseModalWait() - if res1.ReturnCode == 0 then - member.group_ban = val - pic = member.group_ban == 1 and "mng_del_ban_group" or "mng_ban_group" - btn_ban.icon = "ui://NewGroup/" .. pic - self.callBack() - else - ViewUtil.ErrorTip(res1.ReturnCode,val == 1 and "禁止整组娱乐失败!" or "恢复整组娱乐失败!") - end - end) - end) - _curren_msg:Show() + -- local str = member.group_ban == 1 and "确定恢复该合伙人整组娱乐吗?" or "确定禁止该合伙人整组娱乐吗?" + -- local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) + -- _curren_msg.onOk:Add(function() + -- ViewUtil.ShowModalWait() + -- local val = member.group_ban == 1 and 0 or 1 + -- fgCtr:FG_BanMember(self.group_id, member.uid, val, 2, function(res1) + -- if self._is_destroy then + -- return + -- end + -- ViewUtil.CloseModalWait() + -- if res1.ReturnCode == 0 then + -- member.group_ban = val + -- pic = member.group_ban == 1 and "mng_del_ban_group" or "mng_ban_group" + -- btn_ban.icon = "ui://NewGroup/" .. pic + -- self.callBack() + -- else + -- ViewUtil.ErrorTip(res1.ReturnCode,val == 1 and "禁止整组娱乐失败!" or "恢复整组娱乐失败!") + -- end + -- end) + -- end) + -- _curren_msg:Show() end) -- end end diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua index 58bcf70c..cf19e2cb 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua @@ -2,11 +2,13 @@ local TimeSettingPanel = import(".TimeSettingPanel") local GroupPartnerStatMember = import(".GroupPartnerStatMember") local GroupPartnerStatPlay = import(".GroupPartnerStatPlay") local GroupNumberInputView = import(".GroupNumberInputView") +local GroupSetMemberInfoDiaoduView=import('.GroupSetMemberInfoDiaoduView') -- 开桌统计 local GroupMngPartnerStatView = {} local M = GroupMngPartnerStatView + function GroupMngPartnerStatView.new(gid) local self = M self.class = "GroupMngPartnerStatView" @@ -245,6 +247,28 @@ function M:FillRecordItem(data, obj) gniv:Show() end) + local btn_detail1 = obj:GetChild("btn_detail_zhengzudiaodu") + btn_detail1.onClick:Set(function() + -- local time_type = self._view:GetController("type").selectedIndex + -- --printlog("ccccccccccwwwwwwwwwwwwwwwwwwwwwwwwwwww ",self.begin_time," ",self.end_time) + -- local gniv = GroupPartnerStatMember.new(self.group_id,data.uid, 0,self.begin_time,self.end_time) + -- gniv:Show() + + ViewUtil.ShowModalWait() + ControllerManager.GetController(NewGroupController):FG_GetBanMemberHB(self.group_id, data.uid, function(res) + ViewUtil.CloseModalWait() + --pt(res) + if res.ReturnCode == 0 then + local diaoduView=GroupSetMemberInfoDiaoduView.new(self.group_id, data.uid) + diaoduView:SetCurrentState(res.Data.group_black+1,res.Data) + else + ViewUtil.ErrorTip(res.ReturnCode,"获取整组调度失败!") + end + + end) + + end) + local btnMen = obj:GetChild("btnMen") -- btnMen.text = d2ad(data.autoscore) local menControl = obj:GetController("menkan") diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua index 13271e09..478660f8 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua @@ -189,6 +189,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() diff --git a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua index 2e891831..b1d7feec 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua @@ -187,7 +187,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset - + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() end diff --git a/fk101/lua_probject/extend_project/extend/zipai/runbeard/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/runbeard/main/ZPMainView.lua index c5a2cd0a..2665875f 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/runbeard/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/runbeard/main/ZPMainView.lua @@ -192,7 +192,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset - + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() end diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua index 457b6d5c..567b6046 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua @@ -188,7 +188,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset - + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() end diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua index 707b48db..e4b370c9 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua @@ -188,7 +188,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height - self._xipaiPanel.x = offset + --self._xipaiPanel.x = offset self._xipaiPanel.visible=false --self:PlayXiPai() diff --git a/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua b/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua index b416c7b1..9d86cc0d 100644 --- a/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua +++ b/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua @@ -174,6 +174,7 @@ function M:InitXiPai() self._xipaiPanel.width = GRoot.inst.width - (offset * 2) self._xipaiPanel.height = GRoot.inst.height self._xipaiPanel.x = offset + self._xipaiPanel.y = 414 self._xipaiPanel.visible=false --self:PlayXiPai() diff --git a/fk101/wb_new_ui/.objs/metas/27vd145b/e2q77i64.info b/fk101/wb_new_ui/.objs/metas/27vd145b/e2q77i64.info index 6fb7becb..483bef06 100644 --- a/fk101/wb_new_ui/.objs/metas/27vd145b/e2q77i64.info +++ b/fk101/wb_new_ui/.objs/metas/27vd145b/e2q77i64.info @@ -1,4 +1,12 @@ { - "fitScreen": "FitSize", - "adaptiveTest": true + "objectStatus": { + "n35_k1ss": { + "collapsed": true + }, + "n20_k1ss": { + "collapsed": true + } + }, + "adaptiveTest": true, + "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/27vd145b/hei77i2g.info b/fk101/wb_new_ui/.objs/metas/27vd145b/hei77i2g.info index 79e9da94..3d3f3c20 100644 --- a/fk101/wb_new_ui/.objs/metas/27vd145b/hei77i2g.info +++ b/fk101/wb_new_ui/.objs/metas/27vd145b/hei77i2g.info @@ -5,6 +5,9 @@ }, "n20_k1ss": { "collapsed": true + }, + "n35_k1ss": { + "collapsed": true } }, "adaptiveTest": true, diff --git a/fk101/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info b/fk101/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info index 19cde723..377e1385 100644 --- a/fk101/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info +++ b/fk101/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info @@ -3,6 +3,9 @@ "n87_ni5n": { "hidden": true }, + "n34_hp0b": { + "hidden": true + }, "n50_hkbm": { "hidden": true }, diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info index a79867df..e57075c4 100644 --- a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info @@ -12,5 +12,6 @@ "n29_tjnv": { "hidden": true } - } + }, + "adaptiveTest": true } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info index d055db31..7bb28257 100644 --- a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info @@ -1,13 +1,22 @@ { "objectStatus": { - "n40_ona1": { - "hidden": true + "n79_uwvl": { + "collapsed": true }, "n36_piv9": { "hidden": true }, "n22_xtwh": { "hidden": true + }, + "n40_ona1": { + "hidden": true + }, + "n29_10imx": { + "collapsed": true + }, + "n52_ona1": { + "collapsed": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info index 56d2e4c5..fd649129 100644 --- a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info +++ b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info @@ -39,6 +39,9 @@ "n17_pt1r": { "hidden": true }, + "n70_dunj": { + "collapsed": true + }, "n51_fmkv": { "collapsed": true }, diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info index 6fb7becb..082b0634 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info @@ -1,4 +1,9 @@ { - "fitScreen": "FitSize", - "adaptiveTest": true + "objectStatus": { + "n64_hp03": { + "locked": true + } + }, + "adaptiveTest": true, + "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qvx.info b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qvx.info index 599ad124..9e26dfee 100644 --- a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qvx.info +++ b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qvx.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n45_j34t": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info index e2b7fb11..76f29fd4 100644 --- a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info +++ b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info @@ -1,7 +1,28 @@ { "objectStatus": { - "n74_o49p": { - "collapsed": true + "n34_e7qn": { + "hidden": true + }, + "n80_cbxl": { + "hidden": true + }, + "n8": { + "hidden": true + }, + "n38_e7qn": { + "hidden": true + }, + "n54_nu0l": { + "hidden": true + }, + "n37_e7qn": { + "hidden": true + }, + "n44_oqwm": { + "hidden": true + }, + "n58_fnpw": { + "hidden": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info index ebf7516b..fbacc469 100644 --- a/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info +++ b/fk101/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info @@ -1,16 +1,40 @@ { "objectStatus": { - "n170_o49p": { + "n162_o49p": { + "hidden": true + }, + "n175_fgao": { "hidden": true }, "n35_k3io": { "hidden": true }, - "n154_r1mo": { - "collapsed": true + "n46_u4l2": { + "hidden": true }, "n34_k3io": { "hidden": true + }, + "n163_o49p": { + "hidden": true + }, + "n179_kxwj": { + "hidden": true + }, + "n178_cbxl": { + "hidden": true + }, + "n170_o49p": { + "hidden": true + }, + "n37_kba2": { + "hidden": true + }, + "n31_h1uu": { + "hidden": true + }, + "n174_fgao": { + "hidden": true } }, "adaptiveTest": true, diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index bf1f03a8..aff42a77 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,14 +1,35 @@ { +<<<<<<< HEAD "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ "ui://27vd145bp2bz6s", "ui://27vd145bh1uu30" +======= + "libview.firstColumnWidth": 356, + "libview.iconScale": 0, + "doc.openedDocs": [ + "ui://27vd145bhxjc7i4q", + "ui://kplym8mus9wxa", + "ui://fnuxqeflnrnod", + "ui://c7j2rnvqtpf02f", + "ui://y8prev1ms9wx7", + "ui://3z9lj55vjokmft", + "ui://4skil1l6piv91ny", + "ui://niy3ldiwl9mny", + "ui://niy3ldiwl9mn19", + "ui://9n9stu2eprgzei", + "ui://9n9stu2eprgzef" +>>>>>>> 368adb556d7cebce181e75c91dbfa87ec76419fc ], "auxline1": true, "canvasColor": 10066329, "auxline2": true, +<<<<<<< HEAD "doc.activeDoc": "ui://27vd145bh1uu30", +======= + "doc.activeDoc": "ui://9n9stu2eprgzef", +>>>>>>> 368adb556d7cebce181e75c91dbfa87ec76419fc "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", diff --git a/fk101/wb_new_ui/assets/Chat/Btn_chat.xml b/fk101/wb_new_ui/assets/Chat/Btn_chat.xml index b61f4cad..ef977bf4 100644 --- a/fk101/wb_new_ui/assets/Chat/Btn_chat.xml +++ b/fk101/wb_new_ui/assets/Chat/Btn_chat.xml @@ -1,11 +1,11 @@ - + - + - + -