From 7a62bd904a40dd97ddfff3905ae3faf60cb33d2f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 11 Sep 2020 10:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=AF=BC=E8=87=B4ab=E5=8C=85=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Atlas/CardAtlas.meta | 8 -------- Assets/ManagedResources/Effects/Model/Materials.meta | 8 -------- .../PublicArtRes/Materials/dajin_effect_15_lz 2.mat.meta | 2 +- .../{Textures => Materials}/dajin_effect_15_lz 2_mat.mat | 0 .../dajin_effect_15_lz 2_mat.mat.meta | 0 .../PublicArtRes/Shaders/FangdaAdd.shader.meta | 8 ++++---- .../PublicArtRes/Shaders/FangdaAdd2.shader.meta | 8 ++++---- 7 files changed, 9 insertions(+), 25 deletions(-) delete mode 100644 Assets/ManagedResources/Atlas/CardAtlas.meta delete mode 100644 Assets/ManagedResources/Effects/Model/Materials.meta rename Assets/ManagedResources/PublicArtRes/{Textures => Materials}/dajin_effect_15_lz 2_mat.mat (100%) rename Assets/ManagedResources/PublicArtRes/{Textures => Materials}/dajin_effect_15_lz 2_mat.mat.meta (100%) diff --git a/Assets/ManagedResources/Atlas/CardAtlas.meta b/Assets/ManagedResources/Atlas/CardAtlas.meta deleted file mode 100644 index 6774f17313..0000000000 --- a/Assets/ManagedResources/Atlas/CardAtlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 63d50a1409a2a4143be50806c3dd37a6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: lz4/atlas/cardatlas - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Effects/Model/Materials.meta b/Assets/ManagedResources/Effects/Model/Materials.meta deleted file mode 100644 index d27b4d22de..0000000000 --- a/Assets/ManagedResources/Effects/Model/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b348d3ac1e9b0364a9692230e40eaf82 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Materials/dajin_effect_15_lz 2.mat.meta b/Assets/ManagedResources/PublicArtRes/Materials/dajin_effect_15_lz 2.mat.meta index 66e56d0438..221997c675 100644 --- a/Assets/ManagedResources/PublicArtRes/Materials/dajin_effect_15_lz 2.mat.meta +++ b/Assets/ManagedResources/PublicArtRes/Materials/dajin_effect_15_lz 2.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 49b91389ada82374392d0f7071a58f86 +guid: 44fc2b2da6baefc41abe1cc745f29385 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/ManagedResources/PublicArtRes/Textures/dajin_effect_15_lz 2_mat.mat b/Assets/ManagedResources/PublicArtRes/Materials/dajin_effect_15_lz 2_mat.mat similarity index 100% rename from Assets/ManagedResources/PublicArtRes/Textures/dajin_effect_15_lz 2_mat.mat rename to Assets/ManagedResources/PublicArtRes/Materials/dajin_effect_15_lz 2_mat.mat diff --git a/Assets/ManagedResources/PublicArtRes/Textures/dajin_effect_15_lz 2_mat.mat.meta b/Assets/ManagedResources/PublicArtRes/Materials/dajin_effect_15_lz 2_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/PublicArtRes/Textures/dajin_effect_15_lz 2_mat.mat.meta rename to Assets/ManagedResources/PublicArtRes/Materials/dajin_effect_15_lz 2_mat.mat.meta diff --git a/Assets/ManagedResources/PublicArtRes/Shaders/FangdaAdd.shader.meta b/Assets/ManagedResources/PublicArtRes/Shaders/FangdaAdd.shader.meta index 784a69d6e9..aabe9a1055 100644 --- a/Assets/ManagedResources/PublicArtRes/Shaders/FangdaAdd.shader.meta +++ b/Assets/ManagedResources/PublicArtRes/Shaders/FangdaAdd.shader.meta @@ -1,11 +1,11 @@ fileFormatVersion: 2 guid: 508f1ff17d221c748927a8db3bc7ee3f -timeCreated: 1487063896 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: - - _Lin: {fileID: 2800000, guid: d06b9a037f1c2f346b9adcc8f8e002e4, type: 3} - - _MainTex: {fileID: 2800000, guid: 81b45cd1d4534a5439d76491f0014398, type: 3} + - _Lin: {instanceID: 0} + - _MainTex: {instanceID: 0} + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Shaders/FangdaAdd2.shader.meta b/Assets/ManagedResources/PublicArtRes/Shaders/FangdaAdd2.shader.meta index d63f7b8257..d3b0e088ef 100644 --- a/Assets/ManagedResources/PublicArtRes/Shaders/FangdaAdd2.shader.meta +++ b/Assets/ManagedResources/PublicArtRes/Shaders/FangdaAdd2.shader.meta @@ -1,11 +1,11 @@ fileFormatVersion: 2 guid: 89357a7052963d743a64f9ac1e9fa7ad -timeCreated: 1487063896 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: - - _Lin: {fileID: 2800000, guid: d06b9a037f1c2f346b9adcc8f8e002e4, type: 3} - - _MainTex: {fileID: 2800000, guid: 81b45cd1d4534a5439d76491f0014398, type: 3} + - _Lin: {instanceID: 0} + - _MainTex: {instanceID: 0} + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: