diff --git a/Assets/ManagedResources/EffectResUI/MonsterCasting/Materials.meta b/Assets/ManagedResources/EffectResUI/XunBaoMiZong/Materials.meta similarity index 77% rename from Assets/ManagedResources/EffectResUI/MonsterCasting/Materials.meta rename to Assets/ManagedResources/EffectResUI/XunBaoMiZong/Materials.meta index 98e0d7afb1..9752c7fc95 100644 --- a/Assets/ManagedResources/EffectResUI/MonsterCasting/Materials.meta +++ b/Assets/ManagedResources/EffectResUI/XunBaoMiZong/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 22521ff472e607b41a798a881a4e28cb +guid: 5b24ff7c9fbbc39498821e129ac325d9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResSkill/Effect_skill_jinzha/Materials/fx_jinzha_474liang.mat b/Assets/ManagedResources/Effects/Materials/fx_jinzha_474liang.mat similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_skill_jinzha/Materials/fx_jinzha_474liang.mat rename to Assets/ManagedResources/Effects/Materials/fx_jinzha_474liang.mat diff --git a/Assets/ManagedResources/EffectResSkill/Effect_skill_jinzha/Materials/fx_jinzha_474liang.mat.meta b/Assets/ManagedResources/Effects/Materials/fx_jinzha_474liang.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_skill_jinzha/Materials/fx_jinzha_474liang.mat.meta rename to Assets/ManagedResources/Effects/Materials/fx_jinzha_474liang.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Materials/star 3.mat b/Assets/ManagedResources/Effects/Materials/star 3.mat similarity index 100% rename from Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Materials/star 3.mat rename to Assets/ManagedResources/Effects/Materials/star 3.mat diff --git a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Materials/star 3.mat.meta b/Assets/ManagedResources/Effects/Materials/star 3.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Materials/star 3.mat.meta rename to Assets/ManagedResources/Effects/Materials/star 3.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Materials/star 4.mat b/Assets/ManagedResources/Effects/Materials/star 4.mat similarity index 100% rename from Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Materials/star 4.mat rename to Assets/ManagedResources/Effects/Materials/star 4.mat diff --git a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Materials/star 4.mat.meta b/Assets/ManagedResources/Effects/Materials/star 4.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Materials/star 4.mat.meta rename to Assets/ManagedResources/Effects/Materials/star 4.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow01.png b/Assets/ManagedResources/Effects/Textures/Fx_Glow01.png similarity index 100% rename from Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow01.png rename to Assets/ManagedResources/Effects/Textures/Fx_Glow01.png diff --git a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow01.png.meta b/Assets/ManagedResources/Effects/Textures/Fx_Glow01.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow01.png.meta rename to Assets/ManagedResources/Effects/Textures/Fx_Glow01.png.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Texture/H_tirl_147_01_02.tga b/Assets/ManagedResources/Effects/Textures/H_tirl_147_01_02.tga similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Texture/H_tirl_147_01_02.tga rename to Assets/ManagedResources/Effects/Textures/H_tirl_147_01_02.tga diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Texture/H_tirl_147_01_02.tga.meta b/Assets/ManagedResources/Effects/Textures/H_tirl_147_01_02.tga.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Texture/H_tirl_147_01_02.tga.meta rename to Assets/ManagedResources/Effects/Textures/H_tirl_147_01_02.tga.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Texture/H_zhezhao_50.tga b/Assets/ManagedResources/Effects/Textures/H_zhezhao_50.tga similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Texture/H_zhezhao_50.tga rename to Assets/ManagedResources/Effects/Textures/H_zhezhao_50.tga diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Texture/H_zhezhao_50.tga.meta b/Assets/ManagedResources/Effects/Textures/H_zhezhao_50.tga.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Texture/H_zhezhao_50.tga.meta rename to Assets/ManagedResources/Effects/Textures/H_zhezhao_50.tga.meta diff --git a/Assets/ManagedResources/EffectResUI/Practice/Texture/fx_tex_476liangse.tga b/Assets/ManagedResources/Effects/Textures/fx_tex_476liangse.tga similarity index 100% rename from Assets/ManagedResources/EffectResUI/Practice/Texture/fx_tex_476liangse.tga rename to Assets/ManagedResources/Effects/Textures/fx_tex_476liangse.tga diff --git a/Assets/ManagedResources/EffectResUI/Practice/Texture/fx_tex_476liangse.tga.meta b/Assets/ManagedResources/Effects/Textures/fx_tex_476liangse.tga.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Practice/Texture/fx_tex_476liangse.tga.meta rename to Assets/ManagedResources/Effects/Textures/fx_tex_476liangse.tga.meta diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_wenli2.tga b/Assets/ManagedResources/Effects/Textures/fx_tex_wenli2.tga similarity index 100% rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_wenli2.tga rename to Assets/ManagedResources/Effects/Textures/fx_tex_wenli2.tga diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_wenli2.tga.meta b/Assets/ManagedResources/Effects/Textures/fx_tex_wenli2.tga.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_wenli2.tga.meta rename to Assets/ManagedResources/Effects/Textures/fx_tex_wenli2.tga.meta diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_wenli3.png b/Assets/ManagedResources/Effects/Textures/fx_tex_wenli3.png similarity index 100% rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_wenli3.png rename to Assets/ManagedResources/Effects/Textures/fx_tex_wenli3.png diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_wenli3.png.meta b/Assets/ManagedResources/Effects/Textures/fx_tex_wenli3.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_wenli3.png.meta rename to Assets/ManagedResources/Effects/Textures/fx_tex_wenli3.png.meta diff --git a/Assets/ManagedResources/EffectResUI/Shop/Texture/mask.png b/Assets/ManagedResources/Effects/Textures/mask.png similarity index 100% rename from Assets/ManagedResources/EffectResUI/Shop/Texture/mask.png rename to Assets/ManagedResources/Effects/Textures/mask.png diff --git a/Assets/ManagedResources/EffectResUI/Shop/Texture/mask.png.meta b/Assets/ManagedResources/Effects/Textures/mask.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Shop/Texture/mask.png.meta rename to Assets/ManagedResources/Effects/Textures/mask.png.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png b/Assets/ManagedResources/Effects/Textures/star_png.png similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png rename to Assets/ManagedResources/Effects/Textures/star_png.png diff --git a/Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta b/Assets/ManagedResources/Effects/Textures/star_png.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta rename to Assets/ManagedResources/Effects/Textures/star_png.png.meta diff --git a/Assets/ManagedResources/PublicArtRes/Shaders/liudongrongjie.shader.meta b/Assets/ManagedResources/PublicArtRes/Shaders/liudongrongjie.shader.meta index 51764c4bca..d286a61108 100644 --- a/Assets/ManagedResources/PublicArtRes/Shaders/liudongrongjie.shader.meta +++ b/Assets/ManagedResources/PublicArtRes/Shaders/liudongrongjie.shader.meta @@ -3,8 +3,8 @@ guid: 08551e0927cbfa043b3f960e9d9c7043 ShaderImporter: externalObjects: {} defaultTextures: - - _liudong: {fileID: 2800000, guid: cd2c835c4ef65f34cba096e8c6c66e07, type: 3} - - _rongjie: {fileID: 2800000, guid: 03c8ea0309333c249a4e1f0d0bc98609, type: 3} + - _liudong: {instanceID: 0} + - _rongjie: {instanceID: 0} nonModifiableTextures: [] userData: assetBundleName: