diff --git a/lua_probject/base_project/Game/View/Family/PlayEditView.lua b/lua_probject/base_project/Game/View/Family/PlayEditView.lua index a4e192d3..4e8bf78a 100644 --- a/lua_probject/base_project/Game/View/Family/PlayEditView.lua +++ b/lua_probject/base_project/Game/View/Family/PlayEditView.lua @@ -5,7 +5,8 @@ function PlayEditView.New() setmetatable(PlayEditView, { __index = BaseWindow }) local inst = setmetatable({}, { __index = PlayEditView }) inst._animation = false - inst._full = true + --inst._full = true + inst._scale = true inst._full_offset = false inst._anim_pop = 0 BaseWindow.init(inst, "ui://Family/com_playEdit") diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 5a293c17..854aee2f 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -552,6 +552,12 @@ function M:ConnetFamily(index, groups, isCreate) obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc obj.text = groups[j].name obj.onClick:Add(function() + + if groups[j].id == self._group.id then + ViewUtil.ShowBannerOnScreenCenter("已在家族中") + return + end + self:ConnetFamily(j, DataManager.groups.groupList, false) end) end