diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 5f3eeafe..2e67ef71 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) @@ -622,7 +623,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 400a98ea..3eeebee0 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -67,6 +67,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 06935891..4e1cd7b0 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -1134,6 +1134,7 @@ function M:Show() Broadcast.AddListener(BroadcastEvent.OnMemberChange, self.ReflashMember, self) Broadcast.AddListener(BroadcastEvent.OnOutFamily, self.Reflash, self) + self.Reflash() BaseView.Show(self) end diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png new file mode 100644 index 00000000..930f5d09 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png differ 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 new file mode 100644 index 00000000..7444ddbe --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 93fbe85eee0acec498778b5125cda3e1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + 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 e7af37a4..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 a52bbdc7..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 a02b181d..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