diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index e6e8e495..cbe14b3d 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -22,6 +22,7 @@ GroupMgrEvent = { OnFamilyReflash = "OnFamilyReflash", OnFamilyRoomReflash = "OnFamilyRoomReflash", OnFamilyMemberOut = "OnFamilyMemberOut", + OnRefNumberBan = "OnRefNumberBan" } GroupMgrController = { @@ -65,6 +66,7 @@ function GroupMgrController.new() self._eventmap[Protocol.WEB_FG_REFLASH] = self.FG_Data_Family_Reflash self._eventmap[Protocol.WEB_FG_MEMBER_OUT] = self.OnMemberOut self._eventmap[Protocol.WEB_FG_MEMBER_ONLINE] = self.OnMemberOnline + self._eventmap[Protocol.FGMGR_EVT_Ref_NumberBan] = self.OnRefNumberBan -- self:connect(callback) return self end @@ -86,7 +88,6 @@ end ----------------------请求------------------------------------ function M:connect(host, groupId, callback) - if self.connecting then self:disconnect() end @@ -494,7 +495,7 @@ function M:FG_Data_ChatRoom(evt_data) if evt_data.getData then local group = DataManager.groups:get(evt_data.groupId) - for _,recode in pairs(evt_data.records) do + for _, recode in pairs(evt_data.records) do recode.players = json.decode(recode.totalScore) recode.maxRound = json.decode(recode.hpData).maxRound recode.pid = recode.groupPid @@ -604,6 +605,16 @@ function M:OnMemberOnline(evt_data) DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data) end +function M:OnRefNumberBan(evt_data) + local tem = {} + tem.uid = evt_data.tagId + tem.ban = evt_data.ban + + local group = DataManager.groups:get(self.groupId) + group:addMember(tem) + DispatchEvent(self._dispatcher, GroupMgrEvent.OnRefNumberBan, evt_data) +end + function M:PopEvent() local _cacheEvent = self._cacheEvent if (_cacheEvent:Count() > 0) then diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 5f96afa5..2ca65f07 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -278,9 +278,9 @@ Protocol = { -- 亲友圈房卡充值 WEB_FG_RECHARGE_DIAMO = "group/recharge_diamo", -- 进入亲友圈 - WEB_FG_GET_ONLINE_MEMBER = "13005", --"get_online_member", + WEB_FG_GET_ONLINE_MEMBER = "13005", --"get_online_member", -- 退出亲友圈 - WEB_FG_GET_OFFLINE_MEMBER = "13006", --"get_offline_member", + WEB_FG_GET_OFFLINE_MEMBER = "13006", --"get_offline_member", -- 家族界面刷新推送 WEB_FG_REFLASH = "11111", @@ -297,7 +297,7 @@ Protocol = { WEB_FG_get_online_member = "group/get_online_member", -- 获取某个家族的详细信息 - WEB_FG_GET_GROUP_DETAIL = "group/get_groupDetail", + WEB_FG_GET_GROUP_DETAIL = "group/get_groupDetail", -------------- group-log--------------------- -- 获取奖励日志 WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", @@ -424,6 +424,8 @@ Protocol = { FGMGR_EVT_Update_Assistant = "update_assistant", -- 助理刷新界面推送 FGMGR_EVT_Push_Assistant = "push_assistant", + -- 刷新成员列表 + FGMGR_EVT_Ref_NumberBan = "13010", --end::::::::::::::牌友圈协议:::::::::::::::::::: -------------------Game ---------------------------- diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua index f5100dcf..400a98ea 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -8,7 +8,7 @@ function FamilyInviteFamilyView.new() setmetatable(M, { __index = BaseView }) local self = setmetatable({}, { __index = M }) self.class = "com_numberList" - BaseView.InitView(self ,"ui://Family/com_numberList") + BaseView.InitView(self, "ui://Family/com_numberList") self:initBtn() return self end @@ -36,7 +36,8 @@ end function M:Show(group) self:Reflash(group) - + local _mgr_ctr = ControllerManager.GetController(GroupMgrController) + _mgr_ctr:AddEventListener("OnRefNumberBan", handler(self, self.RefrenMemberCallback)) BaseView.Show(self) end @@ -111,6 +112,7 @@ function M:TickNumberCallback(res) end function M:RefrenMemberCallback() + print("lingmeng OnRefNumberBan") local numbers = self._group.members local fgCtr = ControllerManager.GetController(NewGroupController) if #numbers == 0 then @@ -129,4 +131,10 @@ function M:RefrenMemberCallback() end end +function M:Destroy() + local _mgr_ctr = ControllerManager.GetController(GroupMgrController) + _mgr_ctr:RemoveListener("OnRefNumberBan") + BaseView.Destroy(self) +end + return M