From 575a3dd3e084d1a638cb3dc697aff7be7de6ae3a Mon Sep 17 00:00:00 2001
From: zhang hongbo <zhanghongbokami@outlook.com>
Date: Fri, 24 Apr 2026 12:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2FriendBubbleItem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yyzl/01Mergeorder/MainMergePanel.prefab |  2 +-
 yyzl/07Friend/FriendBubbleItem.prefab   | 96 +------------------------
 2 files changed, 3 insertions(+), 95 deletions(-)

diff --git a/yyzl/01Mergeorder/MainMergePanel.prefab b/yyzl/01Mergeorder/MainMergePanel.prefab
index e303d789..a8296b21 100644
--- a/yyzl/01Mergeorder/MainMergePanel.prefab
+++ b/yyzl/01Mergeorder/MainMergePanel.prefab
@@ -2351,7 +2351,7 @@ MonoBehaviour:
   order_left_gap: 0
   MergeItemPrefab: {fileID: 2702038070474672571, guid: 0885024ef63c0c3429e1b329c100012f, type: 3}
   MergeOrderItemPrefab: {fileID: 5594218438122169047, guid: e769e16062c2fb0459f1ce5757a4842b, type: 3}
-  FriendBubbleItemPrefab: {fileID: 0}
+  FriendBubbleItemPrefab: {fileID: 905706665625249026, guid: 606d4718177f8da4dacbc3464330ef4d, type: 3}
   ConsumeOrderBoxPosList: []
   MergeBubbleList: []
   FriendBubbleItemList: []
diff --git a/yyzl/07Friend/FriendBubbleItem.prefab b/yyzl/07Friend/FriendBubbleItem.prefab
index cb291869..ef44435e 100644
--- a/yyzl/07Friend/FriendBubbleItem.prefab
+++ b/yyzl/07Friend/FriendBubbleItem.prefab
@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &905706665625249027
 RectTransform:
   m_ObjectHideFlags: 0
@@ -363,7 +363,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -380,97 +380,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &1834356621375620046
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1543676223213552253}
-  - component: {fileID: 1881201411919813257}
-  - component: {fileID: 6918641330328083061}
-  m_Layer: 0
-  m_Name: LuckCatSg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1543676223213552253
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1834356621375620046}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8645994806257029197}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -218}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1881201411919813257
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1834356621375620046}
-  m_CullTransparentMesh: 1
---- !u!114 &6918641330328083061
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1834356621375620046}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  skeletonDataAsset: {fileID: 11400000, guid: 29f19f4795ba30240b5691c8be783331, type: 2}
-  initialSkinName: 
-  initialFlipX: 0
-  initialFlipY: 0
-  startingAnimation: idle
-  startingLoop: 0
-  timeScale: 1
-  freeze: 0
-  updateWhenInvisible: 3
-  unscaledTime: 0
-  allowMultipleCanvasRenderers: 0
-  canvasRenderers: []
-  separatorSlotNames: []
-  enableSeparatorSlots: 0
-  separatorParts: []
-  updateSeparatorPartLocation: 1
-  meshGenerator:
-    settings:
-      useClipping: 1
-      zSpacing: 0
-      pmaVertexColors: 1
-      tintBlack: 0
-      canvasGroupTintBlack: 0
-      calculateTangents: 0
-      addNormals: 0
-      immutableTriangles: 0
 --- !u!1 &3427770371874130298
 GameObject:
   m_ObjectHideFlags: 0
@@ -1069,7 +978,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6939284386561177319}
-  - {fileID: 1543676223213552253}
   - {fileID: 1840694538150846796}
   m_Father: {fileID: 905706665625249027}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}