Merge remote-tracking branch 'origin/master' into lps/8.6M

# Conflicts:
#	wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta
#	wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
#	wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png
#	wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes

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

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)

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

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()

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: