From e15500053ca6f32851a355fa82b4920184fbdc9e Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Thu, 22 Apr 2021 09:51:10 +0800
Subject: *misc

---
 .../Materials/ConstructionLight_Mat.mat            | 17 ++++-
 .../ExampleAssets/Materials/DryWallPainted_Mat.mat | 17 ++++-
 Assets/ExampleAssets/Materials/DryWall_Mat.mat     | 17 ++++-
 Assets/ExampleAssets/Materials/Ground_Mat.mat      | 17 ++++-
 Assets/ExampleAssets/Materials/Hammer_Mat.mat      | 17 ++++-
 Assets/ExampleAssets/Materials/HardHat_Mat.mat     | 17 ++++-
 Assets/ExampleAssets/Materials/Jigsaw_Mat.mat      | 17 ++++-
 Assets/ExampleAssets/Materials/LightBulb_Mat.mat   | 19 ++++-
 Assets/ExampleAssets/Materials/Liquid_Mat.mat      | 17 ++++-
 .../Materials/Metal_Blue_Simple_Mat.mat            | 17 ++++-
 .../ExampleAssets/Materials/Metal_Simple_Mat.mat   | 17 ++++-
 Assets/ExampleAssets/Materials/OBS_Mat.mat         | 17 ++++-
 Assets/ExampleAssets/Materials/PaintBrush_Mat.mat  | 17 ++++-
 Assets/ExampleAssets/Materials/PaintLabel_Mat.mat  | 17 ++++-
 .../ExampleAssets/Materials/Plastic_Black_Mat.mat  | 17 ++++-
 .../ExampleAssets/Materials/Plastic_Gray_Mat.mat   | 17 ++++-
 .../ExampleAssets/Materials/Plastic_Ridges_Mat.mat | 17 ++++-
 .../ExampleAssets/Materials/Plastic_Rough_Mat.mat  | 17 ++++-
 .../Materials/Plastic_Transparent.mat              | 17 ++++-
 .../ExampleAssets/Materials/Plastic_White_Mat.mat  | 17 ++++-
 .../ExampleAssets/Materials/Plastic_Yellow_Mat.mat | 17 ++++-
 Assets/ExampleAssets/Materials/Strap_Mat.mat       | 17 ++++-
 Assets/ExampleAssets/Materials/Stud_Mat.mat        | 19 ++++-
 Assets/LensFlare/FlareBatch.cs                     | 45 +++++++-----
 Assets/LensFlare/FlareSource.cs                    |  5 +-
 Assets/LensFlare/LensFlare.unity                   | 36 ++++++++--
 Assets/ProFlares/Editor/ProFlareInspector.cs       | 12 ++--
 Assets/Settings/ForwardRenderer.asset              | 80 ++++++++++++----------
 28 files changed, 484 insertions(+), 89 deletions(-)

(limited to 'Assets')

