From c542bf612d23cbaeb97d996c5ce75e2a5bd8f61c Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 26 Aug 2021 20:25:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E3=80=91=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E4=BE=9D=E8=B5=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{MonsterCasting => XunBaoMiZong}/Materials.meta | 2 +- .../Materials/fx_jinzha_474liang.mat | 0 .../Materials/fx_jinzha_474liang.mat.meta | 0 .../BaiBaoShangHui => Effects}/Materials/star 3.mat | 0 .../Materials/star 3.mat.meta | 0 .../BaiBaoShangHui => Effects}/Materials/star 4.mat | 0 .../Materials/star 4.mat.meta | 0 .../Texture/Glow => Effects/Textures}/Fx_Glow01.png | Bin .../Glow => Effects/Textures}/Fx_Glow01.png.meta | 0 .../Textures}/H_tirl_147_01_02.tga | Bin .../Textures}/H_tirl_147_01_02.tga.meta | 0 .../Texture => Effects/Textures}/H_zhezhao_50.tga | Bin .../Textures}/H_zhezhao_50.tga.meta | 0 .../Textures}/fx_tex_476liangse.tga | Bin .../Textures}/fx_tex_476liangse.tga.meta | 0 .../Textures/fx_tex_wenli2.tga | Bin .../Textures/fx_tex_wenli2.tga.meta | 0 .../Textures/fx_tex_wenli3.png | Bin .../Textures/fx_tex_wenli3.png.meta | 0 .../Shop/Texture => Effects/Textures}/mask.png | Bin .../Shop/Texture => Effects/Textures}/mask.png.meta | 0 .../Story/Texture => Effects/Textures}/star_png.png | Bin .../Texture => Effects/Textures}/star_png.png.meta | 0 .../PublicArtRes/Shaders/liudongrongjie.shader.meta | 4 ++-- 24 files changed, 3 insertions(+), 3 deletions(-) rename Assets/ManagedResources/EffectResUI/{MonsterCasting => XunBaoMiZong}/Materials.meta (77%) rename Assets/ManagedResources/{EffectResSkill/Effect_skill_jinzha => Effects}/Materials/fx_jinzha_474liang.mat (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_skill_jinzha => Effects}/Materials/fx_jinzha_474liang.mat.meta (100%) rename Assets/ManagedResources/{EffectResUI/BaiBaoShangHui => Effects}/Materials/star 3.mat (100%) rename Assets/ManagedResources/{EffectResUI/BaiBaoShangHui => Effects}/Materials/star 3.mat.meta (100%) rename Assets/ManagedResources/{EffectResUI/BaiBaoShangHui => Effects}/Materials/star 4.mat (100%) rename Assets/ManagedResources/{EffectResUI/BaiBaoShangHui => Effects}/Materials/star 4.mat.meta (100%) rename Assets/ManagedResources/{EffectResUI/BaiBaoShangHui/Texture/Glow => Effects/Textures}/Fx_Glow01.png (100%) rename Assets/ManagedResources/{EffectResUI/BaiBaoShangHui/Texture/Glow => Effects/Textures}/Fx_Glow01.png.meta (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_ls_06_baize/Texture => Effects/Textures}/H_tirl_147_01_02.tga (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_ls_06_baize/Texture => Effects/Textures}/H_tirl_147_01_02.tga.meta (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_ls_04_zhulong/Texture => Effects/Textures}/H_zhezhao_50.tga (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_ls_04_zhulong/Texture => Effects/Textures}/H_zhezhao_50.tga.meta (100%) rename Assets/ManagedResources/{EffectResUI/Practice/Texture => Effects/Textures}/fx_tex_476liangse.tga (100%) rename Assets/ManagedResources/{EffectResUI/Practice/Texture => Effects/Textures}/fx_tex_476liangse.tga.meta (100%) rename Assets/ManagedResources/{EffectResUI/Chenghao_TaSuiLingXiao => Effects}/Textures/fx_tex_wenli2.tga (100%) rename Assets/ManagedResources/{EffectResUI/Chenghao_TaSuiLingXiao => Effects}/Textures/fx_tex_wenli2.tga.meta (100%) rename Assets/ManagedResources/{EffectResUI/Chenghao_TaSuiLingXiao => Effects}/Textures/fx_tex_wenli3.png (100%) rename Assets/ManagedResources/{EffectResUI/Chenghao_TaSuiLingXiao => Effects}/Textures/fx_tex_wenli3.png.meta (100%) rename Assets/ManagedResources/{EffectResUI/Shop/Texture => Effects/Textures}/mask.png (100%) rename Assets/ManagedResources/{EffectResUI/Shop/Texture => Effects/Textures}/mask.png.meta (100%) rename Assets/ManagedResources/{EffectResUI/Story/Texture => Effects/Textures}/star_png.png (100%) rename Assets/ManagedResources/{EffectResUI/Story/Texture => Effects/Textures}/star_png.png.meta (100%) 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: