diff --git a/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs b/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs index 9fedc50e6..5e629dd42 100644 --- a/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs +++ b/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs @@ -154,8 +154,8 @@ namespace BFEditor.Resource GenTMPFontAsset(defaultNumberFont, new TTFInfo("cn", "Assets/arts/fonts/tmpfonts/default/tmpfont", "Assets/arts/fonts/tmpfonts/default/tmpfont", 256, new List()), AssetNumberName, isdevelop); // 战斗用 - var battleFont = AssetDatabase.LoadAssetAtPath("Assets/arts/fonts/tmpfonts/battle/font_battle.ttf"); - GenTMPFontAsset(battleFont, new TTFInfo("cn", "Assets/arts/fonts/tmpfonts/battle", "Assets/arts/fonts/tmpfonts/battle", 1024, new List()), AssetBattleName, isdevelop); + // var battleFont = AssetDatabase.LoadAssetAtPath("Assets/arts/fonts/tmpfonts/battle/font_battle.ttf"); + // GenTMPFontAsset(battleFont, new TTFInfo("cn", "Assets/arts/fonts/tmpfonts/battle", "Assets/arts/fonts/tmpfonts/battle", 1024, new List()), AssetBattleName, isdevelop); AssetDatabase.SaveAssets(); AssetDatabase.Refresh(); diff --git a/Assets/arts/animations/ui/battle/battle_combo.controller.meta b/Assets/arts/animations/ui/battle/battle_combo.controller.meta index 5ed331dd6..d80e50cb9 100644 --- a/Assets/arts/animations/ui/battle/battle_combo.controller.meta +++ b/Assets/arts/animations/ui/battle/battle_combo.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: arts/animations/ui/battle.ab assetBundleVariant: diff --git a/Assets/arts/atlas/ui/battle.asset b/Assets/arts/atlas/ui/battle.asset index 397f9f733..5d36c443e 100644 --- a/Assets/arts/atlas/ui/battle.asset +++ b/Assets/arts/atlas/ui/battle.asset @@ -65,8 +65,6 @@ MonoBehaviour: - {fileID: 21300000, guid: 1421585b364b1fb4ab0d951bb5d0f35d, type: 3} - {fileID: 21300000, guid: 9bb2f10b15aa44a4fa22ec0655146511, type: 3} - {fileID: 21300000, guid: be484dcfccac44f48bece88cc9294c8f, type: 3} - - {fileID: 21300000, guid: 6b1d1f3d85a0b1844a89ac92d918197e, type: 3} - - {fileID: 21300000, guid: 062778d9ba9602a41bf6e0b1736a439c, type: 3} - {fileID: 21300000, guid: e53d6e8ee4f256040a5d26aa8233520b, type: 3} - {fileID: 21300000, guid: 634f8eff83cb4cd4780e6afae3bc6c65, type: 3} - {fileID: 21300000, guid: d135766030d953b4bbb3ca2404fe28da, type: 3} @@ -77,4 +75,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 79656e8810168454eabe93c524a9878a, type: 3} - {fileID: 21300000, guid: 52ac764cef5804147aa8efe734be0a01, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - spriteNameList: 73ef7596df354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136537aa723a01d54ed3ede09396eee09396efe09396f0e09396bd9b0e69be9b0e69bf9b0e69c09b0e69c19b0e69c29b0e69c39b0e690d7ccc49132253d386d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63ad107222fd117222fd127222fd627da494f525e9108b9601006e14a268a0bc6ec803e47506d77eae8fd87eae8faa3b37002623b5b6 + spriteNameList: 73ef7596df354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136537aa723a01d54ed3ede09396eee09396efe09396f0e09396bd9b0e69be9b0e69bf9b0e69c09b0e69c19b0e69c29b0e69c39b0e690d7ccc49132253d386d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63ad107222fd627da494f525e9108b9601006e14a268a0bc6ec803e47506d77eae8fd87eae8faa3b37002623b5b6 diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_03.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_03.mat index a51f28a51..440c06bd1 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_03.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_03.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 2, g: 2, b: 2, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_04.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_04.mat index 4960a1f1c..871c36340 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_04.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_04.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 2, g: 2, b: 2, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_05.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_05.mat index 2f7fb4d1c..4e73248e1 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_05.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_05.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 1.0592737, g: 1.0592737, b: 1.0592737, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_06.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_06.mat index 1c1757ba6..0f66f777f 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_06.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_06.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 270 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 1.0592737, g: 1.0592737, b: 1.0592737, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_07.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_07.mat index 51b800971..6ffddd14f 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_07.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_07.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 2, g: 2, b: 2, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_08.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_08.mat index 1132f0784..fe40640d8 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_08.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_08.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 3.9999995, g: 3.9999995, b: 3.9999995, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_09.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_09.mat index a60199a15..1e6ff462f 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_09.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_09.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 2, g: 2, b: 2, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_11.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_11.mat index 5bf3e980c..f791c3bd5 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_11.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_11.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 1.4980392, g: 1.4980392, b: 1.4980392, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_12.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_12.mat index bf5c61267..7ebdd7e5c 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_12.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_12.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 180 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 1.0592737, g: 1.0592737, b: 1.0592737, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_13.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_13.mat index f5f5164cc..6b740c292 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_13.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_13.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 2, g: 2, b: 2, a: 1} diff --git a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_14.mat b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_14.mat index 255caccbf..f3bbad1ef 100644 --- a/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_14.mat +++ b/Assets/arts/effects/material/battle/sfx_p0007_b01/sfx_p0007_b01_14.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 2800000, guid: e662dab289f87c5469c2c33ce905c71e, type: 3} m_Scale: {x: 1, y: 1} @@ -68,24 +32,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _MASK_UV_SPEED_CUSTOM: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 1 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +44,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 0.47286376, b: 0.16509432, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 2, g: 2, b: 2, a: 1} diff --git a/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_02.mat b/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_02.mat index 116a113e5..f883699ff 100644 --- a/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_02.mat +++ b/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_02.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 + - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +45,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 3.9999995, g: 3.9999995, b: 3.9999995, a: 1} diff --git a/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_03.mat b/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_03.mat index fa3f455b7..6a180c54d 100644 --- a/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_03.mat +++ b/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_03.mat @@ -19,42 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _diss_tex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -68,24 +32,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 + - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - _diss_alpha_clip: 0 - _diss_clip: 0.2 - _diss_edge_smoothness: 1.8 @@ -96,8 +45,6 @@ Material: - _tex_rotate: 0 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _tex_color: {r: 2, g: 2, b: 2, a: 1} diff --git a/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_04.mat b/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_04.mat index 7ab6a1b9a..0532aeb69 100644 --- a/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_04.mat +++ b/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_04.mat @@ -19,46 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _diss_tex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _tex: m_Texture: {fileID: 2800000, guid: 4e99378ecfb0f944cb0c39fc49cb8566, type: 3} m_Scale: {x: 1, y: 1} @@ -72,31 +32,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - - _diss_alpha_clip: 0 - - _diss_clip: 0.2 - - _diss_edge_smoothness: 1.8 - - _diss_edge_width: 0.01 - - _diss_smoothness: 0.01 - - _diss_tex_rotate: 0 - _fnl_intensity: 1 - _fnl_size: 1 - _tex_mask_rotate: 0 @@ -106,10 +44,6 @@ Material: - _uv_nosize_strength: 0.4 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _fnl_color: {r: 1, g: 1, b: 1, a: 1} - _tex_color: {r: 1.4980392, g: 1.4980392, b: 1.4980392, a: 1} - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_05.mat b/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_05.mat index f094ba5b5..0dd87eb6b 100644 --- a/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_05.mat +++ b/Assets/arts/effects/material/battle/vfx_ui_hit_b01/vfx_ui_hit_b01_05.mat @@ -19,46 +19,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _diss_tex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _tex: m_Texture: {fileID: 2800000, guid: 4e99378ecfb0f944cb0c39fc49cb8566, type: 3} m_Scale: {x: 1, y: 1} @@ -72,31 +32,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - _CULLENUM: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - - _diss_alpha_clip: 0 - - _diss_clip: 0.2 - - _diss_edge_smoothness: 1.8 - - _diss_edge_width: 0.01 - - _diss_smoothness: 0.01 - - _diss_tex_rotate: 0 - _fnl_intensity: 1 - _fnl_size: 1 - _tex_mask_rotate: 0 @@ -106,10 +44,6 @@ Material: - _uv_nosize_strength: 0.4 - _ztest_on: 4 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _fnl_color: {r: 1, g: 1, b: 1, a: 1} - _tex_color: {r: 1.4980392, g: 1.4980392, b: 1.4980392, a: 1} - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/prefabs/effects/ui/vfx_ui_hit_b01.prefab.meta b/Assets/prefabs/effects/ui/vfx_ui_hit_b01.prefab.meta index e42f69c08..2366a805d 100644 --- a/Assets/prefabs/effects/ui/vfx_ui_hit_b01.prefab.meta +++ b/Assets/prefabs/effects/ui/vfx_ui_hit_b01.prefab.meta @@ -3,5 +3,5 @@ guid: 3a89f99f0c2b5df41ba44af3b5a34c83 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: prefabs/effects/ui/vfx_ui_hit_b01.prefab.ab assetBundleVariant: diff --git a/Assets/prefabs/effects/ui/vfx_ui_hit_b02.prefab.meta b/Assets/prefabs/effects/ui/vfx_ui_hit_b02.prefab.meta index 9f584b621..d92700658 100644 --- a/Assets/prefabs/effects/ui/vfx_ui_hit_b02.prefab.meta +++ b/Assets/prefabs/effects/ui/vfx_ui_hit_b02.prefab.meta @@ -3,5 +3,5 @@ guid: 70aed71a2a41bc149b5c2c3a7d9b19cf PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: prefabs/effects/ui/vfx_ui_hit_b02.prefab.ab assetBundleVariant: diff --git a/Assets/prefabs/effects/ui/vfx_ui_hit_b03.prefab.meta b/Assets/prefabs/effects/ui/vfx_ui_hit_b03.prefab.meta index 7af233b6b..0b1f7de76 100644 --- a/Assets/prefabs/effects/ui/vfx_ui_hit_b03.prefab.meta +++ b/Assets/prefabs/effects/ui/vfx_ui_hit_b03.prefab.meta @@ -3,5 +3,5 @@ guid: 0cf1409d789221948a0722e1f0b6ac68 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: prefabs/effects/ui/vfx_ui_hit_b03.prefab.ab assetBundleVariant: diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index fd3b35385..17c118a83 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -155,7 +155,7 @@ GameObject: - component: {fileID: 5931961978628687540} - component: {fileID: 8443514610547296044} - component: {fileID: 4451181475544731814} - m_Layer: 0 + m_Layer: 5 m_Name: mask m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 9c32b8dd5..17daa0f55 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -433,7 +433,7 @@ GameObject: - component: {fileID: 4870811525851949017} - component: {fileID: 5302504130526187759} - component: {fileID: 4025088876418097740} - m_Layer: 0 + m_Layer: 5 m_Name: text_1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3761,7 +3761,7 @@ GameObject: - component: {fileID: 4663360180822178123} - component: {fileID: 1888268369122651976} - component: {fileID: 4200167919331481947} - m_Layer: 0 + m_Layer: 5 m_Name: text_2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5658,7 +5658,7 @@ GameObject: - component: {fileID: 7998466248905419511} - component: {fileID: 5176947563727868919} - component: {fileID: 120165502644034035} - m_Layer: 0 + m_Layer: 5 m_Name: bg_1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5968,7 +5968,7 @@ GameObject: - component: {fileID: 4623840619513984981} - component: {fileID: 6950051635262332678} - component: {fileID: 3686517034873598873} - m_Layer: 0 + m_Layer: 5 m_Name: hit m_TagString: Untagged m_Icon: {fileID: 0}