diff --git a/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat b/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat
index 0d03a7b..db0ec28 100644
--- a/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat
+++ b/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat b/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat
index 8460aff..4895ecf 100644
--- a/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat
+++ b/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/DryWall_Mat.mat b/Assets/ExampleAssets/Materials/DryWall_Mat.mat
index 32b2918..a801acd 100644
--- a/Assets/ExampleAssets/Materials/DryWall_Mat.mat
+++ b/Assets/ExampleAssets/Materials/DryWall_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/Ground_Mat.mat b/Assets/ExampleAssets/Materials/Ground_Mat.mat
index 25a8158..2e5cfc5 100644
--- a/Assets/ExampleAssets/Materials/Ground_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Ground_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/Hammer_Mat.mat b/Assets/ExampleAssets/Materials/Hammer_Mat.mat
index e5b4393..6f11ae5 100644
--- a/Assets/ExampleAssets/Materials/Hammer_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Hammer_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/HardHat_Mat.mat b/Assets/ExampleAssets/Materials/HardHat_Mat.mat
index 8880705..e1194b2 100644
--- a/Assets/ExampleAssets/Materials/HardHat_Mat.mat
+++ b/Assets/ExampleAssets/Materials/HardHat_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat b/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat
index cb69d5c..c2dbdf1 100644
--- a/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/LightBulb_Mat.mat b/Assets/ExampleAssets/Materials/LightBulb_Mat.mat
index a541816..3f89da1 100644
--- a/Assets/ExampleAssets/Materials/LightBulb_Mat.mat
+++ b/Assets/ExampleAssets/Materials/LightBulb_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -106,6 +121,6 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
+    - _EmissionColor: {r: 11.179362, g: 11.179362, b: 11.179362, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
diff --git a/Assets/ExampleAssets/Materials/Liquid_Mat.mat b/Assets/ExampleAssets/Materials/Liquid_Mat.mat
index 58e0ba9..2cdc20c 100644
--- a/Assets/ExampleAssets/Materials/Liquid_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Liquid_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -78,12 +78,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 1
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 10
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat b/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat
index b2280d2..26c4ed3 100644
--- a/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat b/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat
index 125815a..0975ecb 100644
--- a/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/OBS_Mat.mat b/Assets/ExampleAssets/Materials/OBS_Mat.mat
index a9cbadf..e2e4fe2 100644
--- a/Assets/ExampleAssets/Materials/OBS_Mat.mat
+++ b/Assets/ExampleAssets/Materials/OBS_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat b/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat
index b6fd56e..6a1c48d 100644
--- a/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat
+++ b/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat b/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat
index af0c868..86b5a4e 100644
--- a/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat
+++ b/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat b/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat
index be0ab51..cf8736f 100644
--- a/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat b/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat
index 7939383..d852d64 100644
--- a/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat b/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat
index e2ed974..4ce0ce3 100644
--- a/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat b/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat
index 89a0be7..580d83d 100644
--- a/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/Plastic_Transparent.mat b/Assets/ExampleAssets/Materials/Plastic_Transparent.mat
index abe0693..efbe016 100644
--- a/Assets/ExampleAssets/Materials/Plastic_Transparent.mat
+++ b/Assets/ExampleAssets/Materials/Plastic_Transparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -78,12 +78,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 1
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 10
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat b/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat
index 4ff65b2..176cde2 100644
--- a/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat b/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat
index 7a863d4..bbf6601 100644
--- a/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
diff --git a/Assets/ExampleAssets/Materials/Strap_Mat.mat b/Assets/ExampleAssets/Materials/Strap_Mat.mat
index c783e53..5714f00 100644
--- a/Assets/ExampleAssets/Materials/Strap_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Strap_Mat.mat
@@ -64,12 +64,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -108,4 +123,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
diff --git a/Assets/ExampleAssets/Materials/Stud_Mat.mat b/Assets/ExampleAssets/Materials/Stud_Mat.mat
index 2287947..566c9d1 100644
--- a/Assets/ExampleAssets/Materials/Stud_Mat.mat
+++ b/Assets/ExampleAssets/Materials/Stud_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -106,6 +121,6 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.07618539, g: 0.082282715, b: 0.07421358, a: 1}
+    - _EmissionColor: {r: 0.0067161303, g: 0.0074898335, b: 0.0064763986, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
diff --git a/Assets/LensFlare/FlareBatch.cs b/Assets/LensFlare/FlareBatch.cs
index 101bc0b..709183f 100644
--- a/Assets/LensFlare/FlareBatch.cs
+++ b/Assets/LensFlare/FlareBatch.cs
@@ -6,30 +6,35 @@ internal struct Vertexhelper
 {
     public Vector3[] vertices; 
     public int[] triangles;
-    public Vector2[] uv; 
-    public Vertexhelper(int vertCount, int trisCount, int uvCount)
+    public Vector2[] uv;
+	public Color[] color;
+
+    public Vertexhelper(int vertCount, int trisCount, int uvCount, int colorCount)
     {
         vertices = new Vector3[vertCount];
         triangles = new int[trisCount];
         uv = new Vector2[uvCount];
+		color = new Color[colorCount];
     }
     public void FillMesh(Mesh outMesh)
     {
         outMesh.vertices = vertices;
         outMesh.triangles = triangles;
         outMesh.uv = uv;
+		outMesh.colors = color;
     }
     public static void CombineAndFillMesh(IList<Vertexhelper> meshes, Mesh outMesh)
     {
-        int vertexCount = 0, trisCount = 0, uvCount = 0;
+        int vertexCount = 0, trisCount = 0, uvCount = 0, colorCount = 0;
         for(int i = 0; i < meshes.Count; ++i)
         {
             vertexCount += meshes[i].vertices.Length;
             trisCount += meshes[i].triangles.Length;
             uvCount += meshes[i].uv.Length;
+			colorCount += meshes[i].color.Length;
         }
-        Vertexhelper combinedMesh = new Vertexhelper(vertexCount, trisCount, uvCount);
-        int vi=0, ti = 0, uvi = 0;
+        Vertexhelper combinedMesh = new Vertexhelper(vertexCount, trisCount, uvCount, colorCount);
+        int vi=0, ti = 0, uvi = 0, coli = 0;
         for (int i = 0; i < meshes.Count; ++i)
         {
             Vertexhelper vh = meshes[i];
@@ -37,7 +42,9 @@ internal struct Vertexhelper
                 combinedMesh.triangles[ti++] = triangles + vi;
             foreach (Vector3 vertex in vh.vertices)
                 combinedMesh.vertices[vi++] = vertex;
-            foreach (Vector2 uv in vh.uv)
+			foreach (Color col in vh.color)
+				combinedMesh.color[coli++] = col;
+			foreach (Vector2 uv in vh.uv)
                 combinedMesh.uv[uvi++] = uv;
         }
         combinedMesh.FillMesh(outMesh);
@@ -86,30 +93,36 @@ public class FlareBatch : MonoBehaviour
     {
         Vector3 viewportPos = source.ViewportPosition;
         Vector2 center = Vector2.zero; // 光晕“中心”，后续这个值可以变
-        Vector3 flareSpacePos = ViewportToFlareSpace(viewportPos); // 光源在flare space的坐标
-        float angle = Mathf.Atan2(flareSpacePos.x, flareSpacePos.y) * Mathf.Rad2Deg;
+        Vector2 flareSpacePos = ViewportToFlareSpace(viewportPos); // 光源在flare space的坐标
+		Vector2 flareVec = flareSpacePos - center;
+        float angle = Mathf.Atan2(flareSpacePos.y, flareSpacePos.x) * Mathf.Rad2Deg;
         List<Vertexhelper> meshes = new List<Vertexhelper>();
-        for (int i = 0; i < source.Flares.Count; ++i)
+        for (int i = 0; i < source.Flares.Count - 1; ++i)
         {
             Flare flare = source.Flares[i];
+			if (!flare.IsActive)
+				continue;
             Vector2 size = source.GetFlareSize(flare);
             Vector2 halfSize = size / 2;
             Vertexhelper vh = new Vertexhelper();
             vh.vertices = new Vector3[]
             {
-                Vec3(-halfSize.x, -halfSize.y, 0),
-                Vec3(-halfSize.x, halfSize.y, 0),
-                Vec3(halfSize.x, halfSize.y, 0),
-                Vec3(halfSize.x, -halfSize.y, 0),
+                Vec3(-halfSize.x, -halfSize.y, -i*0.01f),
+                Vec3(-halfSize.x, halfSize.y, -i*0.01f),
+                Vec3(halfSize.x, halfSize.y, -i*0.01f),
+                Vec3(halfSize.x, -halfSize.y, -i*0.01f),
             };
+			Color col = flare.Color;
+			vh.color = new Color[] { col, col, col, col };
 
-            Vector2 pos = Vector2.zero;
+			Vector2 pos = flareSpacePos - flare.DistanceAspect * flareVec * source.SpreadAmount;
+			Vector3 _pos = new Vector3(pos.x, pos.y, 0);
 
             for (int j = 0; j < vh.vertices.Length; ++j)
             {
                 vh.vertices[j] = Quaternion.Euler(0, 0, flare.Rotation) * vh.vertices[j];
-                //vh.vertices[j] = Quaternion.Euler(0, 0, angle) * vh.vertices[j];
-                //vh.vertices[j] += pos;
+                vh.vertices[j] = Quaternion.Euler(0, 0, angle) * vh.vertices[j];
+                vh.vertices[j] += _pos;
             }
             vh.uv = new Vector2[]
             {
diff --git a/Assets/LensFlare/FlareSource.cs b/Assets/LensFlare/FlareSource.cs
index 22c6dbb..2466b52 100644
--- a/Assets/LensFlare/FlareSource.cs
+++ b/Assets/LensFlare/FlareSource.cs
@@ -6,6 +6,7 @@ using UnityEngine;
 [Serializable]
 public class Flare
 {
+	public bool IsActive = true;
     public FlareAtlas Atlas; // flare atlas
     public int Index; // flare texture
     public float MaxSize; // 最大，单位unit
@@ -19,7 +20,7 @@ public class Flare
     [Range(-5, 10)]
     public float Distance = 0; // 一个相对于光源的偏移距离
     [HideInInspector]
-    public const float DistanceAmount = 15;
+    public const float DistanceAmount = 10;
 
     public float DistanceAspect
     {
@@ -49,6 +50,8 @@ public class FlareSource : MonoBehaviour
     public float PixelPerUnit = 100; // 用来控制缩放，在flare space生成网格的大小依据
     public AnimationCurve FadeInCurve; // 淡入的alpha曲线
     public AnimationCurve FadeOutCurve; // 淡出的alpha曲线
+	[Range(0.1f, 5)]
+	public float SpreadAmount = 5; // 总长度/光源到光晕中心的长度，用来求得总长度
     public List<Flare> Flares;
 
     private Vector3 m_ViewportPosition;
diff --git a/Assets/LensFlare/LensFlare.unity b/Assets/LensFlare/LensFlare.unity
index ac972fd..c693dd4 100644
--- a/Assets/LensFlare/LensFlare.unity
+++ b/Assets/LensFlare/LensFlare.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_IndirectSpecularColor: {r: 0.17864408, g: 0.22368589, b: 0.30562705, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -199,6 +199,7 @@ Light:
   m_UseColorTemperature: 0
   m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
   m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
   m_ShadowRadius: 0
   m_ShadowAngle: 0
 --- !u!4 &378154551
@@ -482,17 +483,20 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+  SpreadAmount: 5
   Flares:
-  - Atlas: {fileID: 11400000, guid: 317e5903581b97148afb8a08854d474d, type: 2}
-    Index: 22
+  - IsActive: 1
+    Atlas: {fileID: 11400000, guid: 317e5903581b97148afb8a08854d474d, type: 2}
+    Index: 17
     MaxSize: 0
     MinSize: 0
     Color: {r: 1, g: 1, b: 1, a: 1}
     Rotation: 270
     OverridePixelPerUnit: 1
     PixelPerUnit: 700
-    Distance: 0
-  - Atlas: {fileID: 11400000, guid: 317e5903581b97148afb8a08854d474d, type: 2}
+    Distance: -2.89
+  - IsActive: 1
+    Atlas: {fileID: 11400000, guid: 317e5903581b97148afb8a08854d474d, type: 2}
     Index: 3
     MaxSize: 0
     MinSize: 0
@@ -501,6 +505,26 @@ MonoBehaviour:
     OverridePixelPerUnit: 1
     PixelPerUnit: 700
     Distance: 0
+  - IsActive: 1
+    Atlas: {fileID: 11400000, guid: 317e5903581b97148afb8a08854d474d, type: 2}
+    Index: 4
+    MaxSize: 0
+    MinSize: 0
+    Color: {r: 1, g: 1, b: 1, a: 1}
+    Rotation: 270
+    OverridePixelPerUnit: 1
+    PixelPerUnit: 700
+    Distance: 3.19
+  - IsActive: 1
+    Atlas: {fileID: 11400000, guid: 317e5903581b97148afb8a08854d474d, type: 2}
+    Index: 7
+    MaxSize: 0
+    MinSize: 0
+    Color: {r: 1, g: 1, b: 1, a: 1}
+    Rotation: 270
+    OverridePixelPerUnit: 1
+    PixelPerUnit: 700
+    Distance: 5.02
 --- !u!1 &1129909397
 GameObject:
   m_ObjectHideFlags: 0
@@ -772,6 +796,7 @@ MonoBehaviour:
   m_StopNaN: 0
   m_Dithering: 0
   m_ClearDepth: 1
+  m_AllowXRRendering: 1
   m_RequiresDepthTexture: 0
   m_RequiresColorTexture: 0
   m_Version: 2
@@ -1131,6 +1156,7 @@ MonoBehaviour:
   m_StopNaN: 0
   m_Dithering: 0
   m_ClearDepth: 1
+  m_AllowXRRendering: 1
   m_RequiresDepthTexture: 0
   m_RequiresColorTexture: 0
   m_Version: 2
diff --git a/Assets/ProFlares/Editor/ProFlareInspector.cs b/Assets/ProFlares/Editor/ProFlareInspector.cs
index 91de6ac..7f5391c 100644
--- a/Assets/ProFlares/Editor/ProFlareInspector.cs
+++ b/Assets/ProFlares/Editor/ProFlareInspector.cs
@@ -1380,11 +1380,11 @@ public class ProFlareInspector : Editor {
         
         Handles.color = Color.white;
 		
-        Handles.ScaleValueHandle(_flare.maxAngle,
-                                 _flare.transform.position + _flare.transform.forward*5,
-                                 _flare.transform.rotation,
-                                 1,
-                                 Handles.ConeCap,
-                                 2);
+        //Handles.ScaleValueHandle(_flare.maxAngle,
+        //                         _flare.transform.position + _flare.transform.forward*5,
+        //                         _flare.transform.rotation,
+        //                         1,
+        //                         Handles.ConeCap,
+        //                         2);
     }
 }
diff --git a/Assets/Settings/ForwardRenderer.asset b/Assets/Settings/ForwardRenderer.asset
index 18a1e62..b9a801c 100644
--- a/Assets/Settings/ForwardRenderer.asset
+++ b/Assets/Settings/ForwardRenderer.asset
@@ -1,36 +1,44 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
-  m_Name: ForwardRenderer
-  m_EditorClassIdentifier: 
-  m_RendererFeatures: []
-  postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
-  shaders:
-    blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
-    copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
-    screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd,
-      type: 3}
-    samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
-    fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
-  m_OpaqueLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_TransparentLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_DefaultStencilState:
-    overrideStencilState: 0
-    stencilReference: 0
-    stencilCompareFunction: 8
-    passOperation: 0
-    failOperation: 0
-    zFailOperation: 0
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
+  m_Name: ForwardRenderer
+  m_EditorClassIdentifier: 
+  m_RendererFeatures: []
+  m_RendererFeatureMap: 
+  postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+  xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
+  shaders:
+    blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
+    copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
+    screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3}
+    samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+    tileDepthInfoPS: {fileID: 0}
+    tileDeferredPS: {fileID: 0}
+    stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
+    fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+    materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
+  m_OpaqueLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_TransparentLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_DefaultStencilState:
+    overrideStencilState: 0
+    stencilReference: 0
+    stencilCompareFunction: 8
+    passOperation: 0
+    failOperation: 0
+    zFailOperation: 0
+  m_ShadowTransparentReceive: 1
+  m_RenderingMode: 0
+  m_AccurateGbufferNormals: 0
-- 
cgit v1.1-26-g67d0