update unity version to 2018.3.1f1.

hecomi · Jan 14, 2019 · e9eb6ac · e9eb6ac
1 parent 1912c61
commit e9eb6ac
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,11 @@
 /[Tt]emp/
 /[Oo]bj/
 /[Bb]uild/
+/[Ww]iki/
+/[Mm]isc/
+/[Ll]ogs/
+/UnityPackageManager
+/Packages
 
 # Autogenerated VS/MD solution and project files
 *.csproj
@@ -21,9 +26,8 @@
 # Unity3D Generated File On Crash Reports
 sysinfo.txt
 
-# VSCode
-.vscode
-
 # Others
 .DS_Store
-/[Ww]iki/
+/Assets/AssetStoreTools*
+/Assets/Extensions*
+.vs
diff --git a/Assets/uShaderTemplate/Editor/Resources/uShaderTemplate/Constants/Custom Constants.asset b/Assets/uShaderTemplate/Editor/Resources/uShaderTemplate/Constants/Custom Constants.asset
diff --git a/Assets/uShaderTemplate/Examples/Shaders/VertFrag.shader b/Assets/uShaderTemplate/Examples/Shaders/VertFrag.shader
@@ -28,12 +28,13 @@ struct v2f
 // @block VertexShader
 sampler2D _MainTex;
 float4 _MainTex_ST;
+
 v2f vert(appdata_full v)
 {
  v2f o;
  o.vertex = UnityObjectToClipPos(v.vertex);
  o.uv = TRANSFORM_TEX(v.texcoord, _MainTex);
- // UNITY_TRANSFER_FOG(o,o.vertex);
+ UNITY_TRANSFER_FOG(o,o.vertex);
  return o;
 }
 // @endblock

diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.3.0f3
+m_EditorVersion: 2018.3.1f1
diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset
diff --git a/UnityPackageManager/manifest.json b/UnityPackageManager/manifest.json