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 8cefca46..799de6c3 100644 Binary files a/Art_Bytes/ArtAtlasConfig.bytes and b/Art_Bytes/ArtAtlasConfig.bytes differ diff --git a/Art_Bytes/ArtResourceConfig.bytes b/Art_Bytes/ArtResourceConfig.bytes index 3fb32c85..55a5dff8 100644 Binary files a/Art_Bytes/ArtResourceConfig.bytes and b/Art_Bytes/ArtResourceConfig.bytes differ 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 00000000..af9b9dda Binary files /dev/null and b/yyzl/20Milestone/image/Daily_mmhl3_main_bg2.png differ 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 00000000..07845933 Binary files /dev/null and b/yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png differ diff --git a/yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png.meta b/yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png.meta new file mode 100644 index 00000000..3c188f5a --- /dev/null +++ b/yyzl/20Milestone/image/Daily_mmhl4_main_bg2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 2720cad0b30066a4fa5120558c92f37b +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: 34, y: 291, z: 35, w: 28} + 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_mmhl4_merge_top_bg1.png.meta b/yyzl/20Milestone/image/Daily_mmhl4_merge_top_bg1.png.meta index 1cd7eeaf..2745b154 100644 --- a/yyzl/20Milestone/image/Daily_mmhl4_merge_top_bg1.png.meta +++ b/yyzl/20Milestone/image/Daily_mmhl4_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: 58, y: 0, z: 55, 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_mmhl5_icn_lanzi.png b/yyzl/20Milestone/image/Daily_mmhl5_icn_lanzi.png similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl5_icn_lanzi.png rename to yyzl/20Milestone/image/Daily_mmhl5_icn_lanzi.png diff --git a/yyzl/02MainHome/image/DailyIcon/Daily_mmhl5_icn_lanzi.png.meta b/yyzl/20Milestone/image/Daily_mmhl5_icn_lanzi.png.meta similarity index 100% rename from yyzl/02MainHome/image/DailyIcon/Daily_mmhl5_icn_lanzi.png.meta rename to yyzl/20Milestone/image/Daily_mmhl5_icn_lanzi.png.meta diff --git a/yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png b/yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png new file mode 100644 index 00000000..0b3df4e1 Binary files /dev/null and b/yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png differ diff --git a/yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png.meta b/yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png.meta new file mode 100644 index 00000000..737d65e4 --- /dev/null +++ b/yyzl/20Milestone/image/Daily_mmhl5_main_bg2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 23e0364b5e58480408c69fdc497c11dd +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: 33, y: 270, z: 32, w: 52} + 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_mmhl5_merge_top_bg1.png.meta b/yyzl/20Milestone/image/Daily_mmhl5_merge_top_bg1.png.meta index b656f566..ad7f8b38 100644 --- a/yyzl/20Milestone/image/Daily_mmhl5_merge_top_bg1.png.meta +++ b/yyzl/20Milestone/image/Daily_mmhl5_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: 61, y: 0, z: 53, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: []