diff --git a/Art_Bytes/ArtResourceConfig.bytes b/Art_Bytes/ArtResourceConfig.bytes index 4166aca7..1a6efa40 100644 Binary files a/Art_Bytes/ArtResourceConfig.bytes and b/Art_Bytes/ArtResourceConfig.bytes differ diff --git a/Art_Json/PetShopPanel.meta b/Art_Json/PetShopPanel.meta new file mode 100644 index 00000000..837c3749 --- /dev/null +++ b/Art_Json/PetShopPanel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c60eb417294ab144dac2817928dfb489 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/PetShopPanel/BlueBG.json b/Art_Json/PetShopPanel/BlueBG.json new file mode 100644 index 00000000..603d06fc --- /dev/null +++ b/Art_Json/PetShopPanel/BlueBG.json @@ -0,0 +1,46 @@ +{ + "TableId": 77, + "TableName": "BlueBG", + "Items": [ + { + "Id": 1, + "Name": "petshop_bg8", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg8.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 2, + "Name": "petshop_bg3", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg3.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 3, + "Name": "petshop_bg5", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg5.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 4, + "Name": "petshop_bg6", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg6.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 5, + "Name": "petshop_bg7", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg7.png", + "SpineAssetPath": "", + "SpineAnimName": "" + } + ] +} \ No newline at end of file diff --git a/Art_Json/PetShopPanel/BlueBG.json.meta b/Art_Json/PetShopPanel/BlueBG.json.meta new file mode 100644 index 00000000..16315887 --- /dev/null +++ b/Art_Json/PetShopPanel/BlueBG.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c76983ac00344bc46b1859c882977849 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/PetShopPanel/GreenBG.json b/Art_Json/PetShopPanel/GreenBG.json new file mode 100644 index 00000000..33154386 --- /dev/null +++ b/Art_Json/PetShopPanel/GreenBG.json @@ -0,0 +1,46 @@ +{ + "TableId": 76, + "TableName": "GreenBG", + "Items": [ + { + "Id": 1, + "Name": "petshop_bg8", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg8.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 2, + "Name": "petshop_bg10", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg10.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 3, + "Name": "petshop_bg5", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg5.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 4, + "Name": "petshop_bg9", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg9.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 5, + "Name": "petshop_bg11", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg11.png", + "SpineAssetPath": "", + "SpineAnimName": "" + } + ] +} \ No newline at end of file diff --git a/Art_Json/PetShopPanel/GreenBG.json.meta b/Art_Json/PetShopPanel/GreenBG.json.meta new file mode 100644 index 00000000..6fa679a4 --- /dev/null +++ b/Art_Json/PetShopPanel/GreenBG.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4f9d5bd26a6982f4b94f4f5371a9bd33 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_Json/art_table_manifest.json b/Art_Json/art_table_manifest.json index bf77a624..11bf07e3 100644 --- a/Art_Json/art_table_manifest.json +++ b/Art_Json/art_table_manifest.json @@ -68,6 +68,8 @@ "Assets/Art_SubModule/Art_Json/DecorateScene/Scene8Resource.json", "Assets/Art_SubModule/Art_Json/DecorateScene/Scene9Resource.json", "Assets/Art_SubModule/Art_Json/LimitedEvent/LimitedEventIcon.json", + "Assets/Art_SubModule/Art_Json/PetShopPanel/BlueBG.json", + "Assets/Art_SubModule/Art_Json/PetShopPanel/GreenBG.json", "Assets/Art_SubModule/Art_Json/Scene/LauncherMergeStoryPic.json", "Assets/Art_SubModule/Art_Json/Scene/SceneDataPic.json", "Assets/Art_SubModule/Art_Json/Scene/SceneExpression.json", diff --git a/Art_SO/PetShopPanel.meta b/Art_SO/PetShopPanel.meta new file mode 100644 index 00000000..b9b23734 --- /dev/null +++ b/Art_SO/PetShopPanel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97feec76cb099244996f2c06311a7a3a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_SO/PetShopPanel/BlueBG.asset b/Art_SO/PetShopPanel/BlueBG.asset new file mode 100644 index 00000000..a4d29314 --- /dev/null +++ b/Art_SO/PetShopPanel/BlueBG.asset @@ -0,0 +1,57 @@ +%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: BlueBG + m_EditorClassIdentifier: + TableId: 77 + TableName: BlueBG + Items: + - Id: 1 + Name: petshop_bg8 + Desc: + Sprite: {fileID: 21300000, guid: 2d9d8310ad808264aa04539c7fd665da, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg8.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 2 + Name: petshop_bg3 + Desc: + Sprite: {fileID: 21300000, guid: 4539b019c530e7c4bbb4f3b051edc63c, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg3.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 3 + Name: petshop_bg5 + Desc: + Sprite: {fileID: 21300000, guid: 018f19c216d6b7248852f88ab8ee124f, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg5.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 4 + Name: petshop_bg6 + Desc: + Sprite: {fileID: 21300000, guid: fc00159111c476e44bdd210e966ef91d, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg6.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 5 + Name: petshop_bg7 + Desc: + Sprite: {fileID: 21300000, guid: 0c01d1c68dae071478f511182af39225, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg7.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/Art_SO/PetShopPanel/BlueBG.asset.meta b/Art_SO/PetShopPanel/BlueBG.asset.meta new file mode 100644 index 00000000..b7a4b602 --- /dev/null +++ b/Art_SO/PetShopPanel/BlueBG.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21680c043c896374d8f95baaa1465b71 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Art_SO/PetShopPanel/GreenBG.asset b/Art_SO/PetShopPanel/GreenBG.asset new file mode 100644 index 00000000..8d284bff --- /dev/null +++ b/Art_SO/PetShopPanel/GreenBG.asset @@ -0,0 +1,57 @@ +%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: GreenBG + m_EditorClassIdentifier: + TableId: 76 + TableName: GreenBG + Items: + - Id: 1 + Name: petshop_bg8 + Desc: + Sprite: {fileID: 21300000, guid: 2d9d8310ad808264aa04539c7fd665da, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg8.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 2 + Name: petshop_bg10 + Desc: + Sprite: {fileID: 21300000, guid: b0fd875cbfb31af45b3e6427b4ab820b, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg10.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 3 + Name: petshop_bg5 + Desc: + Sprite: {fileID: 21300000, guid: 018f19c216d6b7248852f88ab8ee124f, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg5.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 4 + Name: petshop_bg9 + Desc: + Sprite: {fileID: 21300000, guid: 7e30ae2194eb8ca4bb9b4cf2ec41b00b, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg9.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 5 + Name: petshop_bg11 + Desc: + Sprite: {fileID: 21300000, guid: 6f2a0918b523c79429f565d603ec6754, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/12PetHome/image/petshop_bg11.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/Art_SO/PetShopPanel/GreenBG.asset.meta b/Art_SO/PetShopPanel/GreenBG.asset.meta new file mode 100644 index 00000000..b653b06b --- /dev/null +++ b/Art_SO/PetShopPanel/GreenBG.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abb81bac47d71e34bba2caaa8ca642f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: