From edaacd0e696de86bca24269710a5abb9081615a7 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 15 Jul 2021 17:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=90=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{Circle_Glow01.mat => Circle_Glow01_mat.mat} | 2 +- ...e_Glow01.mat.meta => Circle_Glow01_mat.mat.meta} | 0 .../{Circle_Glow02.mat => Circle_Glow02_mat.mat} | 2 +- ...e_Glow02.mat.meta => Circle_Glow02_mat.mat.meta} | 0 ...wdwswwhokvd.mat => 204357ncvwwwdwswwhokvd 1.mat} | 2 +- ...d.mat.meta => 204357ncvwwwdwswwhokvd 1.mat.meta} | 0 .../Materials/{Fx_Glow01.mat => Fx_Glow01_mat.mat} | 2 +- .../{Fx_Glow01.mat.meta => Fx_Glow01_mat.mat.meta} | 0 .../Materials/{Fx_Glow02.mat => Fx_Glow02_mat.mat} | 2 +- .../{Fx_Glow02.mat.meta => Fx_Glow02_mat.mat.meta} | 0 ...fightlevel02.png => CarbonImg_fightlevel002.png} | Bin ...02.png.meta => CarbonImg_fightlevel002.png.meta} | 0 ...bonImg_trial03.mat => CarbonImg_trial03_mat.mat} | 2 +- ...al03.mat.meta => CarbonImg_trial03_mat.mat.meta} | 0 .../Other/Materials/{eyes.mat => eyes_mat.mat} | 2 +- .../Materials/{eyes.mat.meta => eyes_mat.mat.meta} | 0 .../Other/Materials/{line.mat => line_mat.mat} | 2 +- .../Materials/{line.mat.meta => line_mat.mat.meta} | 0 .../{smoke2_1x8.mat => smoke2_1x8_mat.mat} | 2 +- ...{smoke2_1x8.mat.meta => smoke2_1x8_mat.mat.meta} | 0 .../Other/Materials/{stone.mat => stone_mat.mat} | 2 +- .../{stone.mat.meta => stone_mat.mat.meta} | 0 .../Materials/{No Name.mat => No Name_mat1.mat} | 2 +- .../{No Name.mat.meta => No Name_mat1.mat.meta} | 0 .../Materials/{No Name.mat => No Name_mat2.mat} | 2 +- .../{No Name.mat.meta => No Name_mat2.mat.meta} | 0 .../Resources/Instagram/{Reyes.png => Reyes2.png} | Bin .../Instagram/{Reyes.png.meta => Reyes2.png.meta} | 0 28 files changed, 12 insertions(+), 12 deletions(-) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/{Circle_Glow01.mat => Circle_Glow01_mat.mat} (98%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/{Circle_Glow01.mat.meta => Circle_Glow01_mat.mat.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/{Circle_Glow02.mat => Circle_Glow02_mat.mat} (98%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/{Circle_Glow02.mat.meta => Circle_Glow02_mat.mat.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/{204357ncvwwwdwswwhokvd.mat => 204357ncvwwwdwswwhokvd 1.mat} (98%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/{204357ncvwwwdwswwhokvd.mat.meta => 204357ncvwwwdwswwhokvd 1.mat.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/{Fx_Glow01.mat => Fx_Glow01_mat.mat} (99%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/{Fx_Glow01.mat.meta => Fx_Glow01_mat.mat.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/{Fx_Glow02.mat => Fx_Glow02_mat.mat} (98%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/{Fx_Glow02.mat.meta => Fx_Glow02_mat.mat.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/{CarbonImg_fightlevel02.png => CarbonImg_fightlevel002.png} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/{CarbonImg_fightlevel02.png.meta => CarbonImg_fightlevel002.png.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{CarbonImg_trial03.mat => CarbonImg_trial03_mat.mat} (98%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{CarbonImg_trial03.mat.meta => CarbonImg_trial03_mat.mat.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{eyes.mat => eyes_mat.mat} (99%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{eyes.mat.meta => eyes_mat.mat.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{line.mat => line_mat.mat} (99%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{line.mat.meta => line_mat.mat.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{smoke2_1x8.mat => smoke2_1x8_mat.mat} (99%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{smoke2_1x8.mat.meta => smoke2_1x8_mat.mat.meta} (100%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{stone.mat => stone_mat.mat} (99%) rename Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/{stone.mat.meta => stone_mat.mat.meta} (100%) rename Assets/ManagedResources/Effects/Model/Materials/{No Name.mat => No Name_mat1.mat} (98%) rename Assets/ManagedResources/Effects/Model/Materials/{No Name.mat.meta => No Name_mat1.mat.meta} (100%) rename Assets/ManagedResources/PublicArtRes/Models/Materials/{No Name.mat => No Name_mat2.mat} (98%) rename Assets/ManagedResources/PublicArtRes/Models/Materials/{No Name.mat.meta => No Name_mat2.mat.meta} (100%) rename Assets/Scripts/Colorful FX/Resources/Instagram/{Reyes.png => Reyes2.png} (100%) rename Assets/Scripts/Colorful FX/Resources/Instagram/{Reyes.png.meta => Reyes2.png.meta} (100%) diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01_mat.mat similarity index 98% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01_mat.mat index d30f1f7952..1e9dd8dd88 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Circle_Glow01 + m_Name: Circle_Glow01_mat m_Shader: {fileID: 4800000, guid: 43a4ca9cf05b4fc4c9a47ef6103ea3ba, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow01_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02_mat.mat similarity index 98% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02_mat.mat index e533eda626..fe14ee4967 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Circle_Glow02 + m_Name: Circle_Glow02_mat m_Shader: {fileID: 4800000, guid: 43a4ca9cf05b4fc4c9a47ef6103ea3ba, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/CircleGlow/Materials/Circle_Glow02_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd 1.mat similarity index 98% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd 1.mat index b08466048c..2d7c982025 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd 1.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: 204357ncvwwwdwswwhokvd + m_Name: 204357ncvwwwdwswwhokvd 1 m_Shader: {fileID: 4800000, guid: 43a4ca9cf05b4fc4c9a47ef6103ea3ba, type: 3} m_ShaderKeywords: m_LightmapFlags: 0 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd 1.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/204357ncvwwwdwswwhokvd 1.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01_mat.mat similarity index 99% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01_mat.mat index 97f2db77c5..09de68a82c 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Fx_Glow01 + m_Name: Fx_Glow01_mat m_Shader: {fileID: 4800000, guid: ba499b14830e8934c96f429cecb73c4e, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow01_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02_mat.mat similarity index 98% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02_mat.mat index 0c57f8891b..79063f797e 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Fx_Glow02 + m_Name: Fx_Glow02_mat m_Shader: {fileID: 4800000, guid: 43a4ca9cf05b4fc4c9a47ef6103ea3ba, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Glow/Materials/Fx_Glow02_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_fightlevel02.png b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_fightlevel002.png similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_fightlevel02.png rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_fightlevel002.png diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_fightlevel02.png.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_fightlevel002.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_fightlevel02.png.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_fightlevel002.png.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03_mat.mat similarity index 98% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03_mat.mat index 06c78a6d5b..935696af61 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: CarbonImg_trial03 + m_Name: CarbonImg_trial03_mat m_Shader: {fileID: 4800000, guid: 4acbea0382cd6854ca0fbf80a29dd0b6, type: 3} m_ShaderKeywords: m_LightmapFlags: 0 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/CarbonImg_trial03_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes_mat.mat similarity index 99% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes_mat.mat index 5e5c092378..49769bfbdb 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: eyes + m_Name: eyes_mat m_Shader: {fileID: 4800000, guid: ba499b14830e8934c96f429cecb73c4e, type: 3} m_ShaderKeywords: m_LightmapFlags: 0 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/eyes_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line_mat.mat similarity index 99% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line_mat.mat index 2918223a2a..86c3805909 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: line + m_Name: line_mat m_Shader: {fileID: 4800000, guid: 48fc47a7c6414184d94d4f73bd7d79eb, type: 3} m_ShaderKeywords: _MAIN_TEX_RA_ON m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/line_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8_mat.mat similarity index 99% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8_mat.mat index 09b3a41e0b..b4bf1b6a3b 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: smoke2_1x8 + m_Name: smoke2_1x8_mat m_Shader: {fileID: 4800000, guid: 9bf210b14320ae34d9ff653eca237efb, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/smoke2_1x8_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone.mat b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone_mat.mat similarity index 99% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone.mat rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone_mat.mat index 567ffbe770..73ab046bc6 100644 --- a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone.mat +++ b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: stone + m_Name: stone_mat m_Shader: {fileID: 4800000, guid: 9bf210b14320ae34d9ff653eca237efb, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone.mat.meta b/Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone.mat.meta rename to Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/Materials/stone_mat.mat.meta diff --git a/Assets/ManagedResources/Effects/Model/Materials/No Name.mat b/Assets/ManagedResources/Effects/Model/Materials/No Name_mat1.mat similarity index 98% rename from Assets/ManagedResources/Effects/Model/Materials/No Name.mat rename to Assets/ManagedResources/Effects/Model/Materials/No Name_mat1.mat index 8840c36725..947df95880 100644 --- a/Assets/ManagedResources/Effects/Model/Materials/No Name.mat +++ b/Assets/ManagedResources/Effects/Model/Materials/No Name_mat1.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: No Name + m_Name: No Name_mat1 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/Effects/Model/Materials/No Name.mat.meta b/Assets/ManagedResources/Effects/Model/Materials/No Name_mat1.mat.meta similarity index 100% rename from Assets/ManagedResources/Effects/Model/Materials/No Name.mat.meta rename to Assets/ManagedResources/Effects/Model/Materials/No Name_mat1.mat.meta diff --git a/Assets/ManagedResources/PublicArtRes/Models/Materials/No Name.mat b/Assets/ManagedResources/PublicArtRes/Models/Materials/No Name_mat2.mat similarity index 98% rename from Assets/ManagedResources/PublicArtRes/Models/Materials/No Name.mat rename to Assets/ManagedResources/PublicArtRes/Models/Materials/No Name_mat2.mat index 8840c36725..a861d541a2 100644 --- a/Assets/ManagedResources/PublicArtRes/Models/Materials/No Name.mat +++ b/Assets/ManagedResources/PublicArtRes/Models/Materials/No Name_mat2.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: No Name + m_Name: No Name_mat2 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/PublicArtRes/Models/Materials/No Name.mat.meta b/Assets/ManagedResources/PublicArtRes/Models/Materials/No Name_mat2.mat.meta similarity index 100% rename from Assets/ManagedResources/PublicArtRes/Models/Materials/No Name.mat.meta rename to Assets/ManagedResources/PublicArtRes/Models/Materials/No Name_mat2.mat.meta diff --git a/Assets/Scripts/Colorful FX/Resources/Instagram/Reyes.png b/Assets/Scripts/Colorful FX/Resources/Instagram/Reyes2.png similarity index 100% rename from Assets/Scripts/Colorful FX/Resources/Instagram/Reyes.png rename to Assets/Scripts/Colorful FX/Resources/Instagram/Reyes2.png diff --git a/Assets/Scripts/Colorful FX/Resources/Instagram/Reyes.png.meta b/Assets/Scripts/Colorful FX/Resources/Instagram/Reyes2.png.meta similarity index 100% rename from Assets/Scripts/Colorful FX/Resources/Instagram/Reyes.png.meta rename to Assets/Scripts/Colorful FX/Resources/Instagram/Reyes2.png.meta