diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 77e332a8..3fda579d 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -578,7 +578,7 @@ function M:FG_Data_Family_Reflash(evt_data) end function M:OnMemberOut(evt_data) - --[[ + ---[[ print("收到成员退出推送") pt(evt_data) local uid = evt_data.uid @@ -586,8 +586,9 @@ function M:OnMemberOut(evt_data) local group = DataManager.groups:get(groupId) group:delMember(uid) DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyMemberOut, evt_data) - Broadcast.Send(BroadcastEvent.OnMemberChange) - ]] + Broadcast.Send(BroadcastEvent.Reflash) + Broadcast.Send(BroadcastEvent.ReflashMember) + --]] end function M:OnMemberOnline(evt_data) @@ -620,7 +621,7 @@ function M:OnMemberGameState(evt_data) local state = evt_data.playing local group = DataManager.groups:get(self.groupId) - + for _, player in pairs(group.members) do if player.uid == uid then player.playing = state diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua index fda6d0cf..571d2d58 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -68,6 +68,8 @@ function M:initBtn() end function M:FillList(numbers) + pt("lingmeng", numbers) + local fgCtr = ControllerManager.GetController(NewGroupController) self._viewList_allNumbers:SetVirtual() self._viewList_allNumbers.itemRenderer = function(index, obj) diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index dcf88025..58e3a965 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -298,6 +298,8 @@ function M:_evtOnFamilyReflash(...) return end + --新加入的成员没带权限 + arg[1].usersDetail.lev = 3 group:addMember(arg[1].usersDetail) Broadcast.Send(Broadcast.OnMemberChange) @@ -369,10 +371,16 @@ function M:_evtOnFamilyMemberOut(...) if view.class ~= "FamilyMainView" then return end - local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈" - tips = string.format(tips, name, uid, group.name, groupId) - local win = MsgWindow.new(view._view, tips, MsgWindow.MsgMode.OnlyOk) - win:Show() + if uid == DataManager.SelfUser.account_id then + local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈" + tips = string.format(tips, name, uid, group.name, groupId) + local win = MsgWindow.new(view._view, tips, MsgWindow.MsgMode.OnlyOk) + win:Show() + -- view._close_destroy = true + if view._group.id == groupId then + ViewManager.ChangeView(ViewManager.View_Lobby) + end + end end return M diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index c4cf14e5..fcf695b0 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -1132,6 +1132,7 @@ function M:Show() Broadcast.AddListener(BroadcastEvent.OnMemberChange, self.ReflashMember, self) Broadcast.AddListener(BroadcastEvent.OnOutFamily, self.Reflash, self) + self.Reflash() BaseView.Show(self) self:Reflash() diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta index 2480b5be..7444ddbe 100644 --- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta +++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5cfaee0faacae174184e29cd60cbc492 +guid: 93fbe85eee0acec498778b5125cda3e1 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4 + assetBundleName: assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes index da2de359..efedf21d 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png index 848ca295..6f35bf0c 100644 Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes index 7db64e83..5031cbaa 100644 Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png index f77fc323..71ed5525 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png index 10dde1ea..59833451 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png index a9aede41..3e2edf13 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes index 7e9a86f6..9bdf55d1 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes differ