diff options
Diffstat (limited to 'Assets/Bundle')
| -rw-r--r-- | Assets/Bundle/Scenes/Demo/AnimationEditScene.unity | 4 | ||||
| -rw-r--r-- | Assets/Bundle/Shaders/Common/Image/common_img_blur.shader | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity index 2ab354bf..b7daf697 100644 --- a/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity +++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -57534,7 +57534,7 @@ Light: m_Enabled: 1 serializedVersion: 8 m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 0.6415094, g: 0.59685767, b: 0.4750801, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 diff --git a/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader index c7e3891d..f6c016b3 100644 --- a/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader +++ b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader @@ -42,7 +42,7 @@ float _Angle; - float4 _ScaleOffset; // 角色的范围 + float4 _TileOffset; // 角色的范围 fixed _Distance; @@ -57,7 +57,7 @@ fixed4 frag(v2f i) : SV_Target { _Angle = 0; - _Distance = 0.05f; + _Distance = 0; fixed2 uv = i.uv; fixed2 offset = fixed2(0.05, 0.05); @@ -72,6 +72,11 @@ color += tex2D(_MainTex,float2(uv.x + dx,uv.y + dy)) * (1 / sampleCount); } //color = tex2D(_MainTex, uv); + if(uv.x > _TileOffset.z && uv.x < _TileOffset.x + _TileOffset.z + && uv.y > _TileOffset.w && uv.y < _TileOffset.w + _TileOffset.y) { + color = fixed4(1,0,0,0); + } + return color; } ENDCG |