From 3675b3e8a0c2c0703b5530293e5b5bf77c5576aa Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 24 Aug 2020 14:54:33 +0800 Subject: [PATCH] spine commit --- .../Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.atlas.txt | 2 +- .../Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Atlas.asset | 3 +-- .../Spine/live2d_npc_map/live2d_npc_map.atlas.txt | 2 +- .../Spine/live2d_npc_map/live2d_npc_map_Atlas.asset | 2 +- .../Spine/live2d_npc_map/live2d_npc_map_Material.mat | 2 +- .../Spine/live2d_npc_map/live2d_npc_map_Material.mat.meta | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.atlas.txt b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.atlas.txt index c48fcf8663..9c4075f201 100644 --- a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.atlas.txt +++ b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.atlas.txt @@ -1,5 +1,5 @@ -ive2d_npc_map_nv.png +ive2d_npc_map_nv_png.png size: 1024,1024 format: RGBA8888 filter: Linear,Linear diff --git a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Atlas.asset b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Atlas.asset index ea86c9460c..057f334d25 100644 --- a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Atlas.asset +++ b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Atlas.asset @@ -13,5 +13,4 @@ MonoBehaviour: m_Name: ive2d_npc_map_nv_Atlas m_EditorClassIdentifier: atlasFile: {fileID: 4900000, guid: 174f4d67f2549d44ba6253c2c4862616, type: 3} - materials: - - {fileID: 2100000, guid: 201c0d253e1b776459f1966f9138d201, type: 2} + materials: [] diff --git a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map.atlas.txt b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map.atlas.txt index ea8db3450b..8393c38e67 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map.atlas.txt +++ b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map.atlas.txt @@ -1,5 +1,5 @@ -live2d_npc_map.png +live2d_npc_map_png.png size: 1024,1024 format: RGBA8888 filter: Linear,Linear diff --git a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Atlas.asset b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Atlas.asset index 06a9e648e1..1a83239c0f 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Atlas.asset +++ b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Atlas.asset @@ -14,4 +14,4 @@ MonoBehaviour: m_EditorClassIdentifier: atlasFile: {fileID: 4900000, guid: d4d9c867ba93190468604e99b72bc3a8, type: 3} materials: - - {fileID: 2100000, guid: 35e4fdf329b2235448a158a29f882788, type: 2} + - {fileID: 2100000, guid: c2bb688986a567e4fab27d66d9664b10, type: 2} diff --git a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat index 3743b55097..a82f6a722c 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat +++ b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: live2d_npc_map_Material + m_Name: live2d_npc_map_live2d_npc_map_png m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat.meta b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat.meta index 8040d13116..33b13dbf8e 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat.meta +++ b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 35e4fdf329b2235448a158a29f882788 +guid: c2bb688986a567e4fab27d66d9664b10 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000