From 31c2cebbccba45a00a755981dd6d0cdd0a0459e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 17:28:38 +0800
Subject: [PATCH] Merge branch 'master' into leonard

---
 Assets/Editor/ScriptTemplate/ShaderPattern.txt |  136 ++++++++++++++++++++++----------------------
 1 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/Assets/Editor/ScriptTemplate/ShaderPattern.txt b/Assets/Editor/ScriptTemplate/ShaderPattern.txt
index 56925a9..5e9b471 100644
--- a/Assets/Editor/ScriptTemplate/ShaderPattern.txt
+++ b/Assets/Editor/ScriptTemplate/ShaderPattern.txt
@@ -1,69 +1,69 @@
-锘匡豢Shader "#NAME#/#Character#"
-{
-	Properties
-	{
-		_MainTex("Main Texture", 2D) = "white" {}
-	}
-
-	Subshader
-	{
-		LOD 200
-		Tags {
-			"Queue" = "Geometry"
-			"IgnoreProjector" = "True"
-			"LightMode" = "ForwardBase"
-		}
-
-		Pass
-		{
-
-		Cull Back
-		Fog {Mode Off}
-
-		CGPROGRAM
-		#pragma target 3.0
-		#pragma vertex vert
-		#pragma fragment frag
-
-		#pragma multi_compile_fwdbase
-		#pragma exclude_renderers flash 
-
-		#include "UnityCG.cginc"
-		#include "SnxxzCG.cginc"
-
-		struct vertexInput
-		{
-			half4 vertex : POSITION;
-			half3 normal : NORMAL;
-			half4 tangent : TANGENT;
-			half2 texcoord	: TEXCOORD0;
-		};
-
-		struct v2f
-		{
-			half4 pos : SV_POSITION;
-			half2 uv0 : TEXCOORD0;
-		};
-
-		uniform sampler2D _MainTex;
-
-		v2f vert(vertexInput v)
-		{
-			v2f o;
-			o.pos = v.vertex;
-			o.uv0 = v.texcoord;
-
-			return o;
-		}
-
-		fixed4 frag(v2f i) : SV_Target{
-			half4 color;
-			return color;
-		}
-
-		ENDCG
-		}
-	}
-
-	FallBack "Diffuse"
+锘匡豢Shader "#NAME#/#Character#"
+{
+	Properties
+	{
+		_MainTex("Main Texture", 2D) = "white" {}
+	}
+
+	Subshader
+	{
+		LOD 200
+		Tags {
+			"Queue" = "Geometry"
+			"IgnoreProjector" = "True"
+			"LightMode" = "ForwardBase"
+		}
+
+		Pass
+		{
+
+		Cull Back
+		Fog {Mode Off}
+
+		CGPROGRAM
+		#pragma target 3.0
+		#pragma vertex vert
+		#pragma fragment frag
+
+		#pragma multi_compile_fwdbase
+		#pragma exclude_renderers flash 
+
+		#include "UnityCG.cginc"
+		#include "SnxxzCG.cginc"
+
+		struct vertexInput
+		{
+			half4 vertex : POSITION;
+			half3 normal : NORMAL;
+			half4 tangent : TANGENT;
+			half2 texcoord	: TEXCOORD0;
+		};
+
+		struct v2f
+		{
+			half4 pos : SV_POSITION;
+			half2 uv0 : TEXCOORD0;
+		};
+
+		uniform sampler2D _MainTex;
+
+		v2f vert(vertexInput v)
+		{
+			v2f o;
+			o.pos = v.vertex;
+			o.uv0 = v.texcoord;
+
+			return o;
+		}
+
+		fixed4 frag(v2f i) : SV_Target{
+			half4 color;
+			return color;
+		}
+
+		ENDCG
+		}
+	}
+
+	FallBack "Diffuse"
 }
\ No newline at end of file

--
Gitblit v1.8.0