diff --git a/Art_Atlas/01Mergeorder.spriteatlasv2 b/Art_Atlas/01Mergeorder.spriteatlasv2 index f59bf7ed..2d5ebe67 100644 --- a/Art_Atlas/01Mergeorder.spriteatlasv2 +++ b/Art_Atlas/01Mergeorder.spriteatlasv2 @@ -48,4 +48,5 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: 5288fa3f99c6e81449ab288418f5eec8, type: 3} - {fileID: 21300000, guid: 1fe90947c9cdeb84ea4978ff35a7be73, type: 3} - {fileID: 21300000, guid: 379d9943ef398d24f8a8925568bfce9e, type: 3} + - {fileID: 21300000, guid: 68f58b89f2a00b3409da6148f28e17bf, type: 3} m_IsVariant: 0 diff --git a/Art_Atlas/12PetHome.spriteatlasv2 b/Art_Atlas/12PetHome.spriteatlasv2 index d07a486c..7fe8a2bc 100644 --- a/Art_Atlas/12PetHome.spriteatlasv2 +++ b/Art_Atlas/12PetHome.spriteatlasv2 @@ -24,7 +24,6 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: a289f0a8b0417c94c84950a99178903c, type: 3} - {fileID: 21300000, guid: bcb0d301c9d499646820baa945a16d9d, type: 3} - {fileID: 21300000, guid: be393c73dee1eef4f9086aefdcddc4ea, type: 3} - - {fileID: 21300000, guid: b4ce96680be03084d8d7e78b21c894c2, type: 3} - {fileID: 21300000, guid: f00beb775fef3824a90ae4faa30dfa06, type: 3} - {fileID: 21300000, guid: cc3575b64274a984ca11f4a141038695, type: 3} - {fileID: 21300000, guid: dc51a4348316b6340bc31b8b6db9a935, type: 3} @@ -90,4 +89,19 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: 65f2c2427fdb030418ea74bd7936aaf6, type: 3} - {fileID: 21300000, guid: 9a18f4698618e7a4c87893ca3b87126a, type: 3} - {fileID: 21300000, guid: 1c6cefcd114025047bfec89bcf5d96b9, type: 3} + - {fileID: 21300000, guid: ea82247e019bafb46aa375161da393a9, type: 3} + - {fileID: 21300000, guid: 920e6766eaa3f5543ab715032f12a78c, type: 3} + - {fileID: 21300000, guid: 94ea8e1390c79bc4d9c8bf316830051c, type: 3} + - {fileID: 21300000, guid: 29cf59370b53948458bcb11613611c7d, type: 3} + - {fileID: 21300000, guid: 34050cf3350fcc14890c29c5f336a5af, type: 3} + - {fileID: 21300000, guid: 34bc37f5e0649ac44abf3975464026fb, type: 3} + - {fileID: 21300000, guid: 560537035eea1f54b817f84e7a04b494, type: 3} + - {fileID: 21300000, guid: 1628652827634844580a1750124a8c6b, type: 3} + - {fileID: 21300000, guid: af410b9b2ad2dc041b8dce8fd561895b, type: 3} + - {fileID: 21300000, guid: d5ea2f27a9c967440b67d10f0566d582, type: 3} + - {fileID: 21300000, guid: e5c20bdf1dc83384faaa5476e608b0e2, type: 3} + - {fileID: 21300000, guid: 81446121cf8df5a4f897e0f2bbf63461, type: 3} + - {fileID: 21300000, guid: b5a7aa7bc8ce9584a89a550478eeb55e, type: 3} + - {fileID: 21300000, guid: 3e5706a321372584c96fc774f44a7b21, type: 3} + - {fileID: 21300000, guid: bcac0f2023f8d914eb6f25e1e8354208, type: 3} m_IsVariant: 0 diff --git a/Art_Atlas/19Settings.spriteatlasv2 b/Art_Atlas/19Settings.spriteatlasv2 index a380765e..5ac48b63 100644 --- a/Art_Atlas/19Settings.spriteatlasv2 +++ b/Art_Atlas/19Settings.spriteatlasv2 @@ -22,4 +22,17 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: 3ad856c6d428fe543a04891ca54ef641, type: 3} - {fileID: 21300000, guid: 29888fc76e2bc9f4d8357bab54608a18, type: 3} - {fileID: 21300000, guid: 45d910ec69f6abd41b1de95521391fc7, type: 3} + - {fileID: 21300000, guid: b4108dfba286f0f41bd1823bf95d48d8, type: 3} + - {fileID: 21300000, guid: 6c737af98b9ec654da976ab95e853783, type: 3} + - {fileID: 21300000, guid: 8c7b05266338a03459681cf24ef527e9, type: 3} + - {fileID: 21300000, guid: a91c7eb98415ba54b95eb7134e80bb86, type: 3} + - {fileID: 21300000, guid: f6970d67be5c7794099b5713ddf2cb02, type: 3} + - {fileID: 21300000, guid: 9e17b6258ccbb084e99ba1b80be6887c, type: 3} + - {fileID: 21300000, guid: 3a07d0ca223862d40aa6fc2554496542, type: 3} + - {fileID: 21300000, guid: 40209133dc9dea34b932cc20096a121b, type: 3} + - {fileID: 21300000, guid: 99d1420eecbaec649a72b062426f1b82, type: 3} + - {fileID: 21300000, guid: b4fcf73dcda271140aa24cc51df9f342, type: 3} + - {fileID: 21300000, guid: 21aa8ca0da558b546a19e0536267e139, type: 3} + - {fileID: 21300000, guid: bbc599dc7e36e144ab41bb329e0d1cd9, type: 3} + - {fileID: 21300000, guid: 4c77ebeba2f994349a32f95322b825f4, type: 3} m_IsVariant: 0 diff --git a/Art_Atlas/21Shop.spriteatlasv2 b/Art_Atlas/21Shop.spriteatlasv2 index 1786eef7..7ad3fd05 100644 --- a/Art_Atlas/21Shop.spriteatlasv2 +++ b/Art_Atlas/21Shop.spriteatlasv2 @@ -6,11 +6,18 @@ SpriteAtlasAsset: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: + m_Name: serializedVersion: 2 m_MasterAtlas: {fileID: 0} m_ImporterData: packables: - {fileID: 21300000, guid: 326069d6b58e1b24b839152f9e376fcd, type: 3} - {fileID: 21300000, guid: 1ebd4c9ce8d897a4db5ac2abad99ea4d, type: 3} + - {fileID: 21300000, guid: a7cebee22839401499a61a3a5643572a, type: 3} + - {fileID: 21300000, guid: 1fe0db1b5e168d84281dcae69ab24877, type: 3} + - {fileID: 21300000, guid: 8fda60697a133934dacf1406725bab68, type: 3} + - {fileID: 21300000, guid: 4968bc1ea17218c49938648411746e8e, type: 3} + - {fileID: 21300000, guid: fcb531eb064c1924599f530b8ccfffb1, type: 3} + - {fileID: 21300000, guid: c800dd6a9371534419eca81a79325ec0, type: 3} + - {fileID: 21300000, guid: fa58b2fb4de93c34daaf3da9f17ac5bd, type: 3} m_IsVariant: 0 diff --git a/Art_Atlas/22GiftPack.spriteatlasv2 b/Art_Atlas/22GiftPack.spriteatlasv2 index 7e6f98ec..1b61f32d 100644 --- a/Art_Atlas/22GiftPack.spriteatlasv2 +++ b/Art_Atlas/22GiftPack.spriteatlasv2 @@ -6,7 +6,7 @@ SpriteAtlasAsset: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: + m_Name: serializedVersion: 2 m_MasterAtlas: {fileID: 0} m_ImporterData: @@ -41,4 +41,6 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: 9dd935a2ef18d084bafe46a06de255f4, type: 3} - {fileID: 21300000, guid: 459ee66caae1173419b1f617a3757da2, type: 3} - {fileID: 21300000, guid: 219d5766d171de84e829599dcd1f3955, type: 3} + - {fileID: 21300000, guid: 61892c2702ed3344c8bf9a8a9efba9fd, type: 3} + - {fileID: 21300000, guid: 6c0ab90f1ca1e7a469b2b1ec7e6b561f, type: 3} m_IsVariant: 0 diff --git a/Art_Atlas/AtlasConfig.json b/Art_Atlas/AtlasConfig.json index ea604c2b..b7906865 100644 --- a/Art_Atlas/AtlasConfig.json +++ b/Art_Atlas/AtlasConfig.json @@ -1430,7 +1430,8 @@ "Assets/Art_SubModule/yyzl/01Mergeorder/image/merge_panel_order_mini_purple.png", "Assets/Art_SubModule/yyzl/01Mergeorder/image/merge_panel_order_mini_smwihte.png", "Assets/Art_SubModule/yyzl/01Mergeorder/image/merge_pic_orderplate_playroom 1.png", - "Assets/Art_SubModule/yyzl/01Mergeorder/image/merge_pic_orderplate_Preview.png" + "Assets/Art_SubModule/yyzl/01Mergeorder/image/merge_pic_orderplate_Preview.png", + "Assets/Art_SubModule/yyzl/01Mergeorder/image/com_icn_shop_small.png" ] }, { @@ -1655,7 +1656,6 @@ "Assets/Art_SubModule/yyzl/12PetHome/image/LimitedtimeCWBZ_pic_UIdiban.png", "Assets/Art_SubModule/yyzl/12PetHome/image/pet_lingy_bk1.png", "Assets/Art_SubModule/yyzl/12PetHome/image/pet_lingy_bk2.png", - "Assets/Art_SubModule/yyzl/12PetHome/image/pet_lingy_fh.png", "Assets/Art_SubModule/yyzl/12PetHome/image/pet_lingy_top.png", "Assets/Art_SubModule/yyzl/12PetHome/image/pet_pic_touxiang_wenhao.png", "Assets/Art_SubModule/yyzl/12PetHome/image/pet_pic_xin2.png", @@ -1723,7 +1723,19 @@ "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_huanzhuang_biaoti_maozhua.png", "Assets/Art_SubModule/yyzl/12PetHome/PR_Scene/WashCat/scene1_warm_box.png", "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_zhuangxiu__biaoti_bg.png", - "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_diaodeng.png" + "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_diaodeng.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_bd1.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_bd2.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_bd3.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_dw1.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_fgx01.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_fgx02.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_fh.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_line.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_pd1.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_pd2.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/newPetAdoption/pet_lingy_pd3.png", + "Assets/Art_SubModule/yyzl/12PetHome/image/pet_lingy_Avatarbase.png" ] }, { @@ -1852,7 +1864,20 @@ "Assets/Art_SubModule/yyzl/19Settings/image/set_icon_off.png", "Assets/Art_SubModule/yyzl/19Settings/image/set_icon_sound.png", "Assets/Art_SubModule/yyzl/19Settings/image/set_icon_zhendong.png", - "Assets/Art_SubModule/yyzl/19Settings/image/setting_sub_bg.png" + "Assets/Art_SubModule/yyzl/19Settings/image/setting_sub_bg.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_bd_01.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_bd_02.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_bd_xk.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_bd_xk2.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_bd_xl.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_btn_xk.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_icon_edit.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_icon_music.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_icon_shake.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_icon_sound.png", + "Assets/Art_SubModule/yyzl/19Settings/image/19Settings_jt.png", + "Assets/Art_SubModule/yyzl/19Settings/image/dicord.png", + "Assets/Art_SubModule/yyzl/19Settings/image/set_icon_Discode.png" ] }, { @@ -2180,7 +2205,15 @@ "Assets/Art_SubModule/yyzl/Common/Small/com_icn_flash.png", "Assets/Art_SubModule/yyzl/StockImages/Prop/Other/new_Production_energy_LV1.png", "Assets/Art_SubModule/yyzl/Common/Small/Common_bd_default.png", - "Assets/Art_SubModule/yyzl/Common/Small/Common_bd_selected.png" + "Assets/Art_SubModule/yyzl/Common/Small/Common_bd_selected.png", + "Assets/Art_SubModule/yyzl/Common/Small/collect_btn_1_blue.png", + "Assets/Art_SubModule/yyzl/Common/Small/collect_btn_1_gray.png", + "Assets/Art_SubModule/yyzl/Common/Small/collect_btn_1_green.png", + "Assets/Art_SubModule/yyzl/Common/Small/collect_btn_1_red.png", + "Assets/Art_SubModule/yyzl/Common/Small/collect_btn_1_yellow.png", + "Assets/Art_SubModule/yyzl/Common/Small/collect_btn_2_gray.png", + "Assets/Art_SubModule/yyzl/Common/Small/collect_btn_2_green.png", + "Assets/Art_SubModule/yyzl/Common/Small/common_line_01.png" ] }, { @@ -2212,7 +2245,14 @@ "Name": "21Shop", "SpritePaths": [ "Assets/Art_SubModule/yyzl/21Shop/image/activity_icn_workcd.png", - "Assets/Art_SubModule/yyzl/21Shop/image/shop_pic_guanggaojiangli_hezi.png" + "Assets/Art_SubModule/yyzl/21Shop/image/shop_pic_guanggaojiangli_hezi.png", + "Assets/Art_SubModule/yyzl/21Shop/image/21Shop_banner_02.png", + "Assets/Art_SubModule/yyzl/21Shop/image/21Shop_bk_14.png", + "Assets/Art_SubModule/yyzl/21Shop/image/21Shop_bq_04.png", + "Assets/Art_SubModule/yyzl/21Shop/image/21Shop_dw_01.png", + "Assets/Art_SubModule/yyzl/21Shop/image/21Shop_dw_02.png", + "Assets/Art_SubModule/yyzl/21Shop/image/Common_pic_yindao_workgift_2.png", + "Assets/Art_SubModule/yyzl/21Shop/image/shop_pic_Growth_pass3_big.png" ] }, { @@ -2247,7 +2287,9 @@ "Assets/Art_SubModule/yyzl/22GiftPack/image/merge_pic_huodong_3xuan1_sidai.png", "Assets/Art_SubModule/yyzl/22GiftPack/image/merge_pic_huodong_3xuan1_top1.png", "Assets/Art_SubModule/yyzl/22GiftPack/image/merge_pic_huodong_3xuan1_top2.png", - "Assets/Art_SubModule/yyzl/22GiftPack/image/shop_pic_zhekou2.png" + "Assets/Art_SubModule/yyzl/22GiftPack/image/shop_pic_zhekou2.png", + "Assets/Art_SubModule/yyzl/22GiftPack/image/Giftpack_newplayer1_bg.png", + "Assets/Art_SubModule/yyzl/22GiftPack/image/Giftpack_newplayer2_bg.png" ] }, { diff --git a/Art_Atlas/Common.spriteatlasv2 b/Art_Atlas/Common.spriteatlasv2 index 6e4900cb..1f8886c7 100644 --- a/Art_Atlas/Common.spriteatlasv2 +++ b/Art_Atlas/Common.spriteatlasv2 @@ -190,4 +190,12 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: f0ede3ba985ed0342bb8be5eb8416eed, type: 3} - {fileID: 21300000, guid: bdae942aae4385444a8421ea1e7b5bb3, type: 3} - {fileID: 21300000, guid: 904b96a856e81184d94c9604dc5f3a46, type: 3} + - {fileID: 21300000, guid: f9094e1fffa774f499311fc4d9712f83, type: 3} + - {fileID: 21300000, guid: 112487d2e1ac2034189bf5611193c056, type: 3} + - {fileID: 21300000, guid: 585cb7385bcbec5458c936c082e24f20, type: 3} + - {fileID: 21300000, guid: dd5c89de48c186f4084bd28648d33e27, type: 3} + - {fileID: 21300000, guid: 518fa0b1f3622a8429229b2711e2d398, type: 3} + - {fileID: 21300000, guid: 48318fbc7b99d5f41bc3b01b35ccbe6c, type: 3} + - {fileID: 21300000, guid: a569b34051d93504b95ed11e65ef7b5b, type: 3} + - {fileID: 21300000, guid: 924ff970eb936414889597ff6b3b5dce, type: 3} m_IsVariant: 0 diff --git a/Art_Bytes/ArtAtlasConfig.bytes b/Art_Bytes/ArtAtlasConfig.bytes index 3725e8c5..e8ef100a 100644 Binary files a/Art_Bytes/ArtAtlasConfig.bytes and b/Art_Bytes/ArtAtlasConfig.bytes differ diff --git a/yyzl/11CollectionsPanel/CollectionBackup.prefab b/yyzl/11CollectionsPanel/CollectionBackup.prefab deleted file mode 100644 index 5f05f15f..00000000 --- a/yyzl/11CollectionsPanel/CollectionBackup.prefab +++ /dev/null @@ -1,493 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1586020735211578223 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3445200749577521824} - - component: {fileID: 5479095879667899180} - - component: {fileID: 6453670429990715261} - - component: {fileID: 6357968712031491043} - m_Layer: 5 - m_Name: CollectionBackup - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3445200749577521824 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1586020735211578223} - 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: - - {fileID: 6813024751254691300} - - {fileID: 6576654199039866232} - - {fileID: 641142348713049154} - m_Father: {fileID: 0} - 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5479095879667899180 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1586020735211578223} - m_CullTransparentMesh: 1 ---- !u!114 &6453670429990715261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1586020735211578223} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.8627451} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!114 &6357968712031491043 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1586020735211578223} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 43cc2bec8199e6743a3ab2fd7dcce049, type: 3} - m_Name: - m_EditorClassIdentifier: - base_multiple: 0 - border_gap: 0 - InteractEffect: {fileID: 0} - IsReadyGame: 0 - IsSurprise: 0 - Mask: {fileID: 0} - EmojiSR: {fileID: 0} - stopThreshold: 0.1 - isScrolling: 0 - HeadItem: {fileID: 3056480461011283317, guid: a1dc388bb19dac1439f7c00a2be71fe7, type: 3} - FrameItem: {fileID: 2028740668818141269, guid: a374aa853cdea2742b6e9db9b9f302a0, type: 3} - EmojiItem: {fileID: 2728450781991918488, guid: d3b706cdc5467a1439cfe639a65e8abf, type: 3} - CollectionsItemGroup: {fileID: 2323019639418691378, guid: 337b142c74908544b8220d249cc275fe, type: 3} - EmojiStatus: 0 - currentEmoji: 0 - currentHead: 0 - currentFrame: 0 - HideTipButton: {fileID: 0} - AnimationMask: {fileID: 0} - CarouselDragDirection: 0 ---- !u!1 &4873042722880624120 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 641142348713049154} - - component: {fileID: 9102743746810646226} - - component: {fileID: 3499691364697456317} - m_Layer: 5 - m_Name: CompletedTMP - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &641142348713049154 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4873042722880624120} - 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: 3445200749577521824} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0, y: -364} - m_SizeDelta: {x: 602.4734, y: 94.390625} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9102743746810646226 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4873042722880624120} - m_CullTransparentMesh: 1 ---- !u!114 &3499691364697456317 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4873042722880624120} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 762a1c76c61ff6f44864797c01cf0c88, 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_text: Completed! - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 9590211d1ac2e904988c83a15ebf6554, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4283360511 - m_fontColor: {r: 1, g: 0.89411765, b: 0.30588236, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 70 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 70 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7016037032850126091 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6813024751254691300} - - component: {fileID: 6589938040550406470} - - component: {fileID: 3877045225647641587} - - component: {fileID: 3525379525527222161} - - component: {fileID: 7962809437300928905} - m_Layer: 5 - m_Name: TitleBg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6813024751254691300 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016037032850126091} - 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: 3445200749577521824} - 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: 733.34155} - m_SizeDelta: {x: 0, y: -1466.6831} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6589938040550406470 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016037032850126091} - m_CullTransparentMesh: 1 ---- !u!114 &3877045225647641587 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016037032850126091} - 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: 0, g: 0, b: 0, 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: 0} - m_Type: 0 - 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!114 &3525379525527222161 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016037032850126091} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dfcb580261c75e946a668ec43a319289, type: 3} - m_Name: - m_EditorClassIdentifier: - dir: 1 - color1: - serializedVersion: 2 - rgba: 4278190080 - color2: - serializedVersion: 2 - rgba: 0 - range: 0 - isFlip: 0 ---- !u!225 &7962809437300928905 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016037032850126091} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &7019542914709802503 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6576654199039866232} - - component: {fileID: 8280680145121909140} - - component: {fileID: 7558824585354170232} - m_Layer: 5 - m_Name: SelfTMP - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6576654199039866232 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7019542914709802503} - 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: 3445200749577521824} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0, y: -292} - m_SizeDelta: {x: 848.7313, y: 98.3394} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8280680145121909140 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7019542914709802503} - m_CullTransparentMesh: 1 ---- !u!114 &7558824585354170232 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7019542914709802503} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 762a1c76c61ff6f44864797c01cf0c88, 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_text: 'Shelf - -' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} - m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 70 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 70 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/yyzl/11CollectionsPanel/CollectionBackup.prefab.meta b/yyzl/11CollectionsPanel/CollectionBackup.prefab.meta deleted file mode 100644 index e7324d6d..00000000 --- a/yyzl/11CollectionsPanel/CollectionBackup.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d085f7bdd6be203488fdcc1b2908d63f -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: