From 14f1d213e3a93b223b20a7cadd65d5cc14c352fa Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 5 Nov 2021 17:47:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A5=9E=E9=AD=82=E7=89=B9=E6=95=88?= =?UTF-8?q?=E3=80=91=E8=B5=84=E6=BA=90=E5=90=8D=E9=87=8D=E5=A4=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animation/fx_aobing_wangqiuwangzhi_1_anim.anim | 2 +- .../Animation/fx_aobing_wangqiuwangzhi_1_ctrl.controller | 2 +- .../Materials/{glow_particle.mat => glow_particle_mat.mat} | 2 +- .../{glow_particle.mat.meta => glow_particle_mat.mat.meta} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename Assets/ManagedResources/EffectResUI/RoleInfo/Materials/{glow_particle.mat => glow_particle_mat.mat} (96%) rename Assets/ManagedResources/EffectResUI/RoleInfo/Materials/{glow_particle.mat.meta => glow_particle_mat.mat.meta} (100%) diff --git a/Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_anim.anim b/Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_anim.anim index 2f5fa9f3ef..bfdc9a5c81 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_anim.anim +++ b/Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fx_aobing_wangqiuwangzhi_1 + m_Name: fx_aobing_wangqiuwangzhi_1_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_ctrl.controller b/Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_ctrl.controller index 02b338b704..4aa20d3506 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_ctrl.controller +++ b/Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_ctrl.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fx_aobing_wangqiuwangzhi_1 + m_Name: fx_aobing_wangqiuwangzhi_1_ctrl serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle.mat b/Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle_mat.mat similarity index 96% rename from Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle.mat rename to Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle_mat.mat index 324a812bfa..78f0d8a99c 100644 --- a/Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle.mat +++ b/Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: glow_particle + m_Name: glow_particle_mat m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: _FOG_ON m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle.mat.meta b/Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle.mat.meta rename to Assets/ManagedResources/EffectResUI/RoleInfo/Materials/glow_particle_mat.mat.meta