diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index aee4e55c..5c1ec519 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -41,6 +41,7 @@ function M:FG_GroupList(callback) group.room_num = tem.room_num group.option = tem.option group.show_num = tem.show_num + group.isShow = tem.isShow l_groups:add(group) end end @@ -1264,6 +1265,24 @@ function M:FG_SetBanTable(group_id, member_id, list, del_list, callback) end) end +-- 设置添加&禁止同桌 2025.6.21 +-- 添加同桌时 tableId = -1 table = {} +---@param id 亲友圈id +---@param tableId 同桌id +---@param table 同桌玩家 +function M:FG_SetBanTable1(id, tableId, table, callback) + + local _data = {} + _data.id = id + _data.tableId = tableId + _data.table = table + print("发送同桌协议") + local _client = ControllerManager.GroupClient + _client:send(Protocol.SET_BAN_TABLE, _data, function(res) + callback(res) + end) +end + function M:FG_GetBanTable(group_id, member_id, callback) local _client = ControllerManager.GroupClient local _data = {} @@ -1274,6 +1293,19 @@ function M:FG_GetBanTable(group_id, member_id, callback) end) end +-- 获取禁止同桌 2025.6.21 +---@param group_id 亲友圈id +function M:FG_GetBanTable1(group_id, callback) + + local _data = {} + _data.id = group_id + + local _client = ControllerManager.GroupClient + _client:send(Protocol.GET_BAN_TABLE, _data, function(res) + callback(res) + end) +end + function M:GetAddMember(group_id, member_id, callback) local _client = ControllerManager.GroupClient local _data = {} @@ -1383,13 +1415,21 @@ function M:FG_DelAllMail(group_id, uid, callback) end) end --- 设置成员备注 -function M:FG_SetMemberTag(group_id, uid, score, callback) +-- 设置成员备注 2025.6.21 服务器有id信息不传score，tag = 备注 +---@param group_id 亲友圈id +---@param uid 玩家 +---@param tag 备注 +function M:FG_SetMemberTag(group_id, uid, tag, callback) local _client = ControllerManager.GroupClient local _data = {} + --_data.id = group_id + --_data.tag = uid + --_data.score = 0 + _data.id = group_id - _data.tag = uid - _data.score = score + _data.uid = uid + _data.tag = tag + _client:send(Protocol.WEB_FG_SET_MEMBER_TAG, _data, function(res) callback(res) end) @@ -1526,3 +1566,15 @@ function M:FG_SetFamilyHeartbeat(group_id, playerId, callback) callback(res) end) end + +-- +---@param isShow 1是显示 0是隐藏 +function M:FG_SetGroupShow(isShow, groupId, callback) + local _client = ControllerManager.GroupClient + local _data = {} + _data.isShow = isShow + _data.groupId = groupId + _client:send(Protocol.SHOW_GROUP, _data, function(res) + callback(res) + end) +end diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 6c493690..0e49527f 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -123,6 +123,12 @@ Protocol = { WEB_FG_SET_GROUP_VIP = "group/set_group_vip", -- 禁止同桌 WEB_FG_SET_BAN_TABLE = "group/set_ban_desk", + -- 设置禁止同桌 2025.6.21 新增 + SET_BAN_TABLE = "group/set_ban_deskList", + -- 获取禁止同桌 2025.6.21 新增 + GET_BAN_TABLE = "group/get_ban_desk_list2", + -- 显示%隐藏成员 + SHOW_GROUP = "group/show_group", -- 添加玩家 WEB_FG_INVITE_MEMBER = "group/invite_group_member", --获取添加玩家 diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua index fccb4f7f..691b827b 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -64,6 +64,13 @@ function M:FillList(numbers) obj:GetController('ban').selectedIndex = numbers[i].ban obj:GetChild('name').text = numbers[i].nick obj:GetChild('id').text = string.format("ID:%s", numbers[i].uid) + + if numbers[i].tag == "" then + obj:GetChild("remark").text = "备注：无" + else + obj:GetChild("remark").text = numbers[i].tag + end + ImageLoad.Load(numbers[i].portrait, obj:GetChild('btn_head')._iconObject) obj.onClick:Set(function() diff --git a/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua b/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua index 0e2a0e8d..83fddce4 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua @@ -13,10 +13,23 @@ local function ShowMainView() root.familyType.selectedIndex = rootLastIndex or 1 end +local function DelPlayer() + +end + +local function AddPlayer() + +end + --endregion --- 禁止同桌数据 -BanDesk.BanData = {} +--[[ 禁止同桌数据 +BanDesk.BanData = { + { name = "备注1", players = {{name = "大哥", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}, {name = "大哥2", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}} }, + { name = "备注2", players = {{name = "大哥", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}, {name = "大哥3", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}} }, + { name = "备注3", players = {{name = "大哥", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}, {name = "大哥4", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}} }, + +}]] function BanDesk:TryShow(r) if not self._view then @@ -28,6 +41,11 @@ function BanDesk:TryShow(r) self:Show() end +function BanDesk:Show() + BaseWindow.Show(self) + self:Reflash() +end + function BanDesk:Close() BaseView.Close(self) ShowMainView() @@ -44,37 +62,72 @@ function BanDesk:Init() self:Close() end) + --self.list_banItem_model = {} self.list_banItem.itemRenderer = function(index, obj) - local data = self.BanData[index] + --self.list_banItem_model[index] + + local data = self.BanData[index +1] local tex_name = obj:GetChild("tex_name") local list_BanedPlayers = obj:GetChild("list_BanedPlayers") local btn_del = obj:GetChild("btn_del") - local btn_addBanItem = obj:GetChild("btn_addBanItem") - btn_addBanItem.onClick:Set(function() - local fgCtr = ControllerManager.GetController(NewGroupController) - local groupId = root._group - local userId = DataManager.SelfUser.account_id - local banList = {} - --fgCtr:FG_SetBanTable(groupId, userId, , {},function() - --end) + tex_name.text = data.name + + btn_del.onClick:Set(function() + -- 删除 end) - list_BanedPlayers.itemRenderer = function(i, o) - + list_BanedPlayers.itemRenderer = function(playerIndex, playerObj, index) + local loader_icon = playerObj:GetChild("loader_icon") + local btn_delPlayer = playerObj:GetChild("btn_delPlayer") + local btn_addPlayer = playerObj:GetChild("btn_addPlayer") + local tex_name = playerObj:GetChild("tex_name") + + local player = data.players[playerIndex + 1] + + tex_name.text = player.name + ImageLoad.Load(loader_icon, player.portrait) + end + + list_BanedPlayers.numItems = #data.players + list_BanedPlayers:AddItemFromPool():GetController("cStyle").selectedIndex = 1 end end function BanDesk:Reflash() - -- 最后一个添加ban按钮 - local addBanItem = self.list_banItem:AddItemFromPool() - addBanItem:GetController("cStyle").selectedIndex = 1 - --addBanItem + local fgCtr = ControllerManager.GetController(NewGroupController) + local groupId = root._group.id + + fgCtr:FG_GetBanTable1(groupId,function(res) + pt(res) + self.BanData = res.Data.ban_list + self.list_banItem.numItems = #self.BanData + self:GetBanTableCallback() + end) end +function BanDesk:GetBanTableCallback() + print("BanDesk:GetBanTableCallback") + -- 最后一个添加ban按钮 + local addBanItem = self.list_banItem:AddItemFromPool() + local btn_addBanItem = addBanItem:GetChild("btn_addBanItem") + addBanItem:GetController("cStyle").selectedIndex = 1 + + btn_addBanItem.onClick:Set(function() + local fgCtr = ControllerManager.GetController(NewGroupController) + local groupId = root._group.id + local banList = {} + fgCtr:FG_SetBanTable1(groupId, -1, banList, function(res) + print("收到同桌协议") + pt(res) + end) + end) +end + + return BanDesk \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua new file mode 100644 index 00000000..5e63fc9b --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua @@ -0,0 +1,47 @@ +require 'FairyGUI' + +local FamilyChatRoom = {} + +--[[ +function FamilyChatRoom.New() + --转移进family界面 + --setmetatable(FamilyChatRoom, { __index = BaseWindow }) + --local inst = setmetatable({}, { __index = FamilyChatRoom}) + + inst:Init(com) + + return inst +end +]] + +function FamilyChatRoom:Init(com, root) + --转移进family界面 + --self._full = true + --self._full_offset = false + --self._animation = false + --BaseWindow.init(self, "ui://Family/com_chatRoom") + + self.root = root + self._view = com + + self.list_chat = self._view:GetChild("list_chat") + self.btn_quit = self._view:GetChild("btn_quit") + + self.btn_quit.onClick:Set(function() + self:Close() + end) + + return self +end + +function FamilyChatRoom:Close() + local cChatRoom = self.root._view:GetController("cIsChatRoom") + cChatRoom.selectedIndex = 0 +end + +function FamilyChatRoom:Show() + local cChatRoom = self.root._view:GetController("cIsChatRoom") + cChatRoom.selectedIndex = 1 +end + +return FamilyChatRoom \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua index 6c664a37..d52f657e 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua @@ -50,6 +50,17 @@ function FamilyMyFamily:Refalsh() ImageLoad.Load(family.o_portrait, self.loader_icon) self.cStyle.selectedIndex = family.lev -1 + + -- index = 0 是显示隐藏按钮 + self.showNumber = family.isShow + print("family.isShow",family.isShow) + pt(family) + if self.showNumber == 0 then + self.cDisplayNumber.selectedIndex = 1 + self.tex_fNumber.text = "*" + elseif self.showNumber == 1 then + self.cDisplayNumber.selectedIndex = 0 + end end function FamilyMyFamily:Init() @@ -86,11 +97,14 @@ function FamilyMyFamily:Init() self.btn_quitNotice = self._view:GetChild("btn_quitNotice") self.btn_bgNotice = self._view:GetChild("btn_bgNotice") self.btn_confirmNotice = self._view:GetChild("btn_confirmNotice") + self.btn_hideNumber = self._view:GetChild("btn_hideNumber") + self.btn_showNumber = self._view:GetChild("btn_showNumber") self.input_notice = self._view:GetChild("input_notice") self.cStyle = self._view:GetController("cStyle") self.cWindow = self._view:GetController("cWindow") + self.cDisplayNumber = self._view:GetController("cDisplayNumber") self.btn_playSet.onClick:Set(function() self:Close() @@ -171,6 +185,38 @@ function FamilyMyFamily:Init() ) end) + self.btn_hideNumber.onClick:Set(function() + local family = root._group + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_SetGroupShow(0, family.id, function (res) + print("收到协议M:FG_SetGroupShow") + pt(res) + if res.ReturnCode ~= 0 then + return + end + --self.showNumber = 0 + local family = DataManager.groups.groupMap[self.groupId] + family.isShow = 0 + self:Refalsh() + end) + end) + + self.btn_showNumber.onClick:Set(function() + local family = root._group + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_SetGroupShow(1, family.id, function (res) + print("收到协议M:FG_SetGroupShow") + pt(res) + if res.ReturnCode ~= 0 then + return + end + --self.showNumber = 1 + local family = DataManager.groups.groupMap[self.groupId] + family.isShow = 1 + self:Refalsh() + end) + end) + return self end diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua index 7314e812..d394ba40 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua @@ -19,11 +19,15 @@ function M:init(url, lev, res) local fgCtr = ControllerManager.GetController(NewGroupController) BaseWindow.init(self, url) + print("res.Data.members[1]") + pt(res.Data.members[1]) local info = res.Data.members[1] local flag_assistant = info.lev == 2 and 1 or 0 local flag_band = info.ban local MJScore = info.mj_score local PKScore = info.pk_score + local remark = info.tag + local icon_url = info.portrait self._view:GetChild('name').text = string.format("%s(%s)", info.nick, info.uid) self._view:GetChild('text_allRounds').text = info.total_round @@ -31,6 +35,14 @@ function M:init(url, lev, res) self._view:GetChild('text_score_majiang').text = MJScore self._view:GetChild('text_score_poker').text = PKScore + ImageLoad.Load(icon_url, self._view:GetChild('btn_head'):GetChild('icon')) + + if remark == "" then + self._view:GetChild("tex_remark").text = "备注：无" + else + self._view:GetChild("tex_remark").text = remark + end + self._view:GetController('isAssistant').selectedIndex = info.lev == 1 and 0 or (lev == 2 and 1 or 2) self._view:GetChild('btn_changeTag').onClick:Set(function() diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index c752f8e8..e6e474c8 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -15,6 +15,7 @@ local FamilyBanDesk = import(".Family.FamilyBanDesk") local FamilyMyFamily = import(".Family.FamilyMyFamily") local FamilyRoomCard = import(".Family.FamilyRoomCard") local FamilyMyfamilyList = import(".Family.FamilyMyfamilyList") +local FamilyChatRoom = import(".Family.FamilyChatRoom") --- FamilyView = {} @@ -37,6 +38,9 @@ function M:init(url) BaseView.InitView(self, url) self._full_offset = false local view = self._view + + FamilyChatRoom = FamilyChatRoom:Init(view:GetChild('com_chatRoom'), self) + local fgCtr = ControllerManager.GetController(NewGroupController) self.familyType = view:GetController('familyType') @@ -47,6 +51,7 @@ function M:init(url) self._mgr_ctr = ControllerManager.GetController(GroupMgrController) self.cMyfamilyList = view:GetController("cMyfamilyList") self.btn_quitMyfamilyTab = view:GetChild("btn_quitMyfamilyTab") + self.btn_chatRoom = view:GetChild("btn_chatRoom") self:InitCloseClick() @@ -93,6 +98,12 @@ function M:init(url) self.btn_quitMyfamilyTab.onClick:Set(function() self.cMyfamilyList.selectedIndex = 0 end) + + self.btn_chatRoom.onClick:Set(function() + --local view = FamilyChatRoom.New() + --view:Show() + FamilyChatRoom:Show() + end) end function M:InitCloseClick() diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua index f06080b1..25fdd4c9 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua @@ -42,7 +42,7 @@ function M:init(url, member) ViewUtil.ShowBannerOnScreenCenter("备注成功") --member.score = score self:Destroy() - self.callback(true) + --self.callback(true) end end) end) diff --git a/wb_new_ui/assets/Family/BanDesk/Component/btn_addBanItem.xml b/wb_new_ui/assets/Family/BanDesk/Component/btn_addBanItem.xml index eace45d0..1c9cfe8f 100644 --- a/wb_new_ui/assets/Family/BanDesk/Component/btn_addBanItem.xml +++ b/wb_new_ui/assets/Family/BanDesk/Component/btn_addBanItem.xml @@ -1,10 +1,10 @@ -