Compare commits

..

No commits in common. "1f8f5c2773501095db19e34d6a47840dae8c4293" and "6c8e2133cac11db6c25053477d2d44b707243f79" have entirely different histories.

2 changed files with 7 additions and 3 deletions

View File

@ -214,7 +214,7 @@ namespace AxibugEmuOnline.Client.Event
}
catch (Exception e)
{
App.log.Error(e.InnerException.ToString());
App.log.Error(e.Message);
}
}
}

View File

@ -2,6 +2,7 @@
{
Properties
{
_MainTex ("Sprite Texture", 2D) = "white" {}
_Color ("Tint", Color) = (1,1,1,1)
_StencilComp ("Stencil Comparison", Float) = 8
@ -74,9 +75,12 @@
UNITY_VERTEX_OUTPUT_STEREO
};
sampler2D _MainTex;
fixed4 _Color;
fixed4 _TextureSampleAdd;
float4 _ClipRect;
float4 _ClipRect;
float4 _MainTex_ST;
float4 _MainTex_TexelSize;
float wave(float x, float frequency, float speed, float midHeight, float maxHeight)
{
@ -101,7 +105,7 @@
OUT.worldPosition = v.vertex;
OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
OUT.texcoord =v.texcoord;
OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
OUT.color = v.color * _Color;
return OUT;