diff --git a/Art_Bytes/ArtResourceConfig.bytes b/Art_Bytes/ArtResourceConfig.bytes index e2a767af..c4b01297 100644 Binary files a/Art_Bytes/ArtResourceConfig.bytes and b/Art_Bytes/ArtResourceConfig.bytes differ diff --git a/Art_Json/Common/CommonMergeIcon.json b/Art_Json/Common/CommonMergeIcon.json new file mode 100644 index 00000000..ee76527e --- /dev/null +++ b/Art_Json/Common/CommonMergeIcon.json @@ -0,0 +1,78 @@ +{ + "TableId": 104, + "TableName": "CommonMergeIcon", + "Items": [ + { + "Id": 1, + "Name": "merge_icon_circlebg_green", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_circlebg_green.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 2, + "Name": "merge_icon_circlebg_zise", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_circlebg_zise.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 3, + "Name": "merge_icon_circlebg_zise2", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Champship/Packed/merge_icon_circlebg_zise2.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 4, + "Name": "merge_icon_circlebg_blue", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_circlebg_blue.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 5, + "Name": "merge_icon_circlebg_blue2", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/17Champship/image/merge_icon_circlebg_blue2.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 6, + "Name": "merge_icn_Order-greenlinebg", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_Order-greenlinebg.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 7, + "Name": "merge_icn_Order-greenline", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_Order-greenline.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 8, + "Name": "merge_icon_circlebg_yellowblue", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_circlebg_yellowblue.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 9, + "Name": "merge_icon_yellowbg", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_yellowbg.png", + "SpineAssetPath": "", + "SpineAnimName": "" + } + ] +} \ No newline at end of file diff --git a/Art_Json/Common/CommonMergeIcon.json.meta b/Art_Json/Common/CommonMergeIcon.json.meta new file mode 100644 index 00000000..3da82f89 --- /dev/null +++ b/Art_Json/Common/CommonMergeIcon.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8c4b268e750bce4418df76688f23f56c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/LimitedEvent/LimitEventPath.json b/Art_Json/LimitedEvent/LimitEventPath.json index 5e56af4a..41ffa2ec 100644 --- a/Art_Json/LimitedEvent/LimitEventPath.json +++ b/Art_Json/LimitedEvent/LimitEventPath.json @@ -121,6 +121,14 @@ "SpritePath": "Assets/Art_SubModule/yyzl/18LimitEvent/Other/Limitedtime_icn_GJHS_che.png", "SpineAssetPath": "", "SpineAnimName": "" + }, + { + "Id": 16, + "Name": "Limitedtime_pic_guaidao", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/18LimitEvent/Other/Limitedtime_pic_guaidao.png", + "SpineAssetPath": "", + "SpineAnimName": "" } ] } \ No newline at end of file diff --git a/Art_Json/art_table_manifest.json b/Art_Json/art_table_manifest.json index d36a6632..26e5445c 100644 --- a/Art_Json/art_table_manifest.json +++ b/Art_Json/art_table_manifest.json @@ -15,6 +15,7 @@ "Assets/Art_SubModule/Art_Json/Common/CommonBackground.json", "Assets/Art_SubModule/Art_Json/Common/CommonButton.json", "Assets/Art_SubModule/Art_Json/Common/CommonIcon.json", + "Assets/Art_SubModule/Art_Json/Common/CommonMergeIcon.json", "Assets/Art_SubModule/Art_Json/Common/CommonPicPack.json", "Assets/Art_SubModule/Art_Json/Common/CommonPicProgress.json", "Assets/Art_SubModule/Art_Json/Common/EmailItemScriptConfig.json", diff --git a/Art_SO/Common/CommonMergeIcon.asset b/Art_SO/Common/CommonMergeIcon.asset new file mode 100644 index 00000000..cf528899 --- /dev/null +++ b/Art_SO/Common/CommonMergeIcon.asset @@ -0,0 +1,89 @@ +%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: CommonMergeIcon + m_EditorClassIdentifier: + TableId: 104 + TableName: CommonMergeIcon + Items: + - Id: 1 + Name: merge_icon_circlebg_green + Desc: + Sprite: {fileID: 21300000, guid: 8d1f51b52cd3eeb438d0a392fb64d833, type: 3} + SpritePath: Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_circlebg_green.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 2 + Name: merge_icon_circlebg_zise + Desc: + Sprite: {fileID: 21300000, guid: 38acc2573c4286c4f99d8b6cb40741b5, type: 3} + SpritePath: Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_circlebg_zise.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 3 + Name: merge_icon_circlebg_zise2 + Desc: + Sprite: {fileID: 21300000, guid: 69d194bda8b92d04cb7a628e5e2c291c, type: 3} + SpritePath: Assets/Art_SubModule/GameMain/UI/UISprites/Champship/Packed/merge_icon_circlebg_zise2.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 4 + Name: merge_icon_circlebg_blue + Desc: + Sprite: {fileID: 21300000, guid: f3cb6765d09f7b44caf479aae25bf92f, type: 3} + SpritePath: Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_circlebg_blue.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 5 + Name: merge_icon_circlebg_blue2 + Desc: + Sprite: {fileID: 21300000, guid: 28ed82b3d64f1bb4a907ae5312811a94, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/17Champship/image/merge_icon_circlebg_blue2.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 6 + Name: merge_icn_Order-greenlinebg + Desc: + Sprite: {fileID: 21300000, guid: 1e8bdb1a280422b4c8506be98f48cd6c, type: 3} + SpritePath: Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_Order-greenlinebg.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 7 + Name: merge_icn_Order-greenline + Desc: + Sprite: {fileID: 21300000, guid: b57678efa9f70614dbe5a0132c4d8d77, type: 3} + SpritePath: Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_Order-greenline.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 8 + Name: merge_icon_circlebg_yellowblue + Desc: + Sprite: {fileID: 21300000, guid: d85e487b0962f5b48b8364c2f9181409, type: 3} + SpritePath: Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_circlebg_yellowblue.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 9 + Name: merge_icon_yellowbg + Desc: + Sprite: {fileID: 21300000, guid: a864e4ccbf6ff94408cb2f73ce83e932, type: 3} + SpritePath: Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_yellowbg.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/Art_SO/Common/CommonMergeIcon.asset.meta b/Art_SO/Common/CommonMergeIcon.asset.meta new file mode 100644 index 00000000..4e0342f2 --- /dev/null +++ b/Art_SO/Common/CommonMergeIcon.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4e8accffcb9eb140a5a7cec0a2710ac +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_SO/LimitedEvent/LimitEventPath.asset b/Art_SO/LimitedEvent/LimitEventPath.asset index 03c8fead..96bddcc0 100644 --- a/Art_SO/LimitedEvent/LimitEventPath.asset +++ b/Art_SO/LimitedEvent/LimitEventPath.asset @@ -135,3 +135,11 @@ MonoBehaviour: SpineAsset: {fileID: 0} SpineAssetPath: SpineAnimName: + - Id: 16 + Name: Limitedtime_pic_guaidao + Desc: + Sprite: {fileID: 21300000, guid: 198a4690554cd084d8ea7d3f8dbde992, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/18LimitEvent/Other/Limitedtime_pic_guaidao.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: