diff --git a/AxibugEmuOnline.Client/Assets/Editors/CommandDispatcherEditor.cs b/AxibugEmuOnline.Client/Assets/Editors/CommandDispatcherEditor.cs index c8dcbc9..037b021 100644 --- a/AxibugEmuOnline.Client/Assets/Editors/CommandDispatcherEditor.cs +++ b/AxibugEmuOnline.Client/Assets/Editors/CommandDispatcherEditor.cs @@ -31,6 +31,8 @@ namespace AxibugEmuOnline.Editors } EditorGUILayout.EndVertical(); + EditorGUILayout.LabelField(dispacather.Current.Name); + Repaint(); } diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders.meta deleted file mode 100644 index 92fbff8..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1045b92cbd63c45bab65c540449a8ad3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader deleted file mode 100644 index fef7470..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader +++ /dev/null @@ -1,157 +0,0 @@ -Shader "TextMeshPro/Distance Field (UIDissolve)" { - -Properties { - _FaceTex ("Face Texture", 2D) = "white" {} - _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 - _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 - _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(-1,1)) = 0 - - _Bevel ("Bevel", Range(0,1)) = 0.5 - _BevelOffset ("Bevel Offset", Range(-0.5,0.5)) = 0 - _BevelWidth ("Bevel Width", Range(-.5,0.5)) = 0 - _BevelClamp ("Bevel Clamp", Range(0,1)) = 0 - _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 - - _LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416 - _SpecularColor ("Specular", Color) = (1,1,1,1) - _SpecularPower ("Specular", Range(0,4)) = 2.0 - _Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10 - _Diffuse ("Diffuse", Range(0,1)) = 0.5 - _Ambient ("Ambient", Range(1,0)) = 0.5 - - _BumpMap ("Normal map", 2D) = "bump" {} - _BumpOutline ("Bump Outline", Range(0,1)) = 0 - _BumpFace ("Bump Face", Range(0,1)) = 0 - - _ReflectFaceColor ("Reflection Color", Color) = (0,0,0,1) - _ReflectOutlineColor("Reflection Color", Color) = (0,0,0,1) - _Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ } - _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - - - _UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _MaskCoord ("Mask Coordinates", vector) = (0, 0, 32767, 32767) - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} -} - -SubShader { - - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma target 3.0 - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ BEVEL_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - #pragma shader_feature __ GLOW_ON - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" - - #define UI_DISSOLVE 1 - #define DISSOLVE 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - #pragma shader_feature __ ADD SUBTRACT FILL - - fixed4 frag(pixel_t IN) : SV_Target - { - half4 color = PixShader(IN); - - // Dissolve - color = ApplyTransitionEffect(color, IN.eParam); - color.rgb *= color.a; - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - return color * IN.color.a; - } - ENDCG - } -} - -Fallback "TextMeshPro/Mobile/Distance Field (UIDissolve)" -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader.meta deleted file mode 100644 index 30a389b..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: 983d3d7238f4540e3af421a4abb25e26 -ShaderImporter: - externalObjects: {} - defaultTextures: - - _FaceTex: {instanceID: 0} - - _OutlineTex: {instanceID: 0} - - _BumpMap: {instanceID: 0} - - _Cube: {instanceID: 0} - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader deleted file mode 100644 index b02d307..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader +++ /dev/null @@ -1,173 +0,0 @@ -Shader "TextMeshPro/Distance Field (UIEffect)" { - -Properties { - _FaceTex ("Face Texture", 2D) = "white" {} - _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 - _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 - _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(-1,1)) = 0 - - _Bevel ("Bevel", Range(0,1)) = 0.5 - _BevelOffset ("Bevel Offset", Range(-0.5,0.5)) = 0 - _BevelWidth ("Bevel Width", Range(-.5,0.5)) = 0 - _BevelClamp ("Bevel Clamp", Range(0,1)) = 0 - _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 - - _LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416 - _SpecularColor ("Specular", Color) = (1,1,1,1) - _SpecularPower ("Specular", Range(0,4)) = 2.0 - _Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10 - _Diffuse ("Diffuse", Range(0,1)) = 0.5 - _Ambient ("Ambient", Range(1,0)) = 0.5 - - _BumpMap ("Normal map", 2D) = "bump" {} - _BumpOutline ("Bump Outline", Range(0,1)) = 0 - _BumpFace ("Bump Face", Range(0,1)) = 0 - - _ReflectFaceColor ("Reflection Color", Color) = (0,0,0,1) - _ReflectOutlineColor("Reflection Color", Color) = (0,0,0,1) - _Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ } - _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - - - _UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _MaskCoord ("Mask Coordinates", vector) = (0, 0, 32767, 32767) - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 -} - -SubShader { - - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma target 3.0 - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ BEVEL_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - #pragma shader_feature __ GLOW_ON - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL - #pragma shader_feature __ ADD SUBTRACT FILL - #pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR - #pragma shader_feature __ EX - - float4 _MainTex_TexelSize; - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" - - #define UI_EFFECT 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - - fixed4 frag(pixel_t IN) : SV_Target - { - fixed4 param = tex2D(_ParamTex, float2(0.5, IN.eParam)); - fixed effectFactor = param.x; - fixed colorFactor = param.y; - fixed blurFactor = param.z; - - #if PIXEL - half2 pixelSize = max(2, (1-effectFactor*0.95) * float2(_TextureWidth, _TextureHeight)); - UV(IN).xy = round(UV(IN).xy * pixelSize) / pixelSize; - #endif - - #if defined(UI_BLUR) && EX - half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4, IN.uvMask); - #elif defined(UI_BLUR) - half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4); - #else - half4 color = PixShader(IN) * IN.color.a; - #endif - - #if defined (UI_TONE) - color = ApplyToneEffect(color, effectFactor); - #endif - - color = ApplyColorEffect(color, fixed4(IN.color.rgb, colorFactor)); - color.rgb *= color.a; - - return color * IN.color.a; - } - ENDCG - } -} - -Fallback "TextMeshPro/Mobile/Distance Field (UIEffect)" -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader.meta deleted file mode 100644 index 1ad5555..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: fdc3d2db3815548ae9eea37e1be79f36 -ShaderImporter: - externalObjects: {} - defaultTextures: - - _FaceTex: {instanceID: 0} - - _OutlineTex: {instanceID: 0} - - _BumpMap: {instanceID: 0} - - _Cube: {instanceID: 0} - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader deleted file mode 100644 index 14aecb4..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader +++ /dev/null @@ -1,156 +0,0 @@ -Shader "TextMeshPro/Distance Field (UIHsvModifier)" { - -Properties { - _FaceTex ("Face Texture", 2D) = "white" {} - _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 - _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 - _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(-1,1)) = 0 - - _Bevel ("Bevel", Range(0,1)) = 0.5 - _BevelOffset ("Bevel Offset", Range(-0.5,0.5)) = 0 - _BevelWidth ("Bevel Width", Range(-.5,0.5)) = 0 - _BevelClamp ("Bevel Clamp", Range(0,1)) = 0 - _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 - - _LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416 - _SpecularColor ("Specular", Color) = (1,1,1,1) - _SpecularPower ("Specular", Range(0,4)) = 2.0 - _Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10 - _Diffuse ("Diffuse", Range(0,1)) = 0.5 - _Ambient ("Ambient", Range(1,0)) = 0.5 - - _BumpMap ("Normal map", 2D) = "bump" {} - _BumpOutline ("Bump Outline", Range(0,1)) = 0 - _BumpFace ("Bump Face", Range(0,1)) = 0 - - _ReflectFaceColor ("Reflection Color", Color) = (0,0,0,1) - _ReflectOutlineColor("Reflection Color", Color) = (0,0,0,1) - _Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ } - _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - - - _UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _MaskCoord ("Mask Coordinates", vector) = (0, 0, 32767, 32767) - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} -} - -SubShader { - - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma target 3.0 - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ BEVEL_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - #pragma shader_feature __ GLOW_ON - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" - - #define UI_HSV_MODIFIER 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - - fixed4 frag(pixel_t IN) : SV_Target - { - half4 color = PixShader(IN); - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - // Hsv - color = ApplyHsvEffect(color, IN.eParam); - color.rgb *= IN.color.rgb; - - return color * IN.color.a; - } - - ENDCG - } -} - -Fallback "TextMeshPro/Mobile/Distance Field (UIHsv)" -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader.meta deleted file mode 100644 index 370b55d..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: 58c5c12ea67b943f2bb08cdba8767f41 -ShaderImporter: - externalObjects: {} - defaultTextures: - - _FaceTex: {instanceID: 0} - - _OutlineTex: {instanceID: 0} - - _BumpMap: {instanceID: 0} - - _Cube: {instanceID: 0} - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader deleted file mode 100644 index ff9c4ca..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader +++ /dev/null @@ -1,154 +0,0 @@ -Shader "TextMeshPro/Distance Field (UIShiny)" { - -Properties { - _FaceTex ("Face Texture", 2D) = "white" {} - _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 - _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 - _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(-1,1)) = 0 - - _Bevel ("Bevel", Range(0,1)) = 0.5 - _BevelOffset ("Bevel Offset", Range(-0.5,0.5)) = 0 - _BevelWidth ("Bevel Width", Range(-.5,0.5)) = 0 - _BevelClamp ("Bevel Clamp", Range(0,1)) = 0 - _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 - - _LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416 - _SpecularColor ("Specular", Color) = (1,1,1,1) - _SpecularPower ("Specular", Range(0,4)) = 2.0 - _Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10 - _Diffuse ("Diffuse", Range(0,1)) = 0.5 - _Ambient ("Ambient", Range(1,0)) = 0.5 - - _BumpMap ("Normal map", 2D) = "bump" {} - _BumpOutline ("Bump Outline", Range(0,1)) = 0 - _BumpFace ("Bump Face", Range(0,1)) = 0 - - _ReflectFaceColor ("Reflection Color", Color) = (0,0,0,1) - _ReflectOutlineColor("Reflection Color", Color) = (0,0,0,1) - _Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ } - _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - - - _UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _MaskCoord ("Mask Coordinates", vector) = (0, 0, 32767, 32767) - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} -} - -SubShader { - - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma target 3.0 - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ BEVEL_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - #pragma shader_feature __ GLOW_ON - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" - - #define UI_SHINY 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - - fixed4 frag(pixel_t IN) : SV_Target - { - half4 color = PixShader(IN); - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - // Shiny - color = ApplyShinyEffect(color, IN.eParam); - - return color * IN.color.a; - } - ENDCG - } -} - -Fallback "TextMeshPro/Mobile/Distance Field (UIShiny)" -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader.meta deleted file mode 100644 index 99db294..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: 7a9c01b59189f4a738528999fa0aa9fe -ShaderImporter: - externalObjects: {} - defaultTextures: - - _FaceTex: {instanceID: 0} - - _OutlineTex: {instanceID: 0} - - _BumpMap: {instanceID: 0} - - _Cube: {instanceID: 0} - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader deleted file mode 100644 index b6a4741..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader +++ /dev/null @@ -1,157 +0,0 @@ -Shader "TextMeshPro/Distance Field (UITransition)" { - -Properties { - _FaceTex ("Face Texture", 2D) = "white" {} - _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 - _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 - _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(-1,1)) = 0 - - _Bevel ("Bevel", Range(0,1)) = 0.5 - _BevelOffset ("Bevel Offset", Range(-0.5,0.5)) = 0 - _BevelWidth ("Bevel Width", Range(-.5,0.5)) = 0 - _BevelClamp ("Bevel Clamp", Range(0,1)) = 0 - _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 - - _LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416 - _SpecularColor ("Specular", Color) = (1,1,1,1) - _SpecularPower ("Specular", Range(0,4)) = 2.0 - _Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10 - _Diffuse ("Diffuse", Range(0,1)) = 0.5 - _Ambient ("Ambient", Range(1,0)) = 0.5 - - _BumpMap ("Normal map", 2D) = "bump" {} - _BumpOutline ("Bump Outline", Range(0,1)) = 0 - _BumpFace ("Bump Face", Range(0,1)) = 0 - - _ReflectFaceColor ("Reflection Color", Color) = (0,0,0,1) - _ReflectOutlineColor("Reflection Color", Color) = (0,0,0,1) - _Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ } - _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - - - _UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _MaskCoord ("Mask Coordinates", vector) = (0, 0, 32767, 32767) - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} -} - -SubShader { - - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma target 3.0 - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ BEVEL_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - #pragma shader_feature __ GLOW_ON - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" - - #define ADD 1 - #define UI_TRANSITION 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - #pragma shader_feature __ FADE CUTOFF DISSOLVE - - fixed4 frag(pixel_t IN) : SV_Target - { - half4 color = PixShader(IN); - - // Transition - color = ApplyTransitionEffect(color, IN.eParam); - color.rgb *= color.a; - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - return color * IN.color.a; - } - ENDCG - } -} - -Fallback "TextMeshPro/Mobile/Distance Field (UITransition)" -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader.meta deleted file mode 100644 index 0eac49e..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: fa7d8d6e393ae4a9b94b2331c7d0097c -ShaderImporter: - externalObjects: {} - defaultTextures: - - _FaceTex: {instanceID: 0} - - _OutlineTex: {instanceID: 0} - - _BumpMap: {instanceID: 0} - - _Cube: {instanceID: 0} - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader deleted file mode 100644 index 2ad9fe1..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader +++ /dev/null @@ -1,122 +0,0 @@ -// Simplified SDF shader: -// - No Shading Option (bevel / bump / env map) -// - No Glow Option -// - Softness is applied on both side of the outline - -Shader "TextMeshPro/Mobile/Distance Field (UIDissolve)" { - -Properties { - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineWidth ("Outline Thickness", Range(0,1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - _UnderlayColor ("Border Color", Color) = (0,0,0,.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = .5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5 - _ScaleX ("Scale X", float) = 1 - _ScaleY ("Scale Y", float) = 1 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} -} - -SubShader { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ OUTLINE_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - - #define MOBILE 1 - #define UI_DISSOLVE 1 - #define DISSOLVE 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - #pragma shader_feature __ ADD SUBTRACT FILL - - fixed4 frag(pixel_t IN) : SV_Target - { - half4 color = PixShader(IN); - - // Dissolve - color = ApplyTransitionEffect(color, IN.eParam); - color.rgb *= color.a; - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - return color * IN.color.a; - } - ENDCG - } -} - -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader.meta deleted file mode 100644 index 2e47f76..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 15b053e7702f54708a75b82db8303cba -ShaderImporter: - externalObjects: {} - defaultTextures: - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader deleted file mode 100644 index 77efd50..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader +++ /dev/null @@ -1,140 +0,0 @@ -// Simplified SDF shader: -// - No Shading Option (bevel / bump / env map) -// - No Glow Option -// - Softness is applied on both side of the outline - -Shader "TextMeshPro/Mobile/Distance Field (UIEffect)" { - -Properties { - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineWidth ("Outline Thickness", Range(0,1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - _UnderlayColor ("Border Color", Color) = (0,0,0,.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = .5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5 - _ScaleX ("Scale X", float) = 1 - _ScaleY ("Scale Y", float) = 1 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} -} - -SubShader { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ OUTLINE_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL - #pragma shader_feature __ ADD SUBTRACT FILL - #pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR - #pragma shader_feature __ EX - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - - #define MOBILE 1 - #define UI_EFFECT 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - - fixed4 frag(pixel_t IN) : SV_Target - { - fixed4 param = tex2D(_ParamTex, float2(0.5, IN.eParam)); - fixed effectFactor = param.x; - fixed colorFactor = param.y; - fixed blurFactor = param.z; - - #if PIXEL - half2 pixelSize = max(2, (1-effectFactor*0.95) * float2(_TextureWidth, _TextureHeight)); - UV(IN).xy = round(UV(IN).xy * pixelSize) / pixelSize; - #endif - - #if defined(UI_BLUR) && EX - half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4, IN.uvMask); - #elif defined(UI_BLUR) - half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4); - #else - half4 color = PixShader(IN) * IN.color.a; - #endif - - #if defined (UI_TONE) - color = ApplyToneEffect(color, effectFactor); - #endif - - color = ApplyColorEffect(color, fixed4(IN.color.rgb, colorFactor)); - color.rgb *= color.a; - - return color * IN.color.a; - } - ENDCG - } -} - -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader.meta deleted file mode 100644 index f1b060c..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: af5de66855c8d4b758264103262d4883 -ShaderImporter: - externalObjects: {} - defaultTextures: - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader deleted file mode 100644 index 35ea899..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader +++ /dev/null @@ -1,120 +0,0 @@ -// Simplified SDF shader: -// - No Shading Option (bevel / bump / env map) -// - No Glow Option -// - Softness is applied on both side of the outline - -Shader "TextMeshPro/Mobile/Distance Field (UIHsvModifier)" { - -Properties { - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineWidth ("Outline Thickness", Range(0,1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - _UnderlayColor ("Border Color", Color) = (0,0,0,.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = .5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5 - _ScaleX ("Scale X", float) = 1 - _ScaleY ("Scale Y", float) = 1 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} -} - -SubShader { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ OUTLINE_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - - #define MOBILE 1 - #define UI_HSV_MODIFIER 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - - fixed4 frag(pixel_t IN) : SV_Target - { - half4 color = PixShader(IN); - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - // Hsv - color = ApplyHsvEffect(color, IN.eParam); - color.rgb *= IN.color.rgb; - - return color * IN.color.a; - } - ENDCG - } -} - -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader.meta deleted file mode 100644 index 86d2d6a..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 374467ba16b434455b8886b70c293a0d -ShaderImporter: - externalObjects: {} - defaultTextures: - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader deleted file mode 100644 index c598b5f..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader +++ /dev/null @@ -1,119 +0,0 @@ -// Simplified SDF shader: -// - No Shading Option (bevel / bump / env map) -// - No Glow Option -// - Softness is applied on both side of the outline - -Shader "TextMeshPro/Mobile/Distance Field (UIShiny)" { - -Properties { - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineWidth ("Outline Thickness", Range(0,1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - _UnderlayColor ("Border Color", Color) = (0,0,0,.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = .5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5 - _ScaleX ("Scale X", float) = 1 - _ScaleY ("Scale Y", float) = 1 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} -} - -SubShader { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ OUTLINE_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - - #define MOBILE 1 - #define UI_SHINY 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - - fixed4 frag(pixel_t IN) : SV_Target - { - half4 color = PixShader(IN); - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - // Shiny - color = ApplyShinyEffect(color, IN.eParam); - - return color * IN.color.a; - } - ENDCG - } -} - -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader.meta deleted file mode 100644 index 847eacb..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f852f73c234534dbc9da0e57e661dc9d -ShaderImporter: - externalObjects: {} - defaultTextures: - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader deleted file mode 100644 index 8279ee2..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader +++ /dev/null @@ -1,122 +0,0 @@ -// Simplified SDF shader: -// - No Shading Option (bevel / bump / env map) -// - No Glow Option -// - Softness is applied on both side of the outline - -Shader "TextMeshPro/Mobile/Distance Field (UITransition)" { - -Properties { - _FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineWidth ("Outline Thickness", Range(0,1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - _UnderlayColor ("Border Color", Color) = (0,0,0,.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = .5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5 - _ScaleX ("Scale X", float) = 1 - _ScaleY ("Scale Y", float) = 1 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} -} - -SubShader { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex VertShader - #pragma fragment frag - #pragma shader_feature __ OUTLINE_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - - #define MOBILE 1 - #define ADD 1 - #define UI_TRANSITION 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "UI-Effect-TMPro.cginc" - #pragma shader_feature __ FADE CUTOFF DISSOLVE - - fixed4 frag(pixel_t IN) : SV_Target - { - half4 color = PixShader(IN); - - // Transition - color = ApplyTransitionEffect(color, IN.eParam); - color.rgb *= color.a; - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - return color * IN.color.a; - } - ENDCG - } -} - -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader.meta deleted file mode 100644 index 7f35468..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3158328dfc0344d72bc0e7eaa29cac0e -ShaderImporter: - externalObjects: {} - defaultTextures: - - _MainTex: {instanceID: 0} - - _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3} - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader deleted file mode 100644 index 4f18be3..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader +++ /dev/null @@ -1,90 +0,0 @@ -Shader "TextMeshPro/Sprite (UIDissolve)" -{ - Properties - { - _MainTex ("Sprite Texture", 2D) = "white" {} - _Color ("Tint", Color) = (1,1,1,1) - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - - [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} - } - - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull Off - Lighting Off - ZWrite Off - ZTest [unity_GUIZTestMode] - Blend SrcAlpha OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - - #define TMP_SPRITE 1 - #define UI_DISSOLVE 1 - #define DISSOLVE 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Sprite.cginc" - #pragma shader_feature __ ADD SUBTRACT FILL - - fixed4 frag(v2f IN) : SV_Target - { - half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color; - - #if UNITY_UI_CLIP_RECT - color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); - #endif - - #ifdef UNITY_UI_ALPHACLIP - clip (color.a - 0.001); - #endif - - // Dissolve - color = ApplyTransitionEffect(color, IN.eParam); - - return color; - } - ENDCG - } - } -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader.meta deleted file mode 100644 index ef2d8f0..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 43184227f35f24905865f36834c4fea9 -timeCreated: 1450517184 -licenseType: Pro -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader deleted file mode 100644 index d3ae4a6..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader +++ /dev/null @@ -1,110 +0,0 @@ -Shader "TextMeshPro/Sprite (UIEffect)" -{ - Properties - { - _MainTex ("Sprite Texture", 2D) = "white" {} - _Color ("Tint", Color) = (1,1,1,1) - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - - [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} - } - - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull Off - Lighting Off - ZWrite Off - ZTest [unity_GUIZTestMode] - Blend SrcAlpha OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL - #pragma shader_feature __ ADD SUBTRACT FILL - #pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR - #pragma shader_feature __ EX - - #define TMP_SPRITE 1 - #define UI_EFFECT 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Sprite.cginc" - - fixed4 frag(v2f IN) : SV_Target - { - fixed4 param = tex2D(_ParamTex, float2(0.5, IN.eParam)); - fixed effectFactor = param.x; - fixed colorFactor = param.y; - fixed blurFactor = param.z; - - #if PIXEL - half2 pixelSize = max(2, (1-effectFactor*0.95) * _MainTex_TexelSize.zw); - IN.texcoord = round(IN.texcoord * pixelSize) / pixelSize; - #endif - - #if defined(UI_BLUR) && EX - half4 color = (Tex2DBlurring(_MainTex, IN.texcoord, blurFactor * _MainTex_TexelSize.xy * 2, IN.uvMask) + _TextureSampleAdd); - #elif defined(UI_BLUR) - half4 color = (Tex2DBlurring(_MainTex, IN.texcoord, blurFactor * _MainTex_TexelSize.xy * 2) + _TextureSampleAdd); - #else - half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd); - #endif - - color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); - - #if UNITY_UI_ALPHACLIP - clip (color.a - 0.001); - #endif - - #if defined (UI_TONE) - color = ApplyToneEffect(color, effectFactor); - #endif - - color = ApplyColorEffect(color, fixed4(IN.color.rgb, colorFactor)); - color.a *= IN.color.a; - - return color; - } - ENDCG - } - } -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader.meta deleted file mode 100644 index 0b6da9c..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 466007890ce83421082c2d58b0121dcd -timeCreated: 1450517184 -licenseType: Pro -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader deleted file mode 100644 index d8ea01c..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader +++ /dev/null @@ -1,87 +0,0 @@ -Shader "TextMeshPro/Sprite (UIHsvModifier)" -{ - Properties - { - _MainTex ("Sprite Texture", 2D) = "white" {} - _Color ("Tint", Color) = (1,1,1,1) - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - - [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} - } - - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull Off - Lighting Off - ZWrite Off - ZTest [unity_GUIZTestMode] - Blend SrcAlpha OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #define TMP_SPRITE 1 - #define UI_HSV_MODIFIER 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Sprite.cginc" - - fixed4 frag(v2f IN) : SV_Target - { - half4 color = tex2D(_MainTex, IN.texcoord);// + _TextureSampleAdd) * IN.color; - - #if UNITY_UI_CLIP_RECT - color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); - #endif - - #ifdef UNITY_UI_ALPHACLIP - clip (color.a - 0.001); - #endif - - // Hsv - color = (ApplyHsvEffect(color, IN.eParam)+ _TextureSampleAdd) * IN.color; - - return color; - } - ENDCG - } - } -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader.meta deleted file mode 100644 index 88ffa64..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 1c6bc77283bff44c7aad3f18690f024b -timeCreated: 1450517184 -licenseType: Pro -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader deleted file mode 100644 index c21f504..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader +++ /dev/null @@ -1,87 +0,0 @@ -Shader "TextMeshPro/Sprite (UIShiny)" -{ - Properties - { - _MainTex ("Sprite Texture", 2D) = "white" {} - _Color ("Tint", Color) = (1,1,1,1) - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - - [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} - } - - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull Off - Lighting Off - ZWrite Off - ZTest [unity_GUIZTestMode] - Blend SrcAlpha OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #define TMP_SPRITE 1 - #define UI_SHINY 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Sprite.cginc" - - fixed4 frag(v2f IN) : SV_Target - { - half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color; - - #if UNITY_UI_CLIP_RECT - color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); - #endif - - #ifdef UNITY_UI_ALPHACLIP - clip (color.a - 0.001); - #endif - - // Shiny - color = ApplyShinyEffect(color, IN.eParam); - - return color; - } - ENDCG - } - } -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader.meta deleted file mode 100644 index 20af06a..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c518dd47762104054aeb15fbb2092350 -timeCreated: 1450517184 -licenseType: Pro -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader deleted file mode 100644 index e88635c..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader +++ /dev/null @@ -1,90 +0,0 @@ -Shader "TextMeshPro/Sprite (UITransition)" -{ - Properties - { - _MainTex ("Sprite Texture", 2D) = "white" {} - _Color ("Tint", Color) = (1,1,1,1) - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _ColorMask ("Color Mask", Float) = 15 - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - - [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0 - - _NoiseTex("Noise Texture (A)", 2D) = "white" {} - } - - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull Off - Lighting Off - ZWrite Off - ZTest [unity_GUIZTestMode] - Blend SrcAlpha OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #define TMP_SPRITE 1 - #define UI_TRANSITION 1 - #define ADD 1 - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Sprite.cginc" - #pragma shader_feature __ FADE CUTOFF DISSOLVE - - fixed4 frag(v2f IN) : SV_Target - { - half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color; - - #if UNITY_UI_CLIP_RECT - color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); - #endif - - #ifdef UNITY_UI_ALPHACLIP - clip (color.a - 0.001); - #endif - - // Transition - color = ApplyTransitionEffect(color, IN.eParam); - color.rgb *= color.a; - - return color; - } - ENDCG - } - } -CustomEditor "Coffee.UIEffect.Editors.TMP_SDFShaderGUI" -} diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader.meta deleted file mode 100644 index ae05060..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 8a91c64bfdfa7448cb176a87750a6b64 -timeCreated: 1450517184 -licenseType: Pro -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc deleted file mode 100644 index bc41b46..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc +++ /dev/null @@ -1,452 +0,0 @@ -#ifndef UI_EFFECT_TMPRO_INCLUDED -#define UI_EFFECT_TMPRO_INCLUDED - -// Used by Unity internally to handle Texture Tiling and Offset. -float4 _FaceTex_ST; -float4 _OutlineTex_ST; - - -#if MOBILE -#define UV(x) x.texcoord0 -#define UV2(x) x.texcoord1 - -struct vertex_t { - float4 vertex : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; -#if EX - float2 uvMask : TEXCOORD2; -#endif -}; - -struct pixel_t { - float4 vertex : SV_POSITION; - fixed4 faceColor : COLOR; - fixed4 outlineColor : COLOR1; - float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV - half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w) - half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw) -#if (UNDERLAY_ON | UNDERLAY_INNER) - float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved - half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y) -#endif - fixed4 color : COLOR2; -#if UI_DISSOLVE || UI_TRANSITION - half3 eParam : TEXCOORD5; -#elif UI_SHINY - half2 eParam : TEXCOORD5; -#else - half eParam : TEXCOORD5; -#endif -#if EX - half4 uvMask : TEXCOORD6; -#endif -}; - - -pixel_t VertShader(vertex_t input) -{ - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float layerScale = scale; - - scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); - float bias = (0.5 - weight) * scale - 0.5; - float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale; - -// float opacity = input.color.a; -//#if (UNDERLAY_ON | UNDERLAY_INNER) -// opacity = 1.0; -//#endif - - fixed4 faceColor = input.color * _FaceColor; -// fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor; -// faceColor.rgb *= faceColor.a; - - fixed4 outlineColor = _OutlineColor; -// outlineColor.a *= opacity; -// outlineColor.rgb *= outlineColor.a; - outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2)))); - -#if (UNDERLAY_ON | UNDERLAY_INNER) - - layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); - float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 layerOffset = float2(x, y); -#endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Structure for pixel shader - #if UI_DISSOLVE || UI_TRANSITION - half3 param = UnpackToVec3(input.texcoord0.y); - #elif UI_SHINY - half2 param = UnpackToVec2(input.texcoord0.y); - #else - half param = input.texcoord0.y; - #endif - - #if UI_EFFECT - input.texcoord0 = UnpackToVec2(input.texcoord0.x) * 2 - 0.5; - #else - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - #endif - pixel_t output = { - vPosition, - faceColor, - outlineColor, - float4(input.texcoord0, maskUV.x, maskUV.y), - half4(scale, bias - outline, bias + outline, bias), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4(input.texcoord0 + layerOffset, input.color.a, 0), - half2(layerScale, layerBias), - #endif - input.color, - param, - #if EX - half4(UnpackToVec2(input.uvMask.x), UnpackToVec2(input.uvMask.y)), - #endif - }; - - return output; -} - - -// PIXEL SHADER -fixed4 PixShader(pixel_t input) : SV_Target -{ - half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x; - half4 c = input.faceColor * saturate(d - input.param.w); - -#ifdef OUTLINE_ON - c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z)); - c *= saturate(d - input.param.y); -#endif - -#if UNDERLAY_ON - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a); -#endif - -#if UNDERLAY_INNER - half sd = saturate(d - input.param.z); - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.a); -#endif - -// Alternative implementation to UnityGet2DClipping with support for softness. -#if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw); - c *= m.x * m.y; -#endif - -#if (UNDERLAY_ON | UNDERLAY_INNER) -// c *= input.texcoord1.z; -#endif - -// Dissolve -//c = ApplyTransitionEffect(c, input.eParam); -//c.rgb *= c.a; - -#if UNITY_UI_ALPHACLIP - clip(c.a - 0.001); -#endif - - return c; -} - -#else -#define UV(x) x.atlas -#define UV2(x) x.texcoord2 - -struct vertex_t { - float4 position : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; -#if EX - float2 uvMask : TEXCOORD2; -#endif -}; - - -struct pixel_t { - float4 position : SV_POSITION; - fixed4 color : COLOR; - float2 atlas : TEXCOORD0; // Atlas - float4 param : TEXCOORD1; // alphaClip, scale, bias, weight - float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw) - float3 viewDir : TEXCOORD3; - -#if (UNDERLAY_ON || UNDERLAY_INNER) - float4 texcoord2 : TEXCOORD4; // u,v, scale, bias - fixed4 underlayColor : COLOR1; -#endif - float4 textures : TEXCOORD5; -#if UI_DISSOLVE || UI_TRANSITION - half3 eParam : TEXCOORD6; -#elif UI_SHINY - half2 eParam : TEXCOORD6; -#else - half eParam : TEXCOORD6; -#endif -#if EX - half4 uvMask : TEXCOORD7; -#endif -}; - -pixel_t VertShader(vertex_t input) -{ - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float bias =(.5 - weight) + (.5 / scale); - - float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA); - -#if GLOW_ON - alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB); -#endif - - alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight; - -#if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float bScale = scale; - bScale /= 1 + ((_UnderlaySoftness*_ScaleRatioC) * bScale); - float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 bOffset = float2(x, y); -#endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Support for texture tiling and offset - float2 textureUV = UnpackUV(input.texcoord1.x); - float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); - float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); - - #if UI_DISSOLVE || UI_TRANSITION - half3 param = UnpackToVec3(input.texcoord0.y); - #elif UI_SHINY - half2 param = UnpackToVec2(input.texcoord0.y); - #else - half param = input.texcoord0.y; - #endif - - #if UI_EFFECT - input.texcoord0 = UnpackToVec2(input.texcoord0.x) * 2 - 0.5; - #else - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - #endif - pixel_t output = { - vPosition, - input.color, - input.texcoord0, - float4(alphaClip, scale, bias, weight), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz), - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4(input.texcoord0 + bOffset, bScale, bBias), - underlayColor, - #endif - float4(faceUV, outlineUV), - param, - #if EX - half4(UnpackToVec2(input.uvMask.x), UnpackToVec2(input.uvMask.y)), - #endif - }; - - return output; -} - - -fixed4 PixShader(pixel_t input)// : SV_Target -{ - float c = tex2D(_MainTex, input.atlas).a; - -// #ifndef UNDERLAY_ON -// clip(c - input.param.x); -// #endif - - float scale = input.param.y; - float bias = input.param.z; - float weight = input.param.w; - float sd = (bias - c) * scale; - - float outline = (_OutlineWidth * _ScaleRatioA) * scale; - float softness = (_OutlineSoftness * _ScaleRatioA) * scale; - - half4 faceColor = _FaceColor; - half4 outlineColor = _OutlineColor; - -// faceColor.rgb *= input.color.rgb; - - faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); - outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); - - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - -#if BEVEL_ON - float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); - float3 n = GetSurfaceNormal(input.atlas, weight, dxy); - - float3 bump = UnpackNormal(tex2D(_BumpMap, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y)).xyz; - bump *= lerp(_BumpFace, _BumpOutline, saturate(sd + outline * 0.5)); - n = normalize(n- bump); - - float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); - - float3 col = GetSpecular(n, light); - faceColor.rgb += col*faceColor.a; - faceColor.rgb *= 1-(dot(n, light)*_Diffuse); - faceColor.rgb *= lerp(_Ambient, 1, n.z*n.z); - - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); - faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; -#endif - -#if UNDERLAY_ON - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a); -#endif - -#if UNDERLAY_INNER - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a); -#endif - -#if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - faceColor.rgb += glowColor.rgb * glowColor.a; -#endif - -// Alternative implementation to UnityGet2DClipping with support for softness. -#if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw); - faceColor *= m.x * m.y; -#endif - -//#if UNITY_UI_ALPHACLIP -// clip(faceColor.a - 0.001); -//#endif - - return faceColor; -} - -#endif - -#if defined(UI_BLUR) -fixed4 Tex2DBlurring (pixel_t IN, half2 blur, half4 mask) -{ - #if FASTBLUR && EX - const int KERNEL_SIZE = 5; - const float KERNEL_[5] = { 0.2486, 0.7046, 1.0, 0.7046, 0.2486}; - #elif MEDIUMBLUR && EX - const int KERNEL_SIZE = 9; - const float KERNEL_[9] = { 0.0438, 0.1719, 0.4566, 0.8204, 1.0, 0.8204, 0.4566, 0.1719, 0.0438}; - #elif DETAILBLUR && EX - const int KERNEL_SIZE = 13; - const float KERNEL_[13] = { 0.0438, 0.1138, 0.2486, 0.4566, 0.7046, 0.9141, 1.0, 0.9141, 0.7046, 0.4566, 0.2486, 0.1138, 0.0438}; - #elif FASTBLUR - const int KERNEL_SIZE = 3; - const float KERNEL_[3] = { 0.4566, 1.0, 0.4566}; - #elif MEDIUMBLUR - const int KERNEL_SIZE = 5; - const float KERNEL_[5] = { 0.2486, 0.7046, 1.0, 0.7046, 0.2486}; - #elif DETAILBLUR - const int KERNEL_SIZE = 7; - const float KERNEL_[7] = { 0.1719, 0.4566, 0.8204, 1.0, 0.8204, 0.4566, 0.1719}; - #else - const int KERNEL_SIZE = 1; - const float KERNEL_[1] = { 1.0 }; - #endif - float4 o = 0; - float sum = 0; - float2 shift = 0; - half alpha = IN.color.a; - half2 texcood = UV(IN); - #if UNDERLAY_ON - half2 texcood2 = UV2(IN); - #endif - for(int x = 0; x < KERNEL_SIZE; x++) - { - shift.x = blur.x * (float(x) - KERNEL_SIZE/2); - for(int y = 0; y < KERNEL_SIZE; y++) - { - shift.y = blur.y * (float(y) - KERNEL_SIZE/2); - float2 uv = texcood + shift; - float weight = KERNEL_[x] * KERNEL_[y]; - sum += weight; - UV(IN).xy = uv; - IN.color.a = weight; - - #if UNDERLAY_ON - UV2(IN).xy = texcood2 + shift; - #endif - - #if EX - fixed masked = min(mask.x <= uv.x, uv.x <= mask.z) * min(mask.y <= uv.y, uv.y <= mask.w); - o += lerp(fixed4(0, 0, 0, 0), PixShader(IN) * weight, masked); - #else - o += PixShader(IN) * weight; - #endif - } - } - IN.color.a = alpha; - return o / sum;// * alpha; -} - -fixed4 Tex2DBlurring (pixel_t IN, half2 blur) -{ - return Tex2DBlurring(IN, blur, half4(0,0,1,1)); -} -#endif - - - -#endif // UI_EFFECT_TMPRO_INCLUDED diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc.meta deleted file mode 100644 index 80537ae..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c6f704fc82d194f60ac2b8884db48ffe -timeCreated: 1487915863 -licenseType: Pro -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Materials/UI-Effect.mat b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Materials/UI-Effect.mat index c08426e..f6fe4b8 100644 --- a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Materials/UI-Effect.mat +++ b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Materials/UI-Effect.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Fill-MediumBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: EX FILL MEDIUMBLUR + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -47,7 +47,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Fill-FastBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: EX FASTBLUR FILL + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -123,7 +123,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Add m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: ADD NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -161,7 +161,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Add-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR ADD PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -199,7 +199,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Add m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: ADD GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -237,7 +237,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Fill-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR FILL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -275,7 +275,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Add-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR ADD HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -313,7 +313,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -351,7 +351,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Fill m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FILL SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -389,7 +389,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -427,7 +427,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Add-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR ADD GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -461,7 +461,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Fill-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR FILL CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -495,7 +495,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -529,7 +529,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -563,7 +563,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -597,7 +597,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -631,7 +631,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Fill-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR FILL SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -665,7 +665,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -703,7 +703,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Subtract m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: SUBTRACT MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -737,7 +737,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Add m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: ADD PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -775,7 +775,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Add-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR ADD CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -809,7 +809,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Subtract-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR SUBTRACT SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -843,7 +843,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Add m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: ADD HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -877,7 +877,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Add-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR ADD PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -911,7 +911,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Add-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR ADD NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -945,7 +945,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -983,7 +983,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Fill m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FILL MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1017,7 +1017,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Add-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR ADD NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1055,7 +1055,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Subtract-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR SUBTRACT NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1089,7 +1089,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Fill-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR FILL SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1123,7 +1123,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Add-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR ADD HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1157,7 +1157,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Fill-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR FILL SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1191,7 +1191,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Subtract-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR SUBTRACT + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1225,7 +1225,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1259,7 +1259,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Fill-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR FILL NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1293,7 +1293,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1331,7 +1331,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Subtract-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR SUBTRACT PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1365,7 +1365,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Add-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR ADD SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1399,7 +1399,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Subtract-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR SUBTRACT NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1471,7 +1471,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1505,7 +1505,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Add-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR ADD + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1539,7 +1539,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Subtract-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR SUBTRACT NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1573,7 +1573,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Add-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR ADD GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1611,7 +1611,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1645,7 +1645,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Subtract-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR SUBTRACT HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1679,7 +1679,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Add-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR ADD SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1713,7 +1713,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Subtract-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR SUBTRACT GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1747,7 +1747,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Fill-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR FILL NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1781,7 +1781,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1815,7 +1815,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1849,7 +1849,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Add m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: ADD SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1883,7 +1883,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1917,7 +1917,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Fill m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FILL GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1955,7 +1955,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Fill-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR FILL MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -1989,7 +1989,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Subtract m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: SUBTRACT SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2023,7 +2023,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Add-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR ADD MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2057,7 +2057,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Subtract-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR SUBTRACT GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2091,7 +2091,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Add-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR ADD MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2125,7 +2125,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Fill-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR FILL HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2159,7 +2159,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-MediumBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: EX MEDIUMBLUR + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2197,7 +2197,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Add-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR ADD SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2235,7 +2235,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2269,7 +2269,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Fill-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR FILL GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2307,7 +2307,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Fill-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR FILL MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2341,7 +2341,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Add m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: ADD + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2379,7 +2379,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Add-DetailBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: ADD DETAILBLUR EX + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2417,7 +2417,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2455,7 +2455,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Subtract-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR SUBTRACT CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2489,7 +2489,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Subtract-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR SUBTRACT MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2523,7 +2523,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Add-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR ADD + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2561,7 +2561,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-DetailBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR EX + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2599,7 +2599,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2633,7 +2633,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Subtract m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: SUBTRACT NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2667,7 +2667,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Subtract m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: SUBTRACT CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2701,7 +2701,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2735,7 +2735,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2773,7 +2773,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Subtract-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR SUBTRACT PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2807,7 +2807,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Fill-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR FILL NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2841,7 +2841,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2875,7 +2875,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Add-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR ADD HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2909,7 +2909,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Fill m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FILL HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2943,7 +2943,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -2977,7 +2977,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Add-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR ADD MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3011,7 +3011,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Add-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR ADD CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3045,7 +3045,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3079,7 +3079,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3113,7 +3113,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-FastBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: EX FASTBLUR + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3151,7 +3151,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Add m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: ADD CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3185,7 +3185,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Subtract-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR SUBTRACT + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3223,7 +3223,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3257,7 +3257,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Subtract-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR SUBTRACT SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3291,7 +3291,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Subtract-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR SUBTRACT CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3325,7 +3325,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Fill m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FILL NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3359,7 +3359,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Subtract-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR SUBTRACT MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3393,7 +3393,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Add-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR ADD PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3427,7 +3427,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Fill-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR FILL HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3461,7 +3461,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Subtract-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR SUBTRACT + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3495,7 +3495,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Fill-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR FILL CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3529,7 +3529,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Subtract-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR SUBTRACT HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3563,7 +3563,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Add-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR ADD + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3601,7 +3601,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Fill-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR FILL GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3639,7 +3639,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3673,7 +3673,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3711,7 +3711,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Subtract-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR SUBTRACT PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3745,7 +3745,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Fill-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR FILL MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3779,7 +3779,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Fill-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR FILL PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3813,7 +3813,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Fill m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FILL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3851,7 +3851,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Fill-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR FILL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3885,7 +3885,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Fill-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR FILL PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3919,7 +3919,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Subtract m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: SUBTRACT GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3957,7 +3957,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Subtract-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR SUBTRACT HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -3991,7 +3991,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Subtract m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: SUBTRACT + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4029,7 +4029,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Add-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR ADD NEGA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4063,7 +4063,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Add-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR ADD GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4101,7 +4101,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Subtract m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: SUBTRACT HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4135,7 +4135,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4169,7 +4169,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Subtract-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR SUBTRACT SEPIA + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4203,7 +4203,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-DetailBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR EX GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4241,7 +4241,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Subtract-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR SUBTRACT MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4275,7 +4275,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Fill-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR FILL PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4309,7 +4309,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4343,7 +4343,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4381,7 +4381,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Subtract-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR SUBTRACT GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4415,7 +4415,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Subtract m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: SUBTRACT PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4449,7 +4449,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Fill-FastBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FASTBLUR FILL GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4483,7 +4483,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Mono-Add m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: ADD MONO + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4517,7 +4517,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Fill-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR FILL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4555,7 +4555,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Fill-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR FILL CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4589,7 +4589,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Subtract-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR SUBTRACT CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4623,7 +4623,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Pixel-Fill m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FILL PIXEL + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4657,7 +4657,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Fill m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: FILL CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4691,7 +4691,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Cutoff-Add-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR ADD CUTOFF + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4725,7 +4725,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Hue-Fill-DetailBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR FILL HUE + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4759,7 +4759,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-MediumBlur m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: MEDIUMBLUR + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4797,7 +4797,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Nega-Fill-DetailBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR EX FILL NEGA + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4835,7 +4835,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Grayscale-Fill-DetailBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR EX FILL GRAYSCALE + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4873,7 +4873,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Sepia-Fill-DetailBlur-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: DETAILBLUR EX FILL SEPIA + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -4911,7 +4911,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: UI-Effect-Fill-Ex m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3} - m_ShaderKeywords: EX FILL + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/1uacdrk5ajfqttmocoj8n1fguv-c2507e1f253341b4207000b9f5fe358b.png.meta b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/1uacdrk5ajfqttmocoj8n1fguv-c2507e1f253341b4207000b9f5fe358b.png.meta index 91907ae..a6657fe 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/1uacdrk5ajfqttmocoj8n1fguv-c2507e1f253341b4207000b9f5fe358b.png.meta +++ b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/1uacdrk5ajfqttmocoj8n1fguv-c2507e1f253341b4207000b9f5fe358b.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: -5607665484935864214 second: 1uacdrk5ajfqttmocoj8n1fguv-c2507e1f253341b4207000b9f5fe358b_0 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,10 +23,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -65,8 +67,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -76,9 +80,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -88,9 +93,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -100,10 +106,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone + - serializedVersion: 4 + buildTarget: iOS maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -112,6 +119,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -128,6 +136,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -139,6 +148,7 @@ TextureImporter: edges: [] weights: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -148,9 +158,12 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + spriteCustomMetadata: + entries: [] + nameFileIdTable: + 1uacdrk5ajfqttmocoj8n1fguv-c2507e1f253341b4207000b9f5fe358b_0: -5607665484935864214 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134.png.meta b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134.png.meta index fbd320f..9771268 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134.png.meta +++ b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134.png.meta @@ -165,7 +165,7 @@ TextureImporter: 213: -2811571389252335670 second: 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_53 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -182,10 +182,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -224,8 +226,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -235,9 +239,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -247,9 +252,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -259,6 +265,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -275,6 +282,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -296,6 +304,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -317,6 +326,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -338,6 +348,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -359,6 +370,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -380,6 +392,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -401,6 +414,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -422,6 +436,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -443,6 +458,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -464,6 +480,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -485,6 +502,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -506,6 +524,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -527,6 +546,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -548,6 +568,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -569,6 +590,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -590,6 +612,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -611,6 +634,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -632,6 +656,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -653,6 +678,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -674,6 +700,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -695,6 +722,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -716,6 +744,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -737,6 +766,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -758,6 +788,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -779,6 +810,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -800,6 +832,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -821,6 +854,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -842,6 +876,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -863,6 +898,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -884,6 +920,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -905,6 +942,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -926,6 +964,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -947,6 +986,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -968,6 +1008,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -989,6 +1030,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1010,6 +1052,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1031,6 +1074,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1052,6 +1096,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1073,6 +1118,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1094,6 +1140,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1115,6 +1162,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1136,6 +1184,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1157,6 +1206,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1178,6 +1228,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1199,6 +1250,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1220,6 +1272,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1241,6 +1294,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1262,6 +1316,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1283,6 +1338,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1304,6 +1360,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1325,6 +1382,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1346,6 +1404,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1367,6 +1426,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1388,6 +1448,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -1919,6 +1980,7 @@ TextureImporter: - {x: -171, y: 342} - {x: -174, y: 339} - {x: -173, y: 339} + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -1928,9 +1990,65 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + spriteCustomMetadata: + entries: [] + nameFileIdTable: + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_0: 7665297941653243114 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_1: -2412944145381371751 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_10: 5118644077100750541 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_11: -7229163220818308577 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_12: -9120600793784221690 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_13: -2965399405385539181 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_14: 5890682809854816866 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_15: -5417909841277648442 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_16: -665050849695395008 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_17: 8682034241610782507 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_18: -6573334790318447088 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_19: 5059980875731502256 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_2: 8228730565043098574 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_20: -7628388697099029080 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_21: 7170745494925433077 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_22: -2571023184296165555 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_23: -9192091367895293934 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_24: -848421759184358351 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_25: 9196411889247722995 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_26: 561609785760361907 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_27: -3531842527505809125 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_28: -9089168110512617150 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_29: -2889922845592434480 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_3: -4367146705986076312 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_30: -5976518448480754117 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_31: 734113830533174147 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_32: 1733158932351378369 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_33: 5209310801971091685 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_34: 2322582001942222071 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_35: 8793726190578518524 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_36: 8655294034446077772 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_37: 6926578295133225156 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_38: -1023481969782777897 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_39: 7396147576320674940 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_4: -3387028827871034133 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_40: -4033469010363751939 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_41: 5274365655463907642 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_42: -2467852506163787726 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_43: 5515399202704813096 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_44: -5924611699074615935 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_45: 8421009961591445557 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_46: 6004397793811865258 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_47: -8913036746241933309 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_48: 989669249371308002 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_49: -3624656263914950298 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_5: 8919398700965861057 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_50: -7607456627298300113 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_51: -1609881186388565241 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_52: -3532837954792265543 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_53: -2811571389252335670 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_6: 3289497763870857541 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_7: 478874488427336611 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_8: 4258782385970040740 + 6rf7oodogdjj94kre161mjq6bn-74e93e8b5108d6763a22df752eb86134_9: 7822982110854853509 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/misc.png.meta b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/misc.png.meta index 987e3cb..a4d652e 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/misc.png.meta +++ b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/misc.png.meta @@ -69,7 +69,7 @@ TextureImporter: 213: 4452512340041527070 second: misc_10 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -86,10 +86,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -128,8 +130,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -139,9 +143,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -151,9 +156,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -163,10 +169,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone + - serializedVersion: 4 + buildTarget: iOS maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -175,6 +182,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -191,6 +199,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -212,6 +221,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -233,6 +243,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -254,6 +265,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -275,6 +287,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -296,6 +309,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -317,6 +331,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -338,6 +353,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -359,6 +375,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -380,6 +397,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -401,6 +419,7 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -412,6 +431,7 @@ TextureImporter: edges: [] weights: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -421,9 +441,22 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + spriteCustomMetadata: + entries: [] + nameFileIdTable: + misc_0: 5770958956045166959 + misc_1: -9177418277584700315 + misc_10: 4452512340041527070 + misc_2: 3445910035351170775 + misc_3: 8671351589016534120 + misc_4: 173538500886388945 + misc_5: -4076281113925471536 + misc_6: 7637870703528583553 + misc_7: -3818157907930065138 + misc_8: -3356990613430728209 + misc_9: 8307504999820893422 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OptionUI.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OptionUI.prefab index a736bf9..f0028f3 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OptionUI.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OptionUI.prefab @@ -1,5 +1,101 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &641655917557919365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8076039040411293610} + - component: {fileID: 5134109762184965835} + - component: {fileID: 7696329068044618742} + - component: {fileID: 7528460265644215627} + m_Layer: 5 + m_Name: expandArrow (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8076039040411293610 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641655917557919365} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4264754383554125665} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0.000061035156, y: -0.0000019073486} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &5134109762184965835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641655917557919365} + m_CullTransparentMesh: 1 +--- !u!114 &7696329068044618742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641655917557919365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 561609785760361907, guid: d518d00d4940e854bbe45d9ef891401a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7528460265644215627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641655917557919365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &782102846085628909 GameObject: m_ObjectHideFlags: 0 @@ -29,9 +125,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2780569438310375802} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -127,9 +223,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4478785627166277610} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -239,8 +335,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4264754383554125665} - - component: {fileID: 1867204054070772534} - - component: {fileID: 9114498533396602649} - component: {fileID: 8983615257379814102} m_Layer: 5 m_Name: expandArrow @@ -256,56 +350,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1501213187178026014} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8076039040411293610} m_Father: {fileID: 2780569438310375802} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &1867204054070772534 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1501213187178026014} - m_CullTransparentMesh: 1 ---- !u!114 &9114498533396602649 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1501213187178026014} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 561609785760361907, guid: d518d00d4940e854bbe45d9ef891401a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8983615257379814102 MonoBehaviour: m_ObjectHideFlags: 0 @@ -318,12 +375,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 1 + m_IgnoreLayout: 0 m_MinWidth: -1 m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 + m_PreferredWidth: 20 + m_PreferredHeight: 20 + m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 --- !u!1 &1731066637017514641 @@ -358,9 +415,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4478785627166277610} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -427,7 +484,7 @@ MonoBehaviour: m_LayoutPriority: 1 --- !u!95 &8744505332349586225 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -440,10 +497,13 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!225 &2568349821411169439 CanvasGroup: m_ObjectHideFlags: 0 @@ -496,12 +556,12 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6503369113137645357} - {fileID: 1714682891259844147} - {fileID: 4264754383554125665} m_Father: {fileID: 4478785627166277610} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -522,7 +582,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 20 - m_Right: 20 + m_Right: 10 m_Top: 10 m_Bottom: 10 m_ChildAlignment: 3 @@ -579,12 +639,12 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8581099496228509946} - {fileID: 2780569438310375802} - {fileID: 2404013603202822047} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -695,9 +755,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2780569438310375802} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OverlayUI/Overlay.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OverlayUI/Overlay.prefab index 000c95c..f90a3da 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OverlayUI/Overlay.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OverlayUI/Overlay.prefab @@ -27,11 +27,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3531919739979819162} - {fileID: 3531919738411886375} + - {fileID: 3531919739979819162} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -57,6 +57,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3531919739338806919} m_Modifications: - target: {fileID: 1471584936616359931, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3} @@ -276,12 +277,10 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3} ---- !u!224 &3531919738411886375 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4478785627166277610, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3} - m_PrefabInstance: {fileID: 1091051462859282637} - m_PrefabAsset: {fileID: 0} --- !u!114 &3531919738411886374 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4478785627166277611, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3} @@ -293,11 +292,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9077edba700447499a21395109542df, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &3531919738411886375 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4478785627166277610, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3} + m_PrefabInstance: {fileID: 1091051462859282637} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6972157500961473863 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3531919739338806919} m_Modifications: - target: {fileID: 5891255890837614044, guid: 179ef233a0b40a74f8df0748c664b5e8, type: 3} @@ -393,6 +398,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 179ef233a0b40a74f8df0748c664b5e8, type: 3} --- !u!224 &3531919739979819162 stripped RectTransform: diff --git a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity index 30282a0..60982fd 100644 --- a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity +++ b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -104,7 +100,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +113,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -153,6 +149,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -182,18 +179,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 74796456} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1335662459} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &730698711 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1599240741} m_Modifications: - target: {fileID: 16705587872320209, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} @@ -14957,6 +14956,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} --- !u!225 &730698712 stripped CanvasGroup: @@ -14998,10 +15000,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1471857115} m_Father: {fileID: 1335662459} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -15065,7 +15067,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 1 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 @@ -15110,9 +15114,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1335662458} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1639312037} - {fileID: 1475480929} @@ -15121,7 +15127,6 @@ Transform: - {fileID: 1599240741} - {fileID: 1124446957} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1335662460 MonoBehaviour: @@ -15174,12 +15179,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1427887268} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1335662459} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1471857114 GameObject: @@ -15210,9 +15216,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1124446957} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15296,12 +15302,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1475480928} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.98, y: 20.14, z: 6.23} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1335662459} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1475480930 MonoBehaviour: @@ -15334,9 +15341,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -15463,12 +15478,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1498586261} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1599240737 GameObject: @@ -15546,7 +15562,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 1 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 @@ -15560,12 +15578,12 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1983793178} - {fileID: 939125854} - {fileID: 1318590597} m_Father: {fileID: 1335662459} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -15612,9 +15630,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -15648,12 +15674,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639312034} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1335662459} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &1983793178 stripped RectTransform: @@ -15665,6 +15692,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1599240741} m_Modifications: - target: {fileID: 1963501579241001456, guid: 334eee9f85f308347844f8f5e99167c3, type: 3} @@ -15760,12 +15788,16 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 334eee9f85f308347844f8f5e99167c3, type: 3} --- !u!1001 &3531919738450164441 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1599240741} m_Modifications: - target: {fileID: 1796925837646122750, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} @@ -15908,6 +15940,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3750163693177751468, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3750163693177751468, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3750163693177751468, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3750163693177751468, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3750163693177751468, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3750163693177751468, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3750163693177751468, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6153230212222214112, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -15932,5 +15992,50 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 9167054165049020263, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9167054165049020263, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9203258396597355653, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9203258396597355653, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9203258396597355653, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9203258396597355653, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9203258396597355653, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9203258396597355653, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9203258396597355653, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1498586263} + - {fileID: 1335662459} diff --git a/AxibugEmuOnline.Client/Assets/Script/App.cs b/AxibugEmuOnline.Client/Assets/Script/App.cs index b970a42..d320b32 100644 --- a/AxibugEmuOnline.Client/Assets/Script/App.cs +++ b/AxibugEmuOnline.Client/Assets/Script/App.cs @@ -5,7 +5,6 @@ using System.IO; using System.Threading.Tasks; using UnityEngine; using UnityEngine.Networking; -using UnityEngine.Rendering.PostProcessing; using static AxibugEmuOnline.Client.HttpAPI; using static AxibugEmuOnline.Client.Manager.LogManager; @@ -57,7 +56,7 @@ namespace AxibugEmuOnline.Client.ClientCore CacheMgr = new CacheManager(); roomMgr = new AppRoom(); share = new AppShare(); - filter = new FilterManager(initer.m_filterVolume, initer.m_filterPreview,initer.m_xmbBg); + filter = new FilterManager(initer.m_filterVolume, initer.m_filterPreview, initer.m_xmbBg); var go = new GameObject("[AppAxibugEmuOnline]"); GameObject.DontDestroyOnLoad(go); tickLoop = go.AddComponent(); @@ -67,8 +66,8 @@ namespace AxibugEmuOnline.Client.ClientCore { //PSV 等平台需要手动创建目录 PersistentDataPathDir(); - } - + } + var importNode = GameObject.Find("IMPORTENT"); if (importNode != null) GameObject.DontDestroyOnLoad(importNode); diff --git a/AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/CommandChanger.cs b/AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/CommandChanger.cs index a5c98e1..a004f71 100644 --- a/AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/CommandChanger.cs +++ b/AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/CommandChanger.cs @@ -5,8 +5,7 @@ namespace AxibugEmuOnline.Client { public abstract class CommandChanger : IKeyMapperChanger { - public string Name { get; private set; } - + public string Name => GetType().Name; public abstract object GetConfig(); } } diff --git a/AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/Legacy/GamingChanger.cs b/AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/Legacy/GamingChanger.cs index 7457539..d937047 100644 --- a/AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/Legacy/GamingChanger.cs +++ b/AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/Legacy/GamingChanger.cs @@ -5,6 +5,7 @@ namespace AxibugEmuOnline.Client { public class GamingChanger : CommandChanger { + Dictionary m_uiKeyMapper = new Dictionary(); public GamingChanger() { diff --git a/AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs b/AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs index 5e9c626..2c08054 100644 --- a/AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs +++ b/AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs @@ -70,8 +70,6 @@ namespace AxibugEmuOnline.Client.Manager InGameUI.Instance.Hide(); LaunchUI.Instance.ShowMainMenu(); - - CommandDispatcher.Instance.Current = CommandDispatcher.Instance.Normal; } public void ResetGame() diff --git a/AxibugEmuOnline.Client/Assets/Script/Manager/FilterManager.cs b/AxibugEmuOnline.Client/Assets/Script/Manager/FilterManager.cs index fab770a..abfbfb4 100644 --- a/AxibugEmuOnline.Client/Assets/Script/Manager/FilterManager.cs +++ b/AxibugEmuOnline.Client/Assets/Script/Manager/FilterManager.cs @@ -14,6 +14,7 @@ namespace AxibugEmuOnline.Client private List m_filters; private Dictionary m_filterPlatforms = new Dictionary(); private AlphaWraper m_previewFilterWraper; + FilterRomSetting m_filterRomSetting; /// /// 滤镜列表 /// @@ -23,6 +24,8 @@ namespace AxibugEmuOnline.Client { m_filterPorfile = filterVolume.profile; m_filters = m_filterPorfile.settings.Where(setting => setting is FilterEffect).Select(setting => new Filter(setting as FilterEffect)).ToList(); + var json = PlayerPrefs.GetString(nameof(FilterRomSetting)); + m_filterRomSetting = JsonUtility.FromJson(json) ?? new FilterRomSetting(); m_previewFilterWraper = new AlphaWraper(mainBg, filterPreview, false); ShutDownFilterPreview(); @@ -64,12 +67,48 @@ namespace AxibugEmuOnline.Client setting.enabled.Override(false); } + /// + /// 为指定rom设置滤镜以及滤镜的预设 + /// + /// rom对象 + /// 滤镜 + /// 滤镜预设 + public void SetupFilter(RomFile rom, Filter filter, FilterPreset preset) + { + m_filterRomSetting.Setup(rom, filter, preset); + + string json = m_filterRomSetting.ToJson(); + PlayerPrefs.SetString(nameof(FilterRomSetting), json); + } + + /// + /// 获得指定rom配置的滤镜设置 + /// + /// rom对象 + /// 此元组任意内任意成员都有可能为空 + public (Filter filter, FilterPreset preset) GetFilterSetting(RomFile rom) + { + var value = m_filterRomSetting.Get(rom); + Filter filter = null; + FilterPreset preset = null; + + filter = Filters.FirstOrDefault(f => f.Name == value.filterName); + if (filter != null) + { + preset = filter.Presets.FirstOrDefault(p => p.Name == value.filterName); + } + + return (filter, preset); + } + public class Filter { public string Name => m_setting.Name; public IReadOnlyCollection Paramerters => m_setting.EditableParam; /// 滤镜预设 public List Presets = new List(); + /// 滤镜默认预设 + public FilterPreset DefaultPreset = new FilterPreset("DEFAULT"); internal FilterEffect m_setting; @@ -184,5 +223,66 @@ namespace AxibugEmuOnline.Client m_cacheReady = true; } } + + [Serializable] + public class FilterRomSetting + { + [SerializeField] + private List m_romID; + [SerializeField] + private List m_items; + + bool m_cacheReady = false; + Dictionary m_cache; + + public void Setup(RomFile rom, Filter filter, FilterPreset preset) + { + prepareCache(); + + if (filter == null) + m_cache.Remove(rom.ID); + else + m_cache[rom.ID] = new Item { FilterName = filter.Name, PresetName = preset != null ? preset.Name : null }; + } + + public string ToJson() + { + prepareCache(); + m_romID = m_cache.Keys.ToList(); + m_items = m_cache.Values.ToList(); + + return JsonUtility.ToJson(this); + } + + public (string filterName, string presetName) Get(RomFile rom) + { + prepareCache(); + + m_cache.TryGetValue(rom.ID, out var item); + return (item.FilterName, item.PresetName); + } + + private void prepareCache() + { + if (m_cacheReady) return; + + if (m_items == null) m_items = new List(); + if (m_romID == null) m_romID = new List(); + m_cache = new Dictionary(); + for (int i = 0; i < m_romID.Count && i < m_items.Count; i++) + { + m_cache[m_romID[i]] = m_items[i]; + } + + m_cacheReady = true; + } + + [Serializable] + struct Item + { + public string FilterName; + public string PresetName; + } + } } } diff --git a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator_Screen.mat b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator_Screen.mat index eed7c2b..d581fae 100644 --- a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator_Screen.mat +++ b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator_Screen.mat @@ -2,20 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NesEmulator_Screen m_Shader: {fileID: 4800000, guid: b351396ff606116478d7f4412abe4e2e, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -59,6 +63,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _ColorMask: 15 @@ -87,3 +92,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/VideoProvider.cs b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/VideoProvider.cs index 72de272..f0963d1 100644 --- a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/VideoProvider.cs +++ b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/VideoProvider.cs @@ -4,44 +4,119 @@ using System.Runtime.InteropServices; using System.Text; using UnityEngine; using UnityEngine.UI; +using VirtualNes.Core; +using static UnityEngine.UI.CanvasScaler; namespace AxibugEmuOnline.Client { public class VideoProvider : MonoBehaviour { + #region UI_REF public NesEmulator NesEmu; public Canvas DrawCanvas; - public RawImage Image; + #endregion - private IntPtr wrapTexBufferPointer; - private Texture2D wrapTex; - private int TexBufferSize; - private Texture2D pPal; + #region GPU_TURBO + //ͼֽ + private int TexBufferSize_gpu; + //ͼָ + private IntPtr wrapTexBufferPointer_gpu; + //Unity 2D,UIϻ + private Texture2D wrapTex_gpu; + //nesɫ,תΪunity + private Texture2D pPal_gpu; + private Material GPUTurboMat_gpu; + #endregion + + #region CPU + //ͼֽ + private int TexBufferSize_cpu; + //ͼָ + private GCHandle wrapTexBufferGH; + private IntPtr wrapTexBufferPointer_cpu; + //Unity 2D,UIϻ + private Texture2D wrapTex_cpu; + #endregion + + public bool GPUTurbo = true; private void Awake() { DrawCanvas.worldCamera = Camera.main; + GPUTurboMat_gpu = Image.material; + } + + private void OnDestroy() + { + if (wrapTexBufferGH.IsAllocated) + wrapTexBufferGH.Free(); } public unsafe void SetDrawData(uint* screenData) { - if (wrapTex == null) + PrepareUI(screenData); + if (GPUTurbo) PrepareForGPU(screenData); + else PrepareForCPU(screenData); + + if (GPUTurbo) { - wrapTex = new Texture2D(272, 240, TextureFormat.RGBA32, false); - wrapTex.filterMode = FilterMode.Point; + wrapTex_gpu.LoadRawTextureData(wrapTexBufferPointer_gpu, TexBufferSize_gpu); + wrapTex_gpu.Apply(); + } + else + { + wrapTex_cpu.LoadRawTextureData(wrapTexBufferPointer_cpu, TexBufferSize_cpu); + wrapTex_cpu.Apply(); + } + } - wrapTexBufferPointer = (IntPtr)screenData; + private unsafe void PrepareUI(uint* screenData) + { + if (GPUTurbo) + { + if (Image.material != GPUTurboMat_gpu) Image.material = GPUTurboMat_gpu; - Image.texture = wrapTex; - Image.material.SetTexture("_MainTex", wrapTex); + if (wrapTex_gpu == null) + { + wrapTex_gpu = new Texture2D(PPU.SCREEN_WIDTH, PPU.SCREEN_HEIGHT, TextureFormat.RGBA32, false); + wrapTex_gpu.filterMode = FilterMode.Point; + wrapTexBufferPointer_gpu = (IntPtr)screenData; - TexBufferSize = wrapTex.width * wrapTex.height * 4; + TexBufferSize_gpu = wrapTex_gpu.width * wrapTex_gpu.height * 4; + } + if (Image.texture != wrapTex_gpu) Image.texture = wrapTex_gpu; + } + else + { + if (Image.material == GPUTurboMat_gpu) Image.material = null; + + if (wrapTex_cpu == null) + { + wrapTex_cpu = new Texture2D(PPU.SCREEN_WIDTH - 16, PPU.SCREEN_HEIGHT, TextureFormat.RGBA32, false); + wrapTex_cpu.filterMode = FilterMode.Point; + + uint[] cpuTexBuffer = new uint[wrapTex_cpu.width * wrapTex_cpu.height]; + + wrapTexBufferGH = GCHandle.Alloc(cpuTexBuffer, GCHandleType.Pinned); + wrapTexBufferPointer_cpu = wrapTexBufferGH.AddrOfPinnedObject(); + TexBufferSize_cpu = cpuTexBuffer.Length * 4; + } + if (Image.texture != wrapTex_cpu) Image.texture = wrapTex_cpu; + } + } + + private unsafe void PrepareForGPU(uint* screenData) + { + if (pPal_gpu == null) + { var palRaw = PaletteDefine.m_cnPalette[0]; - pPal = new Texture2D(palRaw.Length, 1, TextureFormat.RGBA32, false); - pPal.filterMode = FilterMode.Point; + + pPal_gpu = new Texture2D(palRaw.Length, 1, TextureFormat.RGBA32, false); + pPal_gpu.filterMode = FilterMode.Point; + for (int i = 0; i < palRaw.Length; i++) { uint colorRaw = palRaw[i]; @@ -51,14 +126,48 @@ namespace AxibugEmuOnline.Client temp.g = argbColor[1] / 255f; temp.b = argbColor[0] / 255f; temp.a = 1; - pPal.SetPixel(i, 0, temp); + pPal_gpu.SetPixel(i, 0, temp); } - pPal.Apply(); - Image.material.SetTexture("_PalTex", pPal); + pPal_gpu.Apply(); + GPUTurboMat_gpu.SetTexture("_PalTex", pPal_gpu); } + } - wrapTex.LoadRawTextureData(wrapTexBufferPointer, TexBufferSize); - wrapTex.Apply(); + private unsafe void PrepareForCPU(uint* screenData) + { + int pScn = 0; + int width; + + var Dst = (uint*)wrapTexBufferPointer_cpu; + var pDst = 0; + var palRaw = PaletteDefine.m_cnPalette[0]; + + for (int line = 0; line < PPU.SCREEN_HEIGHT; line++) + { + width = PPU.SCREEN_WIDTH - 16; + + while (width > 0) + { + var edx = screenData[pScn + 8]; + + uint index = edx & 0xFF; + var colorData = palRaw[index]; + //dstɫΪabgr,colorDataΪargb + uint r = (colorData & 0x00FF0000) >> 16; // ȡRedͨ + uint g = (colorData & 0x0000FF00) >> 8; // ȡGreenͨ + uint b = (colorData & 0x000000FF); // ȡBlueͨ + + uint abgr = 0xFF000000 | (b << 16) | (g << 8) | (r << 0); + + Dst[pDst] = abgr; + + pScn += 1; + pDst += 1; + width -= 1; + } + + pScn += 16; + } } } } diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/ICommandListener.cs b/AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/ICommandListener.cs index 1186122..559eb07 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/ICommandListener.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/ICommandListener.cs @@ -4,6 +4,7 @@ namespace AxibugEmuOnline.Client { public interface IKeyMapperChanger { + string Name { get; } object GetConfig(); } public interface ICommandListener diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/InGameUI/InGameUI.cs b/AxibugEmuOnline.Client/Assets/Script/UI/InGameUI/InGameUI.cs index 3e6aa9b..d74f62d 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/InGameUI/InGameUI.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/InGameUI/InGameUI.cs @@ -38,6 +38,7 @@ namespace AxibugEmuOnline.Client m_stepPerformer = new StepPerformer(this); + //menus.Add(new InGameUI_FilterSetting(this)); menus.Add(new InGameUI_Reset(this)); menus.Add(new InGameUI_SaveState(this)); menus.Add(new InGameUI_LoadState(this)); @@ -84,6 +85,16 @@ namespace AxibugEmuOnline.Client Eventer.Instance.RegisterEvent(EEvent.OnRoomWaitStepChange, OnServerStepUpdate); gameObject.SetActiveEx(true); + + var filterSetting = App.filter.GetFilterSetting(currentRom); + if (filterSetting.filter != null) + { + var filter = filterSetting.filter; + var preset = filterSetting.preset ?? filter.DefaultPreset; + + filter.ApplyPreset(preset); + App.filter.EnableFilter(filter); + } } private void OnServerStepUpdate(int step) @@ -95,6 +106,8 @@ namespace AxibugEmuOnline.Client { CommandDispatcher.Instance.UnRegistController(this); gameObject.SetActiveEx(false); + + App.filter.ShutDownFilter(); } protected override void OnCmdOptionMenu() @@ -120,8 +133,6 @@ namespace AxibugEmuOnline.Client Eventer.Instance.UnregisterEvent(EEvent.OnRoomWaitStepChange, OnServerStepUpdate); App.roomMgr.SendLeavnRoom(); App.emu.StopGame(); - - CommandDispatcher.Instance.Current = CommandDispatcher.Instance.Normal; } } } diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs b/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs index 154df84..ec76815 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs @@ -38,6 +38,12 @@ namespace AxibugEmuOnline.Client CommandDispatcher.Instance.Current = CommandDispatcher.Instance.Normal; } + private void Update() + { + if (CommandDispatcher.Instance.Current == CommandDispatcher.Instance.Gaming && App.emu.Core.IsNull()) + CommandDispatcher.Instance.Current = CommandDispatcher.Instance.Normal; + } + public void HideMainMenu() { BG.gameObject.SetActiveEx(false); diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/OptionUI/OptionUI.cs b/AxibugEmuOnline.Client/Assets/Script/UI/OptionUI/OptionUI.cs index d85fb86..74d6094 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/OptionUI/OptionUI.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/OptionUI/OptionUI.cs @@ -218,6 +218,10 @@ namespace AxibugEmuOnline.Client { if (m_bPoped) { + Vector2 start = new Vector2(-MenuRoot.rect.width, MenuRoot.anchoredPosition.y); + Vector2 end = new Vector2(0, MenuRoot.anchoredPosition.y); + + ReleaseRuntimeMenus(); m_runtimeMenuItems.Clear(); @@ -225,8 +229,7 @@ namespace AxibugEmuOnline.Client CommandDispatcher.Instance.UnRegistController(this); Canvas.ForceUpdateCanvases(); - Vector2 start = new Vector2(-MenuRoot.rect.width, MenuRoot.anchoredPosition.y); - Vector2 end = new Vector2(0, MenuRoot.anchoredPosition.y); + DOTween.To( () => start, (value) => diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/RoomUI/RoomItem.cs b/AxibugEmuOnline.Client/Assets/Script/UI/RoomUI/RoomItem.cs index 94e1c14..9cd7a5c 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/RoomUI/RoomItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/RoomUI/RoomItem.cs @@ -49,6 +49,8 @@ namespace AxibugEmuOnline.Client public override bool OnEnterItem() { + if (m_romFile == null) return false; + if (!m_romFile.RomReady) { m_romFile.BeginDownload(); diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/ThirdMenuRoot.cs b/AxibugEmuOnline.Client/Assets/Script/UI/ThirdMenuRoot.cs index 9206cc7..9d06be3 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/ThirdMenuRoot.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/ThirdMenuRoot.cs @@ -12,7 +12,7 @@ namespace AxibugEmuOnline.Client private RectTransform m_parent; [SerializeField] - private RectTransform m_selectArrow; + private RectTransform m_selectArrow; [SerializeField] float ArrowOffset = 50; [SerializeField] @@ -102,8 +102,12 @@ namespace AxibugEmuOnline.Client srollRect.content.anchoredPosition += new Vector2(0, gap); else { + var srcPos = m_selectArrow.position; var endValue = srollRect.content.anchoredPosition + new Vector2(0, gap); - DOTween.To(() => srollRect.content.anchoredPosition, (x) => srollRect.content.anchoredPosition = x, endValue, 0.125f); + var tween = DOTween.To( + () => srollRect.content.anchoredPosition, + (x) => srollRect.content.anchoredPosition = x, + endValue, 0.125f); } } diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/APU.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/APU.cs index fb7e9b5..eae930a 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/APU.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/APU.cs @@ -1,6 +1,5 @@  using System; -using System.IO; using VirtualNes.Core.Debug; namespace VirtualNes.Core diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_FDS.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_FDS.cs index a6b5176..d1f406c 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_FDS.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_FDS.cs @@ -1,5 +1,4 @@ using System; -using System.IO; namespace VirtualNes.Core { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_FME7.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_FME7.cs index cbe6696..66cae37 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_FME7.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_FME7.cs @@ -1,5 +1,4 @@ using System; -using static VirtualNes.Core.APU_FME7; namespace VirtualNes.Core { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_INTERFACE.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_INTERFACE.cs index 49378ac..16ee215 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_INTERFACE.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_INTERFACE.cs @@ -1,7 +1,4 @@ -using System; -using System.IO; - -namespace VirtualNes.Core +namespace VirtualNes.Core { public abstract class APU_INTERFACE : IStateBufferObject { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_INTERNAL.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_INTERNAL.cs index 07d1932..0fffa03 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_INTERNAL.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_INTERNAL.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.IO; -using UnityEngine; namespace VirtualNes.Core { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_VRC6.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_VRC6.cs index 04f2f51..43d7bed 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_VRC6.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_VRC6.cs @@ -1,5 +1,4 @@ using System; -using System.IO; namespace VirtualNes.Core { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_VRC7.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_VRC7.cs index 5ffde57..70c6499 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_VRC7.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_VRC7.cs @@ -1,5 +1,4 @@ using System; -using System.IO; using VirtualNes.Core.Emu2413; namespace VirtualNes.Core diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/EEPROM.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/EEPROM.cs index 492bdf8..1c6016f 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/EEPROM.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/EEPROM.cs @@ -1,6 +1,4 @@ -using System; - -namespace VirtualNes.Core +namespace VirtualNes.Core { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper012.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper012.cs index 85cb89e..d9934e5 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper012.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper012.cs @@ -295,9 +295,9 @@ namespace VirtualNes.Core p[20] = irq_preset; p[21] = irq_preset_vbl; //*((DWORD*)&p[22]) = vb0; - BitConverter.GetBytes(vb0).CopyTo(p,22); + BitConverter.GetBytes(vb0).CopyTo(p, 22); //*((DWORD*)&p[26]) = vb1; - BitConverter.GetBytes(vb1).CopyTo(p,26); + BitConverter.GetBytes(vb1).CopyTo(p, 26); } //void Mapper012::LoadState(LPBYTE p) diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper016.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper016.cs index 6f05ca4..5117a4d 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper016.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper016.cs @@ -422,8 +422,8 @@ namespace VirtualNes.Core { //x24c02.Load(&p[16]); //x24c01.Load(&p[48]); - x24c02.Load(p+16); - x24c01.Load(p+48); + x24c02.Load(p + 16); + x24c01.Load(p + 48); } } } diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper019.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper019.cs index 9406ff8..7c77aa6 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper019.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper019.cs @@ -409,7 +409,7 @@ namespace VirtualNes.Core //irq_counter = *(WORD*)&p[4]; irq_counter = BitConverter.ToUInt16(p, 4); //::memcpy(exram, &p[8], sizeof(exram)); - Array.Copy(p,exram,exram.Length); + Array.Copy(p, exram, exram.Length); } diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper040.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper040.cs index 01e7b2d..2e6db50 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper040.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper040.cs @@ -81,7 +81,7 @@ namespace VirtualNes.Core { irq_enable = p[0]; //irq_line = *(INT*)&p[1]; - irq_line = BitConverter.ToInt32(p,1); + irq_line = BitConverter.ToInt32(p, 1); } public override bool IsStateSave() diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper083.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper083.cs index 2166610..e5083e1 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper083.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper083.cs @@ -220,10 +220,10 @@ namespace VirtualNes.Core p[1] = reg[1]; p[2] = reg[2]; //*(INT*)&p[3] = chr_bank; - BitConverter.GetBytes(chr_bank).CopyTo(p,3); + BitConverter.GetBytes(chr_bank).CopyTo(p, 3); p[7] = irq_enable; //*(INT*)&p[8] = irq_counter; - BitConverter.GetBytes(irq_counter).CopyTo(p,8); + BitConverter.GetBytes(irq_counter).CopyTo(p, 8); } //void Mapper083::LoadState(LPBYTE p) diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper142.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper142.cs index 112b82c..12c1fbd 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper142.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper142.cs @@ -103,7 +103,7 @@ namespace VirtualNes.Core prg_sel = p[0]; irq_enable = p[1]; //irq_counter = *(INT*)&p[2]; - irq_counter = BitConverter.ToInt32 (p, 2); + irq_counter = BitConverter.ToInt32(p, 2); } public override bool IsStateSave() { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper168.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper168.cs index a7595a7..1958386 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper168.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper168.cs @@ -1,9 +1,7 @@ ////////////////////////////////////////////////////////////////////////// // Mapper168 Subor (PPUExtLatch) // ////////////////////////////////////////////////////////////////////////// -using VirtualNes.Core.Debug; using static VirtualNes.MMU; -using BYTE = System.Byte; using INT = System.Int32; namespace VirtualNes.Core diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/_Mapper.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/_Mapper.cs index 41807f7..deaf871 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/_Mapper.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/_Mapper.cs @@ -1,8 +1,4 @@ -using VirtualNes.Core.Debug; -using static VirtualNes.MMU; -using BYTE = System.Byte; -using INT = System.Int32; -namespace VirtualNes.Core +namespace VirtualNes.Core { public class _Mapper : Mapper { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/FILEHDR2.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/FILEHDR2.cs index c3a451c..cf10d3e 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/FILEHDR2.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/FILEHDR2.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace VirtualNes.Core +namespace VirtualNes.Core { public struct FILEHDR2 : IStateBufferObject { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/SNDSTAT.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/SNDSTAT.cs index 9de7b5b..f80a114 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/SNDSTAT.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/SNDSTAT.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace VirtualNes.Core +namespace VirtualNes.Core { public struct SNDSTAT : IStateBufferObject {