From aa0305d0aaf19f55da08c0eb9e5129c4a40cf50e Mon Sep 17 00:00:00 2001 From: zhang hongbo Date: Tue, 28 Apr 2026 18:02:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=A2=E5=A4=B1=E5=9B=BE?= =?UTF-8?q?=E7=89=87=20=20=E7=8C=AB=E7=8C=AB=E5=9B=9E=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Art_Atlas/02MainHome.spriteatlasv2 | 5 - Art_Atlas/20Milestone.spriteatlasv2 | 8 ++ Art_Atlas/AtlasConfig.json | 15 ++- Art_Bytes/ArtAtlasConfig.bytes | Bin 199146 -> 199317 bytes Art_Bytes/ArtResourceConfig.bytes | Bin 760970 -> 764690 bytes Art_Json/CatReturn.meta | 8 ++ Art_Json/CatReturn/CatReturnColor1.json | 54 ++++++++ Art_Json/CatReturn/CatReturnColor1.json.meta | 7 + Art_Json/CatReturn/CatReturnColor2.json | 54 ++++++++ Art_Json/CatReturn/CatReturnColor2.json.meta | 7 + Art_Json/CatReturn/CatReturnColor3.json | 54 ++++++++ Art_Json/CatReturn/CatReturnColor3.json.meta | 7 + Art_Json/CatReturn/CatReturnColor4.json | 54 ++++++++ Art_Json/CatReturn/CatReturnColor4.json.meta | 7 + Art_Json/CatReturn/CatReturnColor5.json | 54 ++++++++ Art_Json/CatReturn/CatReturnColor5.json.meta | 7 + Art_Json/art_table_manifest.json | 5 + Art_SO/CatReturn.meta | 8 ++ Art_SO/CatReturn/CatReturnColor1.asset | 65 +++++++++ Art_SO/CatReturn/CatReturnColor1.asset.meta | 8 ++ Art_SO/CatReturn/CatReturnColor2.asset | 65 +++++++++ Art_SO/CatReturn/CatReturnColor2.asset.meta | 8 ++ Art_SO/CatReturn/CatReturnColor3.asset | 65 +++++++++ Art_SO/CatReturn/CatReturnColor3.asset.meta | 8 ++ Art_SO/CatReturn/CatReturnColor4.asset | 65 +++++++++ Art_SO/CatReturn/CatReturnColor4.asset.meta | 8 ++ Art_SO/CatReturn/CatReturnColor5.asset | 65 +++++++++ Art_SO/CatReturn/CatReturnColor5.asset.meta | 8 ++ yyzl/01Mergeorder/MainMergePanel.prefab | 4 +- .../image}/Daily_mmhl1_icn_lanzi.png | Bin .../image}/Daily_mmhl1_icn_lanzi.png.meta | 0 .../image/Daily_mmhl1_main_bg2.png.meta | 2 +- .../image/Daily_mmhl1_merge_top_2.png.meta | 4 +- .../image/Daily_mmhl1_merge_top_bg1.png.meta | 4 +- .../image}/Daily_mmhl2_icn_lanzi.png | Bin .../image}/Daily_mmhl2_icn_lanzi.png.meta | 0 .../image/Daily_mmhl2_main_bg2.png.meta | 2 +- .../image/Daily_mmhl2_merge_top_bg1.png.meta | 4 +- .../image}/Daily_mmhl3_icn_lanzi.png | Bin .../image}/Daily_mmhl3_icn_lanzi.png.meta | 0 .../image/Daily_mmhl3_main_bg2.png | Bin 0 -> 1477 bytes .../image/Daily_mmhl3_main_bg2.png.meta | 127 ++++++++++++++++++ .../image/Daily_mmhl3_merge_top_bg1.png.meta | 4 +- .../image}/Daily_mmhl4_icn_lanzi.png | Bin .../image}/Daily_mmhl4_icn_lanzi.png.meta | 0 .../image/Daily_mmhl4_main_bg2.png | Bin 0 -> 2526 bytes .../image/Daily_mmhl4_main_bg2.png.meta | 127 ++++++++++++++++++ .../image/Daily_mmhl4_merge_top_bg1.png.meta | 4 +- .../image}/Daily_mmhl5_icn_lanzi.png | Bin .../image}/Daily_mmhl5_icn_lanzi.png.meta | 0 .../image/Daily_mmhl5_main_bg2.png | Bin 0 -> 2988 bytes .../image/Daily_mmhl5_main_bg2.png.meta | 127 ++++++++++++++++++ .../image/Daily_mmhl5_merge_top_bg1.png.meta | 4 +- 53 files changed, 1105 insertions(+), 27 deletions(-) create mode 100644 Art_Json/CatReturn.meta create mode 100644 Art_Json/CatReturn/CatReturnColor1.json create mode 100644 Art_Json/CatReturn/CatReturnColor1.json.meta create mode 100644 Art_Json/CatReturn/CatReturnColor2.json create mode 100644 Art_Json/CatReturn/CatReturnColor2.json.meta create mode 100644 Art_Json/CatReturn/CatReturnColor3.json create mode 100644 Art_Json/CatReturn/CatReturnColor3.json.meta create mode 100644 Art_Json/CatReturn/CatReturnColor4.json create mode 100644 Art_Json/CatReturn/CatReturnColor4.json.meta create mode 100644 Art_Json/CatReturn/CatReturnColor5.json create mode 100644 Art_Json/CatReturn/CatReturnColor5.json.meta create mode 100644 Art_SO/CatReturn.meta create mode 100644 Art_SO/CatReturn/CatReturnColor1.asset create mode 100644 Art_SO/CatReturn/CatReturnColor1.asset.meta create mode 100644 Art_SO/CatReturn/CatReturnColor2.asset create mode 100644 Art_SO/CatReturn/CatReturnColor2.asset.meta create mode 100644 Art_SO/CatReturn/CatReturnColor3.asset create mode 100644 Art_SO/CatReturn/CatReturnColor3.asset.meta create mode 100644 Art_SO/CatReturn/CatReturnColor4.asset create mode 100644 Art_SO/CatReturn/CatReturnColor4.asset.meta create mode 100644 Art_SO/CatReturn/CatReturnColor5.asset create mode 100644 Art_SO/CatReturn/CatReturnColor5.asset.meta rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl1_icn_lanzi.png (100%) rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl1_icn_lanzi.png.meta (100%) rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl2_icn_lanzi.png (100%) rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl2_icn_lanzi.png.meta (100%) rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl3_icn_lanzi.png (100%) rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl3_icn_lanzi.png.meta (100%) create mode 100644 yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png create mode 100644 yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png.meta rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl4_icn_lanzi.png (100%) rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl4_icn_lanzi.png.meta (100%) create mode 100644 yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png create mode 100644 yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png.meta rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl5_icn_lanzi.png (100%) rename yyzl/{02MainHome/image/DailyIcon => 20Milestone/image}/Daily_mmhl5_icn_lanzi.png.meta (100%) create mode 100644 yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png create mode 100644 yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png.meta diff --git a/Art_Atlas/02MainHome.spriteatlasv2 b/Art_Atlas/02MainHome.spriteatlasv2 index 99bac051..e08ff4ef 100644 --- a/Art_Atlas/02MainHome.spriteatlasv2 +++ b/Art_Atlas/02MainHome.spriteatlasv2 @@ -26,11 +26,6 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: c6242cae5f0976c46ae2e78d00b1e49a, type: 3} - {fileID: 21300000, guid: 69ad4330d31cc774d9f2760c5ec5000a, type: 3} - {fileID: 21300000, guid: c1ea5d9671bdd534cb7bad0f513681a0, type: 3} - - {fileID: 21300000, guid: 3bc0e993e1abf274ca80ce22eda33514, type: 3} - - {fileID: 21300000, guid: fa0058e67a6e0a84f9ee8bed50153952, type: 3} - - {fileID: 21300000, guid: 2857937929510a34d8b59d7af6b750d4, type: 3} - - {fileID: 21300000, guid: 888ebbea9bd57f54b9997a9cd121123a, type: 3} - - {fileID: 21300000, guid: b2f83f98502b4b24cbcf97b2e74ba594, type: 3} - {fileID: 21300000, guid: 140bd545094e5bc4eb6d58575510bb59, type: 3} - {fileID: 21300000, guid: 942baa23e99c52c498d444b345bc8b9e, type: 3} - {fileID: 21300000, guid: 3043854007caf7a4a9d985a255234a22, type: 3} diff --git a/Art_Atlas/20Milestone.spriteatlasv2 b/Art_Atlas/20Milestone.spriteatlasv2 index dfac95e9..fb88fa24 100644 --- a/Art_Atlas/20Milestone.spriteatlasv2 +++ b/Art_Atlas/20Milestone.spriteatlasv2 @@ -44,4 +44,12 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: 5386e9cb722c14a4a94bf866e4ab1412, type: 3} - {fileID: 21300000, guid: 98019dc13633e034e81de7dbfbe51075, type: 3} - {fileID: 21300000, guid: 9d7c8b382f1e4ec4da06c7f628d12106, type: 3} + - {fileID: 21300000, guid: 3bc0e993e1abf274ca80ce22eda33514, type: 3} + - {fileID: 21300000, guid: fa0058e67a6e0a84f9ee8bed50153952, type: 3} + - {fileID: 21300000, guid: 2857937929510a34d8b59d7af6b750d4, type: 3} + - {fileID: 21300000, guid: 99aa4b3d604d99a45b82b8eda17b2130, type: 3} + - {fileID: 21300000, guid: 888ebbea9bd57f54b9997a9cd121123a, type: 3} + - {fileID: 21300000, guid: 2720cad0b30066a4fa5120558c92f37b, type: 3} + - {fileID: 21300000, guid: b2f83f98502b4b24cbcf97b2e74ba594, type: 3} + - {fileID: 21300000, guid: 23e0364b5e58480408c69fdc497c11dd, type: 3} m_IsVariant: 0 diff --git a/Art_Atlas/AtlasConfig.json b/Art_Atlas/AtlasConfig.json index 2868dc5d..067e3514 100644 --- a/Art_Atlas/AtlasConfig.json +++ b/Art_Atlas/AtlasConfig.json @@ -1464,11 +1464,6 @@ "Assets/Art_SubModule/yyzl/02MainHome/image/merge_icon_circlebg_yellowblue.png", "Assets/Art_SubModule/yyzl/02MainHome/image/merge_icon_circlebg_zise.png", "Assets/Art_SubModule/yyzl/02MainHome/image/DailyIcon/active_icn_dailytask.png", - "Assets/Art_SubModule/yyzl/02MainHome/image/DailyIcon/Daily_mmhl1_icn_lanzi.png", - "Assets/Art_SubModule/yyzl/02MainHome/image/DailyIcon/Daily_mmhl2_icn_lanzi.png", - "Assets/Art_SubModule/yyzl/02MainHome/image/DailyIcon/Daily_mmhl3_icn_lanzi.png", - "Assets/Art_SubModule/yyzl/02MainHome/image/DailyIcon/Daily_mmhl4_icn_lanzi.png", - "Assets/Art_SubModule/yyzl/02MainHome/image/DailyIcon/Daily_mmhl5_icn_lanzi.png", "Assets/Art_SubModule/yyzl/02MainHome/image/DailyIcon/homepace_icon_card.png", "Assets/Art_SubModule/yyzl/02MainHome/image/DailyIcon/homepace_icon_goldcup.png", "Assets/Art_SubModule/yyzl/02MainHome/image/DailyIcon/mini-games3DS_pic_icon_big.png", @@ -2117,7 +2112,15 @@ "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_icn_flower.png", "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_main_bg1.png", "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_main_top.png", - "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_merge_top_bg1.png" + "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_merge_top_bg1.png", + "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_icn_lanzi.png", + "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_icn_lanzi.png", + "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_icn_lanzi.png", + "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png", + "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_icn_lanzi.png", + "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png", + "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_icn_lanzi.png", + "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png" ] }, { diff --git a/Art_Bytes/ArtAtlasConfig.bytes b/Art_Bytes/ArtAtlasConfig.bytes index 8cefca466a5f0409c128818d8e39425ed71bd258..799de6c34247dc6c0f8ccf7aaa5b4a8cb2284086 100644 GIT binary patch delta 245 zcmaDgnP=)$o`x32ElhVf7?q|6USX1(F2KbkxSfZSiH~LaiB2Zz=>_~u(%WD0FUy%ACHD5vUp@I=y=n6X$dTHYQ~Vcl~B2HdZt>oF?(PiJ5uvN$E%m z7x4idv4aulK(H|iTbVc+jkfRK%ET8U+j5edfti7ULDg@U1}m4StokvRhZdaOYb diff --git a/Art_Bytes/ArtResourceConfig.bytes b/Art_Bytes/ArtResourceConfig.bytes index 3fb32c8550a75a99a8880195f3ef302cc350c206..55a5dff88655e23a98c03cdda8a7f3d7c6ddac64 100644 GIT binary patch delta 2473 zcmeC$sW<7G9tS@IBM$=uL(oQ!P*$S=ZU!bGhu=A|Bq+6{v?$LxKPSJ)ke`7Wq=t=y zfe}bCLKLy)B<59RP8amyR-SyHkyY8qz&A4|wYVfdFI7J?H!(d`-z70Kr!qb_HzUU| zJ~KHlK4-e30hjFL21Rxu=A?8(ZU$zcX$;&9EI`s_@1`IdHVei%ret2_;Ij{u>%c?NB5*B z%#)e~JegXQo*EA}0qWC5?Ck7pX*v1jsYTNtgh4`F3BMtr5T9Oqhgov^2RCMR<3OxY zYlJmwNwUcZ9Je5wD_LBw+vzLroZ>kf;s98nwohN3AghQ47&ag{U>AR@A}`qE6I8jiXM~0u93& zwZT}U)`aq?HK8DCA$qA0wIfiCU;})QMW4VOXO!1Z&iqQXaLY6htjVFBPKJ zlv+^>H;6h>3pI{9Q42H-ThunkvbM*vG6FFZ5HkZY3lM|E*npTFh&h0m6NtIC$Fgz@ hOqXpq0ciyZ8yOgx=^B{m8d)e9np>F|S{Yd|006@b(PIDr delta 98 zcmbPqO|NUG9tS@IBM$=ugYQO;P}b(B!tGCm8G)Dyh?#+y1&CRJm<@>8ftUk`If0mK n`%__Vf$6fP4BQMXK<&at21aJO1}3^j77B)DR;GqlhDHnk22~sX diff --git a/Art_Json/CatReturn.meta b/Art_Json/CatReturn.meta new file mode 100644 index 00000000..d5914896 --- /dev/null +++ b/Art_Json/CatReturn.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38dccf671442d6948868a9532a1db333 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/CatReturn/CatReturnColor1.json b/Art_Json/CatReturn/CatReturnColor1.json new file mode 100644 index 00000000..42b70eb7 --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor1.json @@ -0,0 +1,54 @@ +{ + "TableId": 80, + "TableName": "CatReturnColor1", + "Items": [ + { + "Id": 1, + "Name": "lanzi", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_icn_lanzi.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 2, + "Name": "bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_main_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 3, + "Name": "bg2", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_main_bg2.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 4, + "Name": "main_top", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_main_top.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 5, + "Name": "top_bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_merge_top_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 6, + "Name": "flower", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_icn_flower.png", + "SpineAssetPath": "", + "SpineAnimName": "" + } + ] +} \ No newline at end of file diff --git a/Art_Json/CatReturn/CatReturnColor1.json.meta b/Art_Json/CatReturn/CatReturnColor1.json.meta new file mode 100644 index 00000000..7f3298b2 --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor1.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d4a1b342434ee046a93f7c9dde36a36 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/CatReturn/CatReturnColor2.json b/Art_Json/CatReturn/CatReturnColor2.json new file mode 100644 index 00000000..be8df619 --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor2.json @@ -0,0 +1,54 @@ +{ + "TableId": 81, + "TableName": "CatReturnColor2", + "Items": [ + { + "Id": 1, + "Name": "flower", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_icn_flower.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 2, + "Name": "lanzi", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_icn_lanzi.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 3, + "Name": "bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_main_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 4, + "Name": "bg2", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_main_bg2.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 5, + "Name": "main_top", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_main_top.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 6, + "Name": "top_bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_merge_top_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + } + ] +} \ No newline at end of file diff --git a/Art_Json/CatReturn/CatReturnColor2.json.meta b/Art_Json/CatReturn/CatReturnColor2.json.meta new file mode 100644 index 00000000..e820d5fa --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor2.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3a4ff297ee7bdae4082638f5290df136 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/CatReturn/CatReturnColor3.json b/Art_Json/CatReturn/CatReturnColor3.json new file mode 100644 index 00000000..5e5932a5 --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor3.json @@ -0,0 +1,54 @@ +{ + "TableId": 82, + "TableName": "CatReturnColor3", + "Items": [ + { + "Id": 1, + "Name": "flower", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_icn_flower.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 2, + "Name": "lanzi", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_icn_lanzi.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 3, + "Name": "bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_main_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 4, + "Name": "bg2", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 5, + "Name": "main_top", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_main_top.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 6, + "Name": "top_bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_merge_top_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + } + ] +} \ No newline at end of file diff --git a/Art_Json/CatReturn/CatReturnColor3.json.meta b/Art_Json/CatReturn/CatReturnColor3.json.meta new file mode 100644 index 00000000..ce6b5a66 --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor3.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7f3f53c927599aa49a1971aa2ae4dfba +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/CatReturn/CatReturnColor4.json b/Art_Json/CatReturn/CatReturnColor4.json new file mode 100644 index 00000000..ff156dd2 --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor4.json @@ -0,0 +1,54 @@ +{ + "TableId": 83, + "TableName": "CatReturnColor4", + "Items": [ + { + "Id": 1, + "Name": "flower", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_icn_flower.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 2, + "Name": "lanzi", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_icn_lanzi.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 3, + "Name": "bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_main_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 4, + "Name": "bg2", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 5, + "Name": "main_top", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_main_top.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 6, + "Name": "top_bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_merge_top_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + } + ] +} \ No newline at end of file diff --git a/Art_Json/CatReturn/CatReturnColor4.json.meta b/Art_Json/CatReturn/CatReturnColor4.json.meta new file mode 100644 index 00000000..5bb7ea9a --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor4.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4a072b834e57e0e45ad3df1481b15b1a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/CatReturn/CatReturnColor5.json b/Art_Json/CatReturn/CatReturnColor5.json new file mode 100644 index 00000000..71f38969 --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor5.json @@ -0,0 +1,54 @@ +{ + "TableId": 84, + "TableName": "CatReturnColor5", + "Items": [ + { + "Id": 1, + "Name": "flower", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_icn_flower.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 2, + "Name": "lanzi", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_icn_lanzi.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 3, + "Name": "bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_main_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 4, + "Name": "bg2", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 5, + "Name": "main_top", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_main_top.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 6, + "Name": "top_bg1", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_merge_top_bg1.png", + "SpineAssetPath": "", + "SpineAnimName": "" + } + ] +} \ No newline at end of file diff --git a/Art_Json/CatReturn/CatReturnColor5.json.meta b/Art_Json/CatReturn/CatReturnColor5.json.meta new file mode 100644 index 00000000..8fa66256 --- /dev/null +++ b/Art_Json/CatReturn/CatReturnColor5.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f69be19bea8995341a350e3677072bf7 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/art_table_manifest.json b/Art_Json/art_table_manifest.json index 2458fe48..090f3695 100644 --- a/Art_Json/art_table_manifest.json +++ b/Art_Json/art_table_manifest.json @@ -2,6 +2,11 @@ "tablePaths": [ "Assets/Art_SubModule/Art_Json/Card/Card_Star.json", "Assets/Art_SubModule/Art_Json/Card/Card_Star_Gray.json", + "Assets/Art_SubModule/Art_Json/CatReturn/CatReturnColor1.json", + "Assets/Art_SubModule/Art_Json/CatReturn/CatReturnColor2.json", + "Assets/Art_SubModule/Art_Json/CatReturn/CatReturnColor3.json", + "Assets/Art_SubModule/Art_Json/CatReturn/CatReturnColor4.json", + "Assets/Art_SubModule/Art_Json/CatReturn/CatReturnColor5.json", "Assets/Art_SubModule/Art_Json/Collections/EmojiResource.json", "Assets/Art_SubModule/Art_Json/Collections/HeadFrameResource.json", "Assets/Art_SubModule/Art_Json/Collections/HeadResource.json", diff --git a/Art_SO/CatReturn.meta b/Art_SO/CatReturn.meta new file mode 100644 index 00000000..b2b5ad3d --- /dev/null +++ b/Art_SO/CatReturn.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7147e280807b0d34e8fc88dd707aa6e9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_SO/CatReturn/CatReturnColor1.asset b/Art_SO/CatReturn/CatReturnColor1.asset new file mode 100644 index 00000000..9623033a --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor1.asset @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3a207709ab52e44890f2994488620cc, type: 3} + m_Name: CatReturnColor1 + m_EditorClassIdentifier: + TableId: 80 + TableName: CatReturnColor1 + Items: + - Id: 1 + Name: lanzi + Desc: + Sprite: {fileID: 21300000, guid: 3bc0e993e1abf274ca80ce22eda33514, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_icn_lanzi.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 2 + Name: bg1 + Desc: + Sprite: {fileID: 21300000, guid: 46e78a26fd011cf478e4dcd3c2e2f03b, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_main_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 3 + Name: bg2 + Desc: + Sprite: {fileID: 21300000, guid: fbaaa0779cbdbef4ba94e8cb778d9c0e, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_main_bg2.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 4 + Name: main_top + Desc: + Sprite: {fileID: 21300000, guid: 53adec889fe069940afed62ce21f8337, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_main_top.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 5 + Name: top_bg1 + Desc: + Sprite: {fileID: 21300000, guid: 5681aa56ddcd6f741af15fbcca0dead7, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_merge_top_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 6 + Name: flower + Desc: + Sprite: {fileID: 21300000, guid: 912adce0f9adcff4896ee3f8e6516d51, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl1_icn_flower.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/Art_SO/CatReturn/CatReturnColor1.asset.meta b/Art_SO/CatReturn/CatReturnColor1.asset.meta new file mode 100644 index 00000000..4ed70cd0 --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31e060301cbbf5a4ea6f5d5074604e5d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_SO/CatReturn/CatReturnColor2.asset b/Art_SO/CatReturn/CatReturnColor2.asset new file mode 100644 index 00000000..87ee146b --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor2.asset @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3a207709ab52e44890f2994488620cc, type: 3} + m_Name: CatReturnColor2 + m_EditorClassIdentifier: + TableId: 81 + TableName: CatReturnColor2 + Items: + - Id: 1 + Name: flower + Desc: + Sprite: {fileID: 21300000, guid: 4defb511d2f14b94291f9f1ffb1899c1, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_icn_flower.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 2 + Name: lanzi + Desc: + Sprite: {fileID: 21300000, guid: fa0058e67a6e0a84f9ee8bed50153952, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_icn_lanzi.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 3 + Name: bg1 + Desc: + Sprite: {fileID: 21300000, guid: d15c17f7dc718044c9700aaf4f9d1e45, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_main_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 4 + Name: bg2 + Desc: + Sprite: {fileID: 21300000, guid: 8fc987224a74e4c4b86878d99d3709c5, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_main_bg2.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 5 + Name: main_top + Desc: + Sprite: {fileID: 21300000, guid: d33c29af93e9cdd4eaeff63fd3cb0b12, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_main_top.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 6 + Name: top_bg1 + Desc: + Sprite: {fileID: 21300000, guid: 99e5075b97685b14595f805171ccc146, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl2_merge_top_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/Art_SO/CatReturn/CatReturnColor2.asset.meta b/Art_SO/CatReturn/CatReturnColor2.asset.meta new file mode 100644 index 00000000..bd5256e1 --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa3935bacaea8ca45a076334c686543d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_SO/CatReturn/CatReturnColor3.asset b/Art_SO/CatReturn/CatReturnColor3.asset new file mode 100644 index 00000000..2c415d1c --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor3.asset @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3a207709ab52e44890f2994488620cc, type: 3} + m_Name: CatReturnColor3 + m_EditorClassIdentifier: + TableId: 82 + TableName: CatReturnColor3 + Items: + - Id: 1 + Name: flower + Desc: + Sprite: {fileID: 21300000, guid: c058a8c3416d7734c9c6de45bbb9000c, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_icn_flower.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 2 + Name: lanzi + Desc: + Sprite: {fileID: 21300000, guid: 2857937929510a34d8b59d7af6b750d4, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_icn_lanzi.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 3 + Name: bg1 + Desc: + Sprite: {fileID: 21300000, guid: 718396c457b24844abc587e41dd4a65f, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_main_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 4 + Name: bg2 + Desc: + Sprite: {fileID: 21300000, guid: 99aa4b3d604d99a45b82b8eda17b2130, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 5 + Name: main_top + Desc: + Sprite: {fileID: 21300000, guid: b21fce298a06c004294f4e5659cb4525, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_main_top.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 6 + Name: top_bg1 + Desc: + Sprite: {fileID: 21300000, guid: 27d4c4ca6182ea1408e7d19c1ae7d12b, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl3_merge_top_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/Art_SO/CatReturn/CatReturnColor3.asset.meta b/Art_SO/CatReturn/CatReturnColor3.asset.meta new file mode 100644 index 00000000..e3264edc --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46cd46dad7ac9d246a9058646a5a47e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_SO/CatReturn/CatReturnColor4.asset b/Art_SO/CatReturn/CatReturnColor4.asset new file mode 100644 index 00000000..5761b86f --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor4.asset @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3a207709ab52e44890f2994488620cc, type: 3} + m_Name: CatReturnColor4 + m_EditorClassIdentifier: + TableId: 83 + TableName: CatReturnColor4 + Items: + - Id: 1 + Name: flower + Desc: + Sprite: {fileID: 21300000, guid: e00bc2dd63241714b8bf682d69c1341d, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_icn_flower.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 2 + Name: lanzi + Desc: + Sprite: {fileID: 21300000, guid: 888ebbea9bd57f54b9997a9cd121123a, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_icn_lanzi.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 3 + Name: bg1 + Desc: + Sprite: {fileID: 21300000, guid: 3e8ea8e0e56303f42a97219591301fdc, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_main_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 4 + Name: bg2 + Desc: + Sprite: {fileID: 21300000, guid: 2720cad0b30066a4fa5120558c92f37b, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 5 + Name: main_top + Desc: + Sprite: {fileID: 21300000, guid: 7ef308aa8fb649b4e90a946718335755, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_main_top.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 6 + Name: top_bg1 + Desc: + Sprite: {fileID: 21300000, guid: ab0ab96f5d5c110478206874950bbbd3, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl4_merge_top_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/Art_SO/CatReturn/CatReturnColor4.asset.meta b/Art_SO/CatReturn/CatReturnColor4.asset.meta new file mode 100644 index 00000000..f509c5f5 --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e41c9a8e41a4b64787cf682ce094995 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_SO/CatReturn/CatReturnColor5.asset b/Art_SO/CatReturn/CatReturnColor5.asset new file mode 100644 index 00000000..34693a60 --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor5.asset @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3a207709ab52e44890f2994488620cc, type: 3} + m_Name: CatReturnColor5 + m_EditorClassIdentifier: + TableId: 84 + TableName: CatReturnColor5 + Items: + - Id: 1 + Name: flower + Desc: + Sprite: {fileID: 21300000, guid: 09853a075f9ba0340bde8fd5d720c8dd, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_icn_flower.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 2 + Name: lanzi + Desc: + Sprite: {fileID: 21300000, guid: b2f83f98502b4b24cbcf97b2e74ba594, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_icn_lanzi.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 3 + Name: bg1 + Desc: + Sprite: {fileID: 21300000, guid: 5386e9cb722c14a4a94bf866e4ab1412, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_main_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 4 + Name: bg2 + Desc: + Sprite: {fileID: 21300000, guid: 23e0364b5e58480408c69fdc497c11dd, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 5 + Name: main_top + Desc: + Sprite: {fileID: 21300000, guid: 98019dc13633e034e81de7dbfbe51075, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_main_top.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 6 + Name: top_bg1 + Desc: + Sprite: {fileID: 21300000, guid: 9d7c8b382f1e4ec4da06c7f628d12106, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/20Milestone/image/Daily_mmhl5_merge_top_bg1.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/Art_SO/CatReturn/CatReturnColor5.asset.meta b/Art_SO/CatReturn/CatReturnColor5.asset.meta new file mode 100644 index 00000000..9f09b697 --- /dev/null +++ b/Art_SO/CatReturn/CatReturnColor5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cca185867b000474fbba1bac4f517013 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/yyzl/01Mergeorder/MainMergePanel.prefab b/yyzl/01Mergeorder/MainMergePanel.prefab index 56c269a1..eeefbece 100644 --- a/yyzl/01Mergeorder/MainMergePanel.prefab +++ b/yyzl/01Mergeorder/MainMergePanel.prefab @@ -28020,7 +28020,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7b100a6e26198c143b3b47bffa0c1474, type: 3} + m_Sprite: {fileID: 21300000, guid: 31e179cf501353542ba774af09d82bbe, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -93590,7 +93590,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3fb68dfaaa381748a893a284dd3ead7, type: 3} + m_Sprite: {fileID: 21300000, guid: 493d9159983cecd4c9edfda5959ed6aa, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/02MainHome/image/DailyIcon/Daily_mmhl1_icn_lanzi.png b/yyzl/20Milestone/image/Daily_mmhl1_icn_lanzi.png similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl1_icn_lanzi.png rename to yyzl/20Milestone/image/Daily_mmhl1_icn_lanzi.png diff --git a/yyzl/02MainHome/image/DailyIcon/Daily_mmhl1_icn_lanzi.png.meta b/yyzl/20Milestone/image/Daily_mmhl1_icn_lanzi.png.meta similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl1_icn_lanzi.png.meta rename to yyzl/20Milestone/image/Daily_mmhl1_icn_lanzi.png.meta diff --git a/yyzl/20Milestone/image/Daily_mmhl1_main_bg2.png.meta b/yyzl/20Milestone/image/Daily_mmhl1_main_bg2.png.meta index 7e388977..1b9f784c 100644 --- a/yyzl/20Milestone/image/Daily_mmhl1_main_bg2.png.meta +++ b/yyzl/20Milestone/image/Daily_mmhl1_main_bg2.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 40, y: 165, z: 39, w: 15} + spriteBorder: {x: 38, y: 297, z: 33, w: 42} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/yyzl/20Milestone/image/Daily_mmhl1_merge_top_2.png.meta b/yyzl/20Milestone/image/Daily_mmhl1_merge_top_2.png.meta index e93e2a3c..79358ba5 100644 --- a/yyzl/20Milestone/image/Daily_mmhl1_merge_top_2.png.meta +++ b/yyzl/20Milestone/image/Daily_mmhl1_merge_top_2.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 38, y: 0, z: 38, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/yyzl/20Milestone/image/Daily_mmhl1_merge_top_bg1.png.meta b/yyzl/20Milestone/image/Daily_mmhl1_merge_top_bg1.png.meta index 921d7431..adabb1ae 100644 --- a/yyzl/20Milestone/image/Daily_mmhl1_merge_top_bg1.png.meta +++ b/yyzl/20Milestone/image/Daily_mmhl1_merge_top_bg1.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 56, y: 0, z: 56, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/yyzl/02MainHome/image/DailyIcon/Daily_mmhl2_icn_lanzi.png b/yyzl/20Milestone/image/Daily_mmhl2_icn_lanzi.png similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl2_icn_lanzi.png rename to yyzl/20Milestone/image/Daily_mmhl2_icn_lanzi.png diff --git a/yyzl/02MainHome/image/DailyIcon/Daily_mmhl2_icn_lanzi.png.meta b/yyzl/20Milestone/image/Daily_mmhl2_icn_lanzi.png.meta similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl2_icn_lanzi.png.meta rename to yyzl/20Milestone/image/Daily_mmhl2_icn_lanzi.png.meta diff --git a/yyzl/20Milestone/image/Daily_mmhl2_main_bg2.png.meta b/yyzl/20Milestone/image/Daily_mmhl2_main_bg2.png.meta index c623c216..2838fa00 100644 --- a/yyzl/20Milestone/image/Daily_mmhl2_main_bg2.png.meta +++ b/yyzl/20Milestone/image/Daily_mmhl2_main_bg2.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 38, y: 159, z: 37, w: 26} + spriteBorder: {x: 38, y: 297, z: 37, w: 31} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/yyzl/20Milestone/image/Daily_mmhl2_merge_top_bg1.png.meta b/yyzl/20Milestone/image/Daily_mmhl2_merge_top_bg1.png.meta index 95a472f9..094faf39 100644 --- a/yyzl/20Milestone/image/Daily_mmhl2_merge_top_bg1.png.meta +++ b/yyzl/20Milestone/image/Daily_mmhl2_merge_top_bg1.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 60, y: 0, z: 54, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/yyzl/02MainHome/image/DailyIcon/Daily_mmhl3_icn_lanzi.png b/yyzl/20Milestone/image/Daily_mmhl3_icn_lanzi.png similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl3_icn_lanzi.png rename to yyzl/20Milestone/image/Daily_mmhl3_icn_lanzi.png diff --git a/yyzl/02MainHome/image/DailyIcon/Daily_mmhl3_icn_lanzi.png.meta b/yyzl/20Milestone/image/Daily_mmhl3_icn_lanzi.png.meta similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl3_icn_lanzi.png.meta rename to yyzl/20Milestone/image/Daily_mmhl3_icn_lanzi.png.meta diff --git a/yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png b/yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png new file mode 100644 index 0000000000000000000000000000000000000000..af9b9ddaf39d0263305faa8f4b8e28c5d5f3fc78 GIT binary patch literal 1477 zcmeAS@N?(olHy`uVBq!ia0vp^0SpX`@f>VG)=dNNGYkx@J)SO(Ar*7p-ts-MG+E~O z$NL?ko3SxSNY85`OM;TpZA`hQ~c~--76E*;&U^9|0_FJdjI*Zb-JsyZ_D`<#ct7b zpV@1ukm7KnVFIHfvlCkj4~L|H(Wt;^cnoNA(0VZ6yO!3ThFsD_|Nn%`c?3Z z^|hh}`SZCQs=g#$%`cK-=<}bw;5&o!M z{B?!+sq(|MZf8C2-(6=E^?u(hW*PAhufK&}JD9ca!M}(5?_~Hs>HAiAmC?L^mtBs? zhvh2flJD!+t5sHAv6smTeRopj{P}M?rX9-n%)9Zz;ka&g+~g;-|Cw5!&~2YpA}7A# z*um4ce9Po*4c~3co7DPs*0!B%+dpPa`gyC+e^yEQp}n4RkB)CKdG-9((Zk@fQyeD_c*8gy4e_w8KrRl;;Pr1ea!^5pZvfI9`Q;D8z zbNgcTxkK+%rmOGVpxcuioB#2z&Pml=pUUKSJNZ`3U$R}za;@*AlC-euCHHgUUvHjl zV|@JnrTHp5?M`~;>Ms7Q`0T~H`voVW-xelGuhGwq{~Wn$chmD*Kei=b+a47i7QXH5 zkD6DTZ+eEz%g=rz-C&u`Ct{AZ1QQ?xbOE&}KRNEjK^yVz?r6x7zcb|EJS3=afA^>DNYfueWfsn+YtQ89ZJ6 KT-G@yGywq0fj*r8 literal 0 HcmV?d00001 diff --git a/yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png.meta b/yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png.meta new file mode 100644 index 00000000..cb67a4ad --- /dev/null +++ b/yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 99aa4b3d604d99a45b82b8eda17b2130 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 35, y: 293, z: 35, w: 29} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/yyzl/20Milestone/image/Daily_mmhl3_merge_top_bg1.png.meta b/yyzl/20Milestone/image/Daily_mmhl3_merge_top_bg1.png.meta index f05a7412..e832902c 100644 --- a/yyzl/20Milestone/image/Daily_mmhl3_merge_top_bg1.png.meta +++ b/yyzl/20Milestone/image/Daily_mmhl3_merge_top_bg1.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 59, y: 0, z: 54, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/yyzl/02MainHome/image/DailyIcon/Daily_mmhl4_icn_lanzi.png b/yyzl/20Milestone/image/Daily_mmhl4_icn_lanzi.png similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl4_icn_lanzi.png rename to yyzl/20Milestone/image/Daily_mmhl4_icn_lanzi.png diff --git a/yyzl/02MainHome/image/DailyIcon/Daily_mmhl4_icn_lanzi.png.meta b/yyzl/20Milestone/image/Daily_mmhl4_icn_lanzi.png.meta similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl4_icn_lanzi.png.meta rename to yyzl/20Milestone/image/Daily_mmhl4_icn_lanzi.png.meta diff --git a/yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png b/yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png new file mode 100644 index 0000000000000000000000000000000000000000..07845933e58f9b1901ed72ad57d0106d0161bed7 GIT binary patch literal 2526 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