From 8396506302362d6c3937a944afacbc0ab4c1025e Mon Sep 17 00:00:00 2001
From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com>
Date: Mon, 7 Jul 2025 21:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E7=82=B9=E5=87=BB=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua_probject/base_project/Game/View/Family/PlayEditView.lua | 3 ++-
 lua_probject/base_project/Game/View/FamilyView.lua          | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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