diff --git a/yyzl/07Friend/FriendPanel.prefab b/yyzl/07Friend/FriendPanel.prefab index 730cc4df..2f21a9a5 100644 --- a/yyzl/07Friend/FriendPanel.prefab +++ b/yyzl/07Friend/FriendPanel.prefab @@ -884,7 +884,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2666940924007011688 RectTransform: m_ObjectHideFlags: 0 @@ -897,7 +897,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 594305027032189711} + - {fileID: 173050070579198881} - {fileID: 4828874773094278500} m_Father: {fileID: 6813024751254691300} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2567,7 +2567,13 @@ MonoBehaviour: border_gap: 0 ImageBg: {fileID: 0} mExchangeSelectSubCardItemID: -1 + FriendRankingItem: {fileID: 6213878041266537888, guid: d92c96505fb4a8841937be83b616c94c, type: 3} + FriendTimelineItem: {fileID: 6213878041266537888, guid: 9fa7f5831aa16de4eaaa4054a0842788, type: 3} + FriendTimelineReplyItem: {fileID: 6213878041266537888, guid: 25c4a46fc3220c34c907b5581ab4ea42, type: 3} + FriendRequestItemPrefab: {fileID: 4783981800041129692, guid: 2e2650659d37ab34fa855296e1804716, type: 3} serialId: 0 + FriendItem: {fileID: 6213878041266537888, guid: f8bcc21fe9ab99042af475fdac64e497, type: 3} + FriendAddTabTitleItem: {fileID: 6448811669534783432, guid: 306f70b034f02584098ad238ee62e585, type: 3} SubCardItemPrefab: {fileID: 2712898073689224614, guid: 256e0e898048b0f4ab12ed8dc1a4beda, type: 3} StopTouch: {fileID: 0} --- !u!1 &1601959359656843793 @@ -2804,81 +2810,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &1765179747859190016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 594305027032189711} - - component: {fileID: 1803880275531644413} - - component: {fileID: 5981890785971551077} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &594305027032189711 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1765179747859190016} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.67, y: 0.67, z: 0.67} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 2666940924007011688} - 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: 2.5} - m_SizeDelta: {x: 752.7623, y: 198} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1803880275531644413 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1765179747859190016} - m_CullTransparentMesh: 1 ---- !u!114 &5981890785971551077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1765179747859190016} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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: [] - m_Sprite: {fileID: 21300000, guid: 42ad0b867ffd54b4fb50ef40c00e6a20, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2054145866060692018 GameObject: m_ObjectHideFlags: 0 @@ -9765,6 +9696,98 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 18363789288cc944c8a340692f2367ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &6344603313303948283 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 173050070579198881} + - component: {fileID: 7922538559717027022} + - component: {fileID: 1114246791023676529} + - component: {fileID: 8252982149468429258} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &173050070579198881 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6344603313303948283} + 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: 2666940924007011688} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 2.9} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7922538559717027022 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6344603313303948283} + m_CullTransparentMesh: 1 +--- !u!114 &1114246791023676529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6344603313303948283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: [] + m_Sprite: {fileID: 21300000, guid: 42ad0b867ffd54b4fb50ef40c00e6a20, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1.5 +--- !u!114 &8252982149468429258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6344603313303948283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44ee9be70023ffb44b3675c769a2a429, type: 3} + m_Name: + m_EditorClassIdentifier: + ColorNoChange: 0 + IsSqueezeDown: 0 + IsEffectOperate: 1 + BindGos: [] --- !u!1 &6374097567763344841 GameObject: m_ObjectHideFlags: 0 diff --git a/yyzl/08Card/FromFriend.prefab b/yyzl/07Friend/FromFriend.prefab similarity index 100% rename from yyzl/08Card/FromFriend.prefab rename to yyzl/07Friend/FromFriend.prefab diff --git a/yyzl/08Card/FromFriend.prefab.meta b/yyzl/07Friend/FromFriend.prefab.meta similarity index 100% rename from yyzl/08Card/FromFriend.prefab.meta rename to yyzl/07Friend/FromFriend.prefab.meta diff --git a/yyzl/07Friend/InvitePanel.prefab b/yyzl/07Friend/InvitePanel.prefab index df3f9918..ef2ca7a0 100644 --- a/yyzl/07Friend/InvitePanel.prefab +++ b/yyzl/07Friend/InvitePanel.prefab @@ -8528,7 +8528,7 @@ GameObject: - component: {fileID: 6870939225701299691} - component: {fileID: 8397318081963117620} m_Layer: 5 - m_Name: arrorS + m_Name: arror m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/yyzl/13PetTreasure/PetTreasurePanel.prefab b/yyzl/13PetTreasure/PetTreasurePanel.prefab index 7b8e21f4..f232a939 100644 --- a/yyzl/13PetTreasure/PetTreasurePanel.prefab +++ b/yyzl/13PetTreasure/PetTreasurePanel.prefab @@ -2491,6 +2491,7 @@ MonoBehaviour: m_EditorClassIdentifier: base_multiple: 0 border_gap: 0 + PetTreasureGameOverFriendGroupHeadItem: {fileID: 2801931945358288209, guid: 4f368eeeb9208e2419e9c665db51e080, type: 3} --- !u!1 &1966620723378853586 GameObject: m_ObjectHideFlags: 0 diff --git a/yyzl/js/GetRewardPanel.prefab b/yyzl/js/GetRewardPanel.prefab index 77c64ec9..fb68b06a 100644 --- a/yyzl/js/GetRewardPanel.prefab +++ b/yyzl/js/GetRewardPanel.prefab @@ -5751,7 +5751,7 @@ MonoBehaviour: border_gap: 0 serialId: 0 NormalTitleSp: {fileID: 21300000, guid: cb0fca081cf1374418c8fadbaab3fb88, type: 3} - FromFriendPrefab: {fileID: 5923741762604467605, guid: 7922c4e9e9d32eb44bb8a92ffa7b351e, type: 3} + FromFriendPrefab: {fileID: 5923741762604467605, guid: bcab32110ce8b9b4dadb1f015f0da54b, type: 3} isOpen: 0 mType: --- !u!1 &724887830256931158