diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_c_ynj_00083.prefab b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_ynj_00083.prefab index 33f6bb6fa5..c5e8cb0d7d 100644 --- a/Assets/ManagedResources/Prefabs/Live2d/live2d_c_ynj_00083.prefab +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_ynj_00083.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 6497446894056652630} - component: {fileID: 8384246622997365360} m_Layer: 0 - m_Name: c_ynj_00083 + m_Name: live2d_c_ynj_00083 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -57,7 +57,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_girl.prefab b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_girl.prefab index ab5bb59602..fc8b77bc89 100644 --- a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_girl.prefab +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_girl.prefab @@ -57,7 +57,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: diff --git a/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy.atlas.txt b/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy.atlas.txt index d6990728a9..2e5b8e00fe 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy.atlas.txt +++ b/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy.atlas.txt @@ -1,5 +1,5 @@ -live2d_npc_boy.png +live2d_npc_boy_png.png size: 1024,1024 format: RGBA8888 filter: Linear,Linear diff --git a/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Atlas.asset b/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Atlas.asset index 4079b52ded..1929595ce3 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Atlas.asset +++ b/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Atlas.asset @@ -14,4 +14,4 @@ MonoBehaviour: m_EditorClassIdentifier: atlasFile: {fileID: 4900000, guid: 77e27f0f20da4d94b9f6186fc4e8f01f, type: 3} materials: - - {fileID: 2100000, guid: 0fbccfad579dec14c80de574c7ed5452, type: 2} + - {fileID: 2100000, guid: 7666ac7e27b3bf44ca192fe0219aa3de, type: 2} diff --git a/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Material.mat b/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_live2d_npc_boy_png.mat similarity index 94% rename from Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Material.mat rename to Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_live2d_npc_boy_png.mat index 199a3a90d8..7c0ece7ec0 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Material.mat +++ b/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_live2d_npc_boy_png.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: live2d_npc_boy_Material + m_Name: live2d_npc_boy_live2d_npc_boy_png m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Material.mat.meta b/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_live2d_npc_boy_png.mat.meta similarity index 79% rename from Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Material.mat.meta rename to Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_live2d_npc_boy_png.mat.meta index 3dbedf2d61..fb6d4b8f3d 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_Material.mat.meta +++ b/Assets/ManagedResources/Spine/live2d_npc_boy/live2d_npc_boy_live2d_npc_boy_png.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0fbccfad579dec14c80de574c7ed5452 +guid: 7666ac7e27b3bf44ca192fe0219aa3de NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl.atlas.txt b/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl.atlas.txt index 689bd89392..5140e2af53 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl.atlas.txt +++ b/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl.atlas.txt @@ -1,5 +1,5 @@ -live2d_npc_girl.png +live2d_npc_girl_png.png size: 1024,1024 format: RGBA8888 filter: Linear,Linear diff --git a/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Atlas.asset b/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Atlas.asset index 225c243270..2617a7233d 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Atlas.asset +++ b/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Atlas.asset @@ -14,4 +14,4 @@ MonoBehaviour: m_EditorClassIdentifier: atlasFile: {fileID: 4900000, guid: 3e99bbf368aa22f43a72d8c2d916d2ff, type: 3} materials: - - {fileID: 2100000, guid: 0c2e4ea5a255ade45b8ede0f57b60404, type: 2} + - {fileID: 2100000, guid: 8219f2ea4e4f0b444aea4b45ca832b65, type: 2} diff --git a/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Material.mat b/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_live2d_npc_girl_png.mat similarity index 94% rename from Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Material.mat rename to Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_live2d_npc_girl_png.mat index 72042e81ca..879cf34573 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Material.mat +++ b/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_live2d_npc_girl_png.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: live2d_npc_girl_Material + m_Name: live2d_npc_girl_live2d_npc_girl_png m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Material.mat.meta b/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_live2d_npc_girl_png.mat.meta similarity index 79% rename from Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Material.mat.meta rename to Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_live2d_npc_girl_png.mat.meta index 06ec5ebc0f..10975d0275 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_Material.mat.meta +++ b/Assets/ManagedResources/Spine/live2d_npc_girl/live2d_npc_girl_live2d_npc_girl_png.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0c2e4ea5a255ade45b8ede0f57b60404 +guid: 8219f2ea4e4f0b444aea4b45ca832b65 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000