From d75fcdc3733848252357fc2d7edfd6827ddebf19 Mon Sep 17 00:00:00 2001 From: liuzhiwei <liuzhiwei@qq.com> Date: Tue, 15 Dec 2020 14:16:42 +0800 Subject: [PATCH] 贴图修改 --- Assets/00000/package/Materials/Object_032.mat | 2 Assets/00000/package/Materials/Object_013.mat | 2 Assets/00000/package/Texture/Object_042.png | 0 Assets/00000/package/Texture/Object_041.png | 0 Assets/00000/package/Texture/Object_026_02.png.meta | 2 Assets/00000/package/Texture/Object_019_02.png | 0 Assets/00000/package/Materials/Object_012_03.mat | 4 Assets/00000/package/Texture/Object_013.png | 0 Assets/00000/package/Materials/Object_015_02.mat | 2 Assets/00000/package/Texture/Object_016_02.png | 0 Assets/00000/package/Materials/Object_039.mat | 2 Assets/00000/package/Materials/Object_042.mat | 2 Assets/00000/package/Texture/Object_019_02.png.meta | 14 +++ Assets/00000/package/Texture/Object_016_02.png.meta | 0 Assets/00000/package/Materials/Object_040.mat | 4 Assets/00000/package/Texture/Object_012_02.png | 0 Assets/00000/package/Texture/Object_012_02.png.meta | 2 Assets/00000/package/Materials/Object_027.mat | 2 Assets/00000/package/Texture/Object_014.png | 0 Assets/00000/package/Materials/Object_027.mat.meta | 2 Assets/00000/package/Materials/Object_014.mat.meta | 2 Assets/00000/package/Texture/Object_014.png.meta | 2 Assets/00000/package/Texture/Object_027_02.png.meta | 0 Assets/00000/package/Materials/Object_012_02.mat.meta | 2 Assets/00000/package/Texture/Object_015_02.png | 0 Assets/00000/package/Texture/Object_039.png.meta | 2 Assets/00000/package/Materials/Object_042.mat.meta | 2 Assets/00000/package/Materials/Object_026_02.mat.meta | 2 Assets/00000/package/Materials/Object_012_03.mat.meta | 2 Assets/00000/package/Texture/Object_018.png.meta | 2 Assets/00000/package/Texture/Object_039.png | 0 Assets/00000/package/Texture/Object_013.png.meta | 2 Assets/00000/package/Materials/Object_012_02.mat | 4 Assets/00000/package/Texture/Object_027_02.png | 0 Assets/00000/package/Materials/Object_040.mat.meta | 2 Assets/00000/package/Materials/Object_017_02.mat.meta | 2 Assets/00000/package/Materials/Object_017_02.mat | 4 Assets/00000/package/Texture/Object_017_02.png | 0 Assets/00000/package/Materials/Object_014.mat | 2 Assets/00000/package/Materials/Object_019_02.mat.meta | 2 Assets/00000/package/Texture/Object_027.png | 0 Assets/00000/package/Texture/Object_040.png.meta | 2 Assets/00000/package/Texture/Object_015_02.png.meta | 2 Assets/00000/package/Materials/Object_026_02.mat | 4 Assets/00000/package/Texture/Object_016.png | 0 Assets/00000/package/Materials/Object_039.mat.meta | 2 Assets/00000/package/Materials/Object_018.mat | 2 Assets/00000/package/Texture/Object_020.png.meta | 14 --- Assets/00000/package/Texture/Object_017_02.png.meta | 2 Assets/00000/package/Texture/Object_027.png.meta | 2 Assets/00000/package/Materials/Object_013.mat.meta | 2 Assets/00000/package/Materials/Object_015_02.mat.meta | 0 Assets/00000/package/Texture/Object_020.png | 0 /dev/null | 106 -------------------------- Assets/00000/package/Texture/Object_033.png | 0 Assets/00000/package/Materials/Object_033.mat | 2 Assets/00000/package/Materials/Object_041.mat.meta | 2 Assets/00000/package/Texture/Object_041.png.meta | 2 Assets/00000/package/Materials/Object_020.mat.meta | 2 Assets/00000/package/Texture/Object_016.png.meta | 2 Assets/00000/package/Materials/Object_019_02.mat | 4 Assets/00000/package/Texture/Object_012_03.png | 0 Assets/00000/package/Materials/Object_016_02.mat | 2 Assets/00000/package/Texture/Object_018.png | 0 Assets/00000/package/Materials/Object_018.mat.meta | 2 Assets/00000/package/Texture/Object_026_02.png | 0 Assets/00000/package/Texture/Object_012_03.png.meta | 2 Assets/00000/package/Texture/Object_040.png | 0 Assets/00000/package/Materials/Object_020.mat | 4 Assets/00000/package/Materials/Object_041.mat | 2 Assets/00000/package/Materials/Object_016_02.mat.meta | 0 71 files changed, 66 insertions(+), 172 deletions(-) diff --git a/Assets/00000/package/Materials/Object_043.mat b/Assets/00000/package/Materials/Object_012_02.mat similarity index 86% copy from Assets/00000/package/Materials/Object_043.mat copy to Assets/00000/package/Materials/Object_012_02.mat index 3d7fbb5..2532dc5 100644 --- a/Assets/00000/package/Materials/Object_043.mat +++ b/Assets/00000/package/Materials/Object_012_02.mat @@ -7,7 +7,7 @@ m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Object_043 + m_Name: Object_012_02 m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: f0575f2b43324a84a8620c6c037569f9, type: 3} + m_Texture: {fileID: 2800000, guid: 0ef67ab657bd79b44a869214d0e03529, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_044.mat.meta b/Assets/00000/package/Materials/Object_012_02.mat.meta similarity index 78% copy from Assets/00000/package/Materials/Object_044.mat.meta copy to Assets/00000/package/Materials/Object_012_02.mat.meta index 7eab75c..07f439c 100644 --- a/Assets/00000/package/Materials/Object_044.mat.meta +++ b/Assets/00000/package/Materials/Object_012_02.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7348761d4b499cd4b80c51e0be208c8c +guid: f60b682ad01b7e9469d3271365ce55e0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_043.mat b/Assets/00000/package/Materials/Object_012_03.mat similarity index 86% copy from Assets/00000/package/Materials/Object_043.mat copy to Assets/00000/package/Materials/Object_012_03.mat index 3d7fbb5..48d7bd1 100644 --- a/Assets/00000/package/Materials/Object_043.mat +++ b/Assets/00000/package/Materials/Object_012_03.mat @@ -7,7 +7,7 @@ m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Object_043 + m_Name: Object_012_03 m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: f0575f2b43324a84a8620c6c037569f9, type: 3} + m_Texture: {fileID: 2800000, guid: dedad079f89aa22439e38d2d160f1432, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_044.mat.meta b/Assets/00000/package/Materials/Object_012_03.mat.meta similarity index 78% copy from Assets/00000/package/Materials/Object_044.mat.meta copy to Assets/00000/package/Materials/Object_012_03.mat.meta index 7eab75c..fa38fc9 100644 --- a/Assets/00000/package/Materials/Object_044.mat.meta +++ b/Assets/00000/package/Materials/Object_012_03.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7348761d4b499cd4b80c51e0be208c8c +guid: 7ce909cf0f01ea94b800865d2c6b3109 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_013.mat b/Assets/00000/package/Materials/Object_013.mat index b2fef60..d0b4bba 100644 --- a/Assets/00000/package/Materials/Object_013.mat +++ b/Assets/00000/package/Materials/Object_013.mat @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 0ef67ab657bd79b44a869214d0e03529, type: 3} + m_Texture: {fileID: 2800000, guid: c4aac5d7b9dbc8548901b7b70d406202, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_013.mat.meta b/Assets/00000/package/Materials/Object_013.mat.meta index 07f439c..01c051c 100644 --- a/Assets/00000/package/Materials/Object_013.mat.meta +++ b/Assets/00000/package/Materials/Object_013.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f60b682ad01b7e9469d3271365ce55e0 +guid: 3212f2aec1e798a4ca41aad3c464c406 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_014.mat b/Assets/00000/package/Materials/Object_014.mat index ffacd6e..db8e47a 100644 --- a/Assets/00000/package/Materials/Object_014.mat +++ b/Assets/00000/package/Materials/Object_014.mat @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: dedad079f89aa22439e38d2d160f1432, type: 3} + m_Texture: {fileID: 2800000, guid: 2d4d61cf55cb82944bc3ddeda3674482, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_014.mat.meta b/Assets/00000/package/Materials/Object_014.mat.meta index fa38fc9..2b7e357 100644 --- a/Assets/00000/package/Materials/Object_014.mat.meta +++ b/Assets/00000/package/Materials/Object_014.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7ce909cf0f01ea94b800865d2c6b3109 +guid: c7a5f37af539b7048b5b117cc23d7a20 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_016.mat b/Assets/00000/package/Materials/Object_015_02.mat similarity index 98% rename from Assets/00000/package/Materials/Object_016.mat rename to Assets/00000/package/Materials/Object_015_02.mat index 103791e..9c8d7b4 100644 --- a/Assets/00000/package/Materials/Object_016.mat +++ b/Assets/00000/package/Materials/Object_015_02.mat @@ -7,7 +7,7 @@ m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Object_016 + m_Name: Object_015_02 m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/00000/package/Materials/Object_016.mat.meta b/Assets/00000/package/Materials/Object_015_02.mat.meta similarity index 100% rename from Assets/00000/package/Materials/Object_016.mat.meta rename to Assets/00000/package/Materials/Object_015_02.mat.meta diff --git a/Assets/00000/package/Materials/Object_046.mat b/Assets/00000/package/Materials/Object_016_02.mat similarity index 96% rename from Assets/00000/package/Materials/Object_046.mat rename to Assets/00000/package/Materials/Object_016_02.mat index 509fa70..a983483 100644 --- a/Assets/00000/package/Materials/Object_046.mat +++ b/Assets/00000/package/Materials/Object_016_02.mat @@ -7,7 +7,7 @@ m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Object_046 + m_Name: Object_016_02 m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/00000/package/Materials/Object_046.mat.meta b/Assets/00000/package/Materials/Object_016_02.mat.meta similarity index 100% rename from Assets/00000/package/Materials/Object_046.mat.meta rename to Assets/00000/package/Materials/Object_016_02.mat.meta diff --git a/Assets/00000/package/Materials/Object_043.mat b/Assets/00000/package/Materials/Object_017_02.mat similarity index 86% copy from Assets/00000/package/Materials/Object_043.mat copy to Assets/00000/package/Materials/Object_017_02.mat index 3d7fbb5..44cb039 100644 --- a/Assets/00000/package/Materials/Object_043.mat +++ b/Assets/00000/package/Materials/Object_017_02.mat @@ -7,7 +7,7 @@ m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Object_043 + m_Name: Object_017_02 m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: f0575f2b43324a84a8620c6c037569f9, type: 3} + m_Texture: {fileID: 2800000, guid: e0693b3a367501341a817d9754ed5ba3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_044.mat.meta b/Assets/00000/package/Materials/Object_017_02.mat.meta similarity index 78% copy from Assets/00000/package/Materials/Object_044.mat.meta copy to Assets/00000/package/Materials/Object_017_02.mat.meta index 7eab75c..71b8ac6 100644 --- a/Assets/00000/package/Materials/Object_044.mat.meta +++ b/Assets/00000/package/Materials/Object_017_02.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7348761d4b499cd4b80c51e0be208c8c +guid: 9980938c3cfd00349a790d32cc2b7bcf NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_018.mat b/Assets/00000/package/Materials/Object_018.mat index fe3fb01..c860013 100644 --- a/Assets/00000/package/Materials/Object_018.mat +++ b/Assets/00000/package/Materials/Object_018.mat @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: e0693b3a367501341a817d9754ed5ba3, type: 3} + m_Texture: {fileID: 2800000, guid: 67715cc79370bc24cae3a7e9f371327b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_018.mat.meta b/Assets/00000/package/Materials/Object_018.mat.meta index 71b8ac6..96a2d73 100644 --- a/Assets/00000/package/Materials/Object_018.mat.meta +++ b/Assets/00000/package/Materials/Object_018.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9980938c3cfd00349a790d32cc2b7bcf +guid: d341bae747316df4fb3a12af5de2034c NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_043.mat b/Assets/00000/package/Materials/Object_019_02.mat similarity index 86% copy from Assets/00000/package/Materials/Object_043.mat copy to Assets/00000/package/Materials/Object_019_02.mat index 3d7fbb5..e4dabed 100644 --- a/Assets/00000/package/Materials/Object_043.mat +++ b/Assets/00000/package/Materials/Object_019_02.mat @@ -7,7 +7,7 @@ m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Object_043 + m_Name: Object_019_02 m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: f0575f2b43324a84a8620c6c037569f9, type: 3} + m_Texture: {fileID: 2800000, guid: 9738d7a8b07146b40839520ff97601de, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_044.mat.meta b/Assets/00000/package/Materials/Object_019_02.mat.meta similarity index 78% copy from Assets/00000/package/Materials/Object_044.mat.meta copy to Assets/00000/package/Materials/Object_019_02.mat.meta index 7eab75c..bfd85fa 100644 --- a/Assets/00000/package/Materials/Object_044.mat.meta +++ b/Assets/00000/package/Materials/Object_019_02.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7348761d4b499cd4b80c51e0be208c8c +guid: 61b08f709e23f944796106b382d53b5e NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_020.mat b/Assets/00000/package/Materials/Object_020.mat index 95e195d..cb2ac7f 100644 --- a/Assets/00000/package/Materials/Object_020.mat +++ b/Assets/00000/package/Materials/Object_020.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Object_020 - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 9738d7a8b07146b40839520ff97601de, type: 3} + m_Texture: {fileID: 2800000, guid: d415c482f9184b34599662d3e0b81acf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_020.mat.meta b/Assets/00000/package/Materials/Object_020.mat.meta index bfd85fa..37bbccb 100644 --- a/Assets/00000/package/Materials/Object_020.mat.meta +++ b/Assets/00000/package/Materials/Object_020.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 61b08f709e23f944796106b382d53b5e +guid: 0afb3d21e5d246143a40bd43cd515b3e NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_043.mat b/Assets/00000/package/Materials/Object_026_02.mat similarity index 86% rename from Assets/00000/package/Materials/Object_043.mat rename to Assets/00000/package/Materials/Object_026_02.mat index 3d7fbb5..1622706 100644 --- a/Assets/00000/package/Materials/Object_043.mat +++ b/Assets/00000/package/Materials/Object_026_02.mat @@ -7,7 +7,7 @@ m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Object_043 + m_Name: Object_026_02 m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: f0575f2b43324a84a8620c6c037569f9, type: 3} + m_Texture: {fileID: 2800000, guid: 24ec7207f203441429bc704a32ca20e6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_044.mat.meta b/Assets/00000/package/Materials/Object_026_02.mat.meta similarity index 78% rename from Assets/00000/package/Materials/Object_044.mat.meta rename to Assets/00000/package/Materials/Object_026_02.mat.meta index 7eab75c..9f48952 100644 --- a/Assets/00000/package/Materials/Object_044.mat.meta +++ b/Assets/00000/package/Materials/Object_026_02.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7348761d4b499cd4b80c51e0be208c8c +guid: 0b330d0dd1bce3f44b1bea07393e5e85 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_027.mat b/Assets/00000/package/Materials/Object_027.mat index 680129f..1096be3 100644 --- a/Assets/00000/package/Materials/Object_027.mat +++ b/Assets/00000/package/Materials/Object_027.mat @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 24ec7207f203441429bc704a32ca20e6, type: 3} + m_Texture: {fileID: 2800000, guid: ff5e054548411de41b2aea12bb18ed17, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_027.mat.meta b/Assets/00000/package/Materials/Object_027.mat.meta index 9f48952..f86a5fc 100644 --- a/Assets/00000/package/Materials/Object_027.mat.meta +++ b/Assets/00000/package/Materials/Object_027.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0b330d0dd1bce3f44b1bea07393e5e85 +guid: 455377406e8655b4bb5664d06f7935cc NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_032.mat b/Assets/00000/package/Materials/Object_032.mat index a7194bc..7cc722a 100644 --- a/Assets/00000/package/Materials/Object_032.mat +++ b/Assets/00000/package/Materials/Object_032.mat @@ -7,7 +7,7 @@ m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Object_033 + m_Name: Object_032 m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/00000/package/Materials/Object_033.mat b/Assets/00000/package/Materials/Object_033.mat index 7f9a30f..67957c9 100644 --- a/Assets/00000/package/Materials/Object_033.mat +++ b/Assets/00000/package/Materials/Object_033.mat @@ -7,7 +7,7 @@ m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Object_035 + m_Name: Object_033 m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/00000/package/Materials/Object_039.mat b/Assets/00000/package/Materials/Object_039.mat index 1d5a927..9589689 100644 --- a/Assets/00000/package/Materials/Object_039.mat +++ b/Assets/00000/package/Materials/Object_039.mat @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: ff5e054548411de41b2aea12bb18ed17, type: 3} + m_Texture: {fileID: 2800000, guid: 3a9c88a2223e7a341964ace97e6aec02, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_039.mat.meta b/Assets/00000/package/Materials/Object_039.mat.meta index f86a5fc..0da7266 100644 --- a/Assets/00000/package/Materials/Object_039.mat.meta +++ b/Assets/00000/package/Materials/Object_039.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 455377406e8655b4bb5664d06f7935cc +guid: b664a7eef3ea00845b430d5c2078be96 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_040.mat b/Assets/00000/package/Materials/Object_040.mat index bfad91d..33596e0 100644 --- a/Assets/00000/package/Materials/Object_040.mat +++ b/Assets/00000/package/Materials/Object_040.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Object_040 - m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: d415c482f9184b34599662d3e0b81acf, type: 3} + m_Texture: {fileID: 2800000, guid: f0575f2b43324a84a8620c6c037569f9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_040.mat.meta b/Assets/00000/package/Materials/Object_040.mat.meta index 37bbccb..ef60623 100644 --- a/Assets/00000/package/Materials/Object_040.mat.meta +++ b/Assets/00000/package/Materials/Object_040.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0afb3d21e5d246143a40bd43cd515b3e +guid: e3bd0edcdeaab4d4982cc56f74286a0b NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_041.mat b/Assets/00000/package/Materials/Object_041.mat index 0df56ac..7c6467c 100644 --- a/Assets/00000/package/Materials/Object_041.mat +++ b/Assets/00000/package/Materials/Object_041.mat @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 67715cc79370bc24cae3a7e9f371327b, type: 3} + m_Texture: {fileID: 2800000, guid: 42d5a7b4c964bfd42b8bc354f96203d5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_041.mat.meta b/Assets/00000/package/Materials/Object_041.mat.meta index 96a2d73..7eab75c 100644 --- a/Assets/00000/package/Materials/Object_041.mat.meta +++ b/Assets/00000/package/Materials/Object_041.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d341bae747316df4fb3a12af5de2034c +guid: 7348761d4b499cd4b80c51e0be208c8c NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_042.mat b/Assets/00000/package/Materials/Object_042.mat index b352848..1d022b4 100644 --- a/Assets/00000/package/Materials/Object_042.mat +++ b/Assets/00000/package/Materials/Object_042.mat @@ -20,7 +20,7 @@ serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 3a9c88a2223e7a341964ace97e6aec02, type: 3} + m_Texture: {fileID: 2800000, guid: 1c34d8a1de6a6da408fae5fa526b97c0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/00000/package/Materials/Object_042.mat.meta b/Assets/00000/package/Materials/Object_042.mat.meta index 0da7266..8b50998 100644 --- a/Assets/00000/package/Materials/Object_042.mat.meta +++ b/Assets/00000/package/Materials/Object_042.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b664a7eef3ea00845b430d5c2078be96 +guid: c67380ad15b962f4da958b32dcb96ce3 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/00000/package/Materials/Object_043.mat.meta b/Assets/00000/package/Materials/Object_043.mat.meta deleted file mode 100644 index ef60623..0000000 --- a/Assets/00000/package/Materials/Object_043.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e3bd0edcdeaab4d4982cc56f74286a0b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/00000/package/Materials/Object_044.mat b/Assets/00000/package/Materials/Object_044.mat deleted file mode 100644 index 0e8a905..0000000 --- a/Assets/00000/package/Materials/Object_044.mat +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Object_044 - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 42d5a7b4c964bfd42b8bc354f96203d5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _InvFade: 1 - m_Colors: - - _TintColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/00000/package/Materials/Object_045.mat b/Assets/00000/package/Materials/Object_045.mat deleted file mode 100644 index 760247f..0000000 --- a/Assets/00000/package/Materials/Object_045.mat +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Object_045 - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 1c34d8a1de6a6da408fae5fa526b97c0, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _InvFade: 1 - m_Colors: - - _TintColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/00000/package/Materials/Object_045.mat.meta b/Assets/00000/package/Materials/Object_045.mat.meta deleted file mode 100644 index 8b50998..0000000 --- a/Assets/00000/package/Materials/Object_045.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c67380ad15b962f4da958b32dcb96ce3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/00000/package/Materials/Object_048.mat b/Assets/00000/package/Materials/Object_048.mat deleted file mode 100644 index 6eadcd4..0000000 --- a/Assets/00000/package/Materials/Object_048.mat +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Object_048 - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: c4aac5d7b9dbc8548901b7b70d406202, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _InvFade: 1 - m_Colors: - - _TintColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/00000/package/Materials/Object_048.mat.meta b/Assets/00000/package/Materials/Object_048.mat.meta deleted file mode 100644 index 01c051c..0000000 --- a/Assets/00000/package/Materials/Object_048.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3212f2aec1e798a4ca41aad3c464c406 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/00000/package/Materials/Object_049.mat b/Assets/00000/package/Materials/Object_049.mat deleted file mode 100644 index 87db978..0000000 --- a/Assets/00000/package/Materials/Object_049.mat +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Object_049 - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 2d4d61cf55cb82944bc3ddeda3674482, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _InvFade: 1 - m_Colors: - - _TintColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/00000/package/Materials/Object_049.mat.meta b/Assets/00000/package/Materials/Object_049.mat.meta deleted file mode 100644 index 2b7e357..0000000 --- a/Assets/00000/package/Materials/Object_049.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c7a5f37af539b7048b5b117cc23d7a20 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/00000/package/Texture/Object_012_02.png b/Assets/00000/package/Texture/Object_012_02.png new file mode 100644 index 0000000..003833e --- /dev/null +++ b/Assets/00000/package/Texture/Object_012_02.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_045.png.meta b/Assets/00000/package/Texture/Object_012_02.png.meta similarity index 98% copy from Assets/00000/package/Texture/Object_045.png.meta copy to Assets/00000/package/Texture/Object_012_02.png.meta index 93ae199..12ac27a 100644 --- a/Assets/00000/package/Texture/Object_045.png.meta +++ b/Assets/00000/package/Texture/Object_012_02.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c34d8a1de6a6da408fae5fa526b97c0 +guid: 0ef67ab657bd79b44a869214d0e03529 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_012_03.png b/Assets/00000/package/Texture/Object_012_03.png new file mode 100644 index 0000000..74ecc44 --- /dev/null +++ b/Assets/00000/package/Texture/Object_012_03.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_045.png.meta b/Assets/00000/package/Texture/Object_012_03.png.meta similarity index 98% copy from Assets/00000/package/Texture/Object_045.png.meta copy to Assets/00000/package/Texture/Object_012_03.png.meta index 93ae199..34180d1 100644 --- a/Assets/00000/package/Texture/Object_045.png.meta +++ b/Assets/00000/package/Texture/Object_012_03.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c34d8a1de6a6da408fae5fa526b97c0 +guid: dedad079f89aa22439e38d2d160f1432 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_013.png b/Assets/00000/package/Texture/Object_013.png index 003833e..8ba0e6a 100644 --- a/Assets/00000/package/Texture/Object_013.png +++ b/Assets/00000/package/Texture/Object_013.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_013.png.meta b/Assets/00000/package/Texture/Object_013.png.meta index 12ac27a..8359869 100644 --- a/Assets/00000/package/Texture/Object_013.png.meta +++ b/Assets/00000/package/Texture/Object_013.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0ef67ab657bd79b44a869214d0e03529 +guid: c4aac5d7b9dbc8548901b7b70d406202 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_014.png b/Assets/00000/package/Texture/Object_014.png index 74ecc44..508a332 100644 --- a/Assets/00000/package/Texture/Object_014.png +++ b/Assets/00000/package/Texture/Object_014.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_014.png.meta b/Assets/00000/package/Texture/Object_014.png.meta index 34180d1..f9c41ae 100644 --- a/Assets/00000/package/Texture/Object_014.png.meta +++ b/Assets/00000/package/Texture/Object_014.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dedad079f89aa22439e38d2d160f1432 +guid: 2d4d61cf55cb82944bc3ddeda3674482 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_015_02.png b/Assets/00000/package/Texture/Object_015_02.png new file mode 100644 index 0000000..d3bdaab --- /dev/null +++ b/Assets/00000/package/Texture/Object_015_02.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_045.png.meta b/Assets/00000/package/Texture/Object_015_02.png.meta similarity index 98% rename from Assets/00000/package/Texture/Object_045.png.meta rename to Assets/00000/package/Texture/Object_015_02.png.meta index 93ae199..689b3ae 100644 --- a/Assets/00000/package/Texture/Object_045.png.meta +++ b/Assets/00000/package/Texture/Object_015_02.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c34d8a1de6a6da408fae5fa526b97c0 +guid: 0bee57d6fe235624aa8d493f1453b21c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_016.png b/Assets/00000/package/Texture/Object_016.png index d3bdaab..354482f 100644 --- a/Assets/00000/package/Texture/Object_016.png +++ b/Assets/00000/package/Texture/Object_016.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_016.png.meta b/Assets/00000/package/Texture/Object_016.png.meta index 689b3ae..eb46cce 100644 --- a/Assets/00000/package/Texture/Object_016.png.meta +++ b/Assets/00000/package/Texture/Object_016.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0bee57d6fe235624aa8d493f1453b21c +guid: a285c7fc358bf1a48b95099d15243acd TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_047.png b/Assets/00000/package/Texture/Object_016_02.png similarity index 100% rename from Assets/00000/package/Texture/Object_047.png rename to Assets/00000/package/Texture/Object_016_02.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_047.png.meta b/Assets/00000/package/Texture/Object_016_02.png.meta similarity index 100% rename from Assets/00000/package/Texture/Object_047.png.meta rename to Assets/00000/package/Texture/Object_016_02.png.meta diff --git a/Assets/00000/package/Texture/Object_017_02.png b/Assets/00000/package/Texture/Object_017_02.png new file mode 100644 index 0000000..d2b90c8 --- /dev/null +++ b/Assets/00000/package/Texture/Object_017_02.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_045.png.meta b/Assets/00000/package/Texture/Object_017_02.png.meta similarity index 98% copy from Assets/00000/package/Texture/Object_045.png.meta copy to Assets/00000/package/Texture/Object_017_02.png.meta index 93ae199..bceb803 100644 --- a/Assets/00000/package/Texture/Object_045.png.meta +++ b/Assets/00000/package/Texture/Object_017_02.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c34d8a1de6a6da408fae5fa526b97c0 +guid: e0693b3a367501341a817d9754ed5ba3 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_018.png b/Assets/00000/package/Texture/Object_018.png index d2b90c8..c226b5c 100644 --- a/Assets/00000/package/Texture/Object_018.png +++ b/Assets/00000/package/Texture/Object_018.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_018.png.meta b/Assets/00000/package/Texture/Object_018.png.meta index bceb803..53a90a0 100644 --- a/Assets/00000/package/Texture/Object_018.png.meta +++ b/Assets/00000/package/Texture/Object_018.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0693b3a367501341a817d9754ed5ba3 +guid: 67715cc79370bc24cae3a7e9f371327b TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_019_02.png b/Assets/00000/package/Texture/Object_019_02.png new file mode 100644 index 0000000..da387e5 --- /dev/null +++ b/Assets/00000/package/Texture/Object_019_02.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_045.png.meta b/Assets/00000/package/Texture/Object_019_02.png.meta similarity index 86% copy from Assets/00000/package/Texture/Object_045.png.meta copy to Assets/00000/package/Texture/Object_019_02.png.meta index 93ae199..6937990 100644 --- a/Assets/00000/package/Texture/Object_045.png.meta +++ b/Assets/00000/package/Texture/Object_019_02.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c34d8a1de6a6da408fae5fa526b97c0 +guid: 9738d7a8b07146b40839520ff97601de TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -85,6 +85,18 @@ overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/00000/package/Texture/Object_020.png b/Assets/00000/package/Texture/Object_020.png index da387e5..ba3e467 100644 --- a/Assets/00000/package/Texture/Object_020.png +++ b/Assets/00000/package/Texture/Object_020.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_020.png.meta b/Assets/00000/package/Texture/Object_020.png.meta index 6937990..d214401 100644 --- a/Assets/00000/package/Texture/Object_020.png.meta +++ b/Assets/00000/package/Texture/Object_020.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9738d7a8b07146b40839520ff97601de +guid: d415c482f9184b34599662d3e0b81acf TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -83,18 +83,6 @@ crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 4 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/00000/package/Texture/Object_026_02.png b/Assets/00000/package/Texture/Object_026_02.png new file mode 100644 index 0000000..f443d60 --- /dev/null +++ b/Assets/00000/package/Texture/Object_026_02.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_045.png.meta b/Assets/00000/package/Texture/Object_026_02.png.meta similarity index 98% copy from Assets/00000/package/Texture/Object_045.png.meta copy to Assets/00000/package/Texture/Object_026_02.png.meta index 93ae199..4ed106b 100644 --- a/Assets/00000/package/Texture/Object_045.png.meta +++ b/Assets/00000/package/Texture/Object_026_02.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c34d8a1de6a6da408fae5fa526b97c0 +guid: 24ec7207f203441429bc704a32ca20e6 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_027.png b/Assets/00000/package/Texture/Object_027.png index f443d60..ec9e610 100644 --- a/Assets/00000/package/Texture/Object_027.png +++ b/Assets/00000/package/Texture/Object_027.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_027.png.meta b/Assets/00000/package/Texture/Object_027.png.meta index 4ed106b..2415492 100644 --- a/Assets/00000/package/Texture/Object_027.png.meta +++ b/Assets/00000/package/Texture/Object_027.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 24ec7207f203441429bc704a32ca20e6 +guid: ff5e054548411de41b2aea12bb18ed17 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_039_02.png b/Assets/00000/package/Texture/Object_027_02.png similarity index 100% rename from Assets/00000/package/Texture/Object_039_02.png rename to Assets/00000/package/Texture/Object_027_02.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_039_02.png.meta b/Assets/00000/package/Texture/Object_027_02.png.meta similarity index 100% rename from Assets/00000/package/Texture/Object_039_02.png.meta rename to Assets/00000/package/Texture/Object_027_02.png.meta diff --git a/Assets/00000/package/Texture/Object_033.png b/Assets/00000/package/Texture/Object_033.png index bd1de30..b7f0494 100644 --- a/Assets/00000/package/Texture/Object_033.png +++ b/Assets/00000/package/Texture/Object_033.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_039.png b/Assets/00000/package/Texture/Object_039.png index ec9e610..999bfae 100644 --- a/Assets/00000/package/Texture/Object_039.png +++ b/Assets/00000/package/Texture/Object_039.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_039.png.meta b/Assets/00000/package/Texture/Object_039.png.meta index 2415492..946e8f4 100644 --- a/Assets/00000/package/Texture/Object_039.png.meta +++ b/Assets/00000/package/Texture/Object_039.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ff5e054548411de41b2aea12bb18ed17 +guid: 3a9c88a2223e7a341964ace97e6aec02 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_040.png b/Assets/00000/package/Texture/Object_040.png index ba3e467..c708b5f 100644 --- a/Assets/00000/package/Texture/Object_040.png +++ b/Assets/00000/package/Texture/Object_040.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_040.png.meta b/Assets/00000/package/Texture/Object_040.png.meta index d214401..5846439 100644 --- a/Assets/00000/package/Texture/Object_040.png.meta +++ b/Assets/00000/package/Texture/Object_040.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d415c482f9184b34599662d3e0b81acf +guid: f0575f2b43324a84a8620c6c037569f9 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_041.png b/Assets/00000/package/Texture/Object_041.png index c226b5c..56d7d60 100644 --- a/Assets/00000/package/Texture/Object_041.png +++ b/Assets/00000/package/Texture/Object_041.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_041.png.meta b/Assets/00000/package/Texture/Object_041.png.meta index 53a90a0..3dbf66a 100644 --- a/Assets/00000/package/Texture/Object_041.png.meta +++ b/Assets/00000/package/Texture/Object_041.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 67715cc79370bc24cae3a7e9f371327b +guid: 42d5a7b4c964bfd42b8bc354f96203d5 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/00000/package/Texture/Object_042.png b/Assets/00000/package/Texture/Object_042.png index 999bfae..97e16ff 100644 --- a/Assets/00000/package/Texture/Object_042.png +++ b/Assets/00000/package/Texture/Object_042.png Binary files differ diff --git a/Assets/00000/package/Texture/Object_043.png b/Assets/00000/package/Texture/Object_043.png deleted file mode 100644 index c708b5f..0000000 --- a/Assets/00000/package/Texture/Object_043.png +++ /dev/null Binary files differ diff --git a/Assets/00000/package/Texture/Object_043.png.meta b/Assets/00000/package/Texture/Object_043.png.meta deleted file mode 100644 index 5846439..0000000 --- a/Assets/00000/package/Texture/Object_043.png.meta +++ /dev/null @@ -1,106 +0,0 @@ -fileFormatVersion: 2 -guid: f0575f2b43324a84a8620c6c037569f9 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/00000/package/Texture/Object_044.png b/Assets/00000/package/Texture/Object_044.png deleted file mode 100644 index 56d7d60..0000000 --- a/Assets/00000/package/Texture/Object_044.png +++ /dev/null Binary files differ diff --git a/Assets/00000/package/Texture/Object_044.png.meta b/Assets/00000/package/Texture/Object_044.png.meta deleted file mode 100644 index 3dbf66a..0000000 --- a/Assets/00000/package/Texture/Object_044.png.meta +++ /dev/null @@ -1,106 +0,0 @@ -fileFormatVersion: 2 -guid: 42d5a7b4c964bfd42b8bc354f96203d5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/00000/package/Texture/Object_045.png b/Assets/00000/package/Texture/Object_045.png deleted file mode 100644 index 97e16ff..0000000 --- a/Assets/00000/package/Texture/Object_045.png +++ /dev/null Binary files differ diff --git a/Assets/00000/package/Texture/Object_046.png b/Assets/00000/package/Texture/Object_046.png deleted file mode 100644 index 354482f..0000000 --- a/Assets/00000/package/Texture/Object_046.png +++ /dev/null Binary files differ diff --git a/Assets/00000/package/Texture/Object_046.png.meta b/Assets/00000/package/Texture/Object_046.png.meta deleted file mode 100644 index eb46cce..0000000 --- a/Assets/00000/package/Texture/Object_046.png.meta +++ /dev/null @@ -1,106 +0,0 @@ -fileFormatVersion: 2 -guid: a285c7fc358bf1a48b95099d15243acd -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/00000/package/Texture/Object_048.png b/Assets/00000/package/Texture/Object_048.png deleted file mode 100644 index 8ba0e6a..0000000 --- a/Assets/00000/package/Texture/Object_048.png +++ /dev/null Binary files differ diff --git a/Assets/00000/package/Texture/Object_048.png.meta b/Assets/00000/package/Texture/Object_048.png.meta deleted file mode 100644 index 8359869..0000000 --- a/Assets/00000/package/Texture/Object_048.png.meta +++ /dev/null @@ -1,106 +0,0 @@ -fileFormatVersion: 2 -guid: c4aac5d7b9dbc8548901b7b70d406202 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/00000/package/Texture/Object_049.png b/Assets/00000/package/Texture/Object_049.png deleted file mode 100644 index 508a332..0000000 --- a/Assets/00000/package/Texture/Object_049.png +++ /dev/null Binary files differ diff --git a/Assets/00000/package/Texture/Object_049.png.meta b/Assets/00000/package/Texture/Object_049.png.meta deleted file mode 100644 index f9c41ae..0000000 --- a/Assets/00000/package/Texture/Object_049.png.meta +++ /dev/null @@ -1,106 +0,0 @@ -fileFormatVersion: 2 -guid: 2d4d61cf55cb82944bc3ddeda3674482 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: -- Gitblit v1.9.1