资源名重复修改提交

dev_chengFeng
jiaoyangna 2020-08-14 14:29:06 +08:00
parent cb8174dd85
commit d27b4b165f
10 changed files with 11 additions and 11 deletions

View File

@ -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:

View File

@ -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:

View File

@ -1,5 +1,5 @@
live2d_npc_boy.png
live2d_npc_boy_png.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear

View File

@ -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}

View File

@ -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

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0fbccfad579dec14c80de574c7ed5452
guid: 7666ac7e27b3bf44ca192fe0219aa3de
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View File

@ -1,5 +1,5 @@
live2d_npc_girl.png
live2d_npc_girl_png.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear

View File

@ -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}

View File

@ -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

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0c2e4ea5a255ade45b8ede0f57b60404
guid: 8219f2ea4e4f0b444aea4b45ca832b65
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000