*misc

8 files changed, 39 insertions, 16 deletions

diff --git a/Assets/Scripts/Unit/AI/Actions.meta b/Assets/Scripts/Unit/AI/Actions.meta
new file mode 100644
index 00000000..9b4ad463
--- /dev/null
+++ b/Assets/Scripts/Unit/AI/Actions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 971e9d55b8bc0894eb6a110fb962000b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/AI/Conditionals.meta b/Assets/Scripts/Unit/AI/Conditionals.meta
new file mode 100644
index 00000000..70a86da5
--- /dev/null
+++ b/Assets/Scripts/Unit/AI/Conditionals.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 85b7e0c7ed1d12f42a5178bfbf3d934c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Components/UnitLensEffect.cs b/Assets/Scripts/Unit/Components/UnitLensEffect.cs
index ef8e6ee6..ff5af87d 100644
--- a/Assets/Scripts/Unit/Components/UnitLensEffect.cs
+++ b/Assets/Scripts/Unit/Components/UnitLensEffect.cs
@@ -65,7 +65,7 @@ public class UnitLensEffect : UnitComponent
 		/////

 		//m_Effects.Add(new LensEffect_MotionBlur());

 		//m_Effects.Add(new LensEffect_BlurRim(Color.blue));

-		m_Effects.Add(new LensEffect_Buzz());

+		//m_Effects.Add(new LensEffect_Buzz());

 	}
 
 	public override void Release()
diff --git a/Assets/Scripts/Unit/Components/UnitPreprocessing.cs b/Assets/Scripts/Unit/Components/UnitPreprocessing.cs
index 30357615..44ab73b7 100644
--- a/Assets/Scripts/Unit/Components/UnitPreprocessing.cs
+++ b/Assets/Scripts/Unit/Components/UnitPreprocessing.cs
@@ -15,12 +15,15 @@ public class UnitPreprocessing : UnitComponent
 		WorldNormalTexture, // Unit World Normal Texture
 	}
 
-	public EUnitPreprocessing preprocessing;
-
-	public RenderTexture unitDepthTexture { get; private set; }
-	public RenderTexture unitWorldNormalTexture { get; private set; }
-
-	private CommandBuffer m_CBBeforeDepthTexture;
+	public EUnitPreprocessing preprocessing;

+

+    #region render textures
+    public RenderTexture unitDepthTexture { get; private set; }
+	public RenderTexture unitWorldNormalTexture { get; private set; }

+    public RenderTexture unitMotionVectorTexture { get; private set; }

+    #endregion
+

+    private CommandBuffer m_CBBeforeDepthTexture;
 
 	private Material m_MaterialDepth;
 
@@ -72,11 +75,11 @@ public class UnitPreprocessing : UnitComponent
 
 	private void OnWillRenderUnit()
 	{
-		RenderDepthTexture();
-		//RenderWorldNormal();
-
-		MainCamera.Instance.camera.AddCommandBuffer(CameraEvent.BeforeDepthTexture, m_CBBeforeDepthTexture);
-	}
+        RenderDepthTexture();

+        //RenderWorldNormal();

+        RenderMotionVector();

+        MainCamera.Instance.camera.AddCommandBuffer(CameraEvent.BeforeDepthTexture, m_CBBeforeDepthTexture);
+    }
 
 	void RenderDepthTexture()
 	{
@@ -99,6 +102,10 @@ public class UnitPreprocessing : UnitComponent
 		}
 	}
 
+    void RenderMotionVector()

+    {

+    }
+
 	//void RenderWorldNormal()
 	//{
 	//	var cb = m_CBBeforeDepthTexture;
diff --git a/Assets/Scripts/Unit/Components/UnitState/PCState.cs b/Assets/Scripts/Unit/Components/UnitState/PCState.cs
index 1bdd355f..7e766455 100644
--- a/Assets/Scripts/Unit/Components/UnitState/PCState.cs
+++ b/Assets/Scripts/Unit/Components/UnitState/PCState.cs
@@ -144,7 +144,7 @@ public partial class PCState : UnitState
 

             UnitSnapshotInfo info = owner.TakeSnapshot();

             Vector2 dir = TestErika.Instance.monster.owner.center + new Vector3(offset, -0.5f, 0) - owner.center;

-            LensEffect_Dash dash = new LensEffect_Dash(Color.white, 0.1f, Mathf.Atan2(dir.y, dir.x), info);

+            LensEffect_Dash dash = new LensEffect_Dash(Color.white, 0.05f, Mathf.Atan2(dir.y, dir.x), info);

             owner.unitLensEffect.AddEffect(dash);

 

             owner.center = TestErika.Instance.monster.owner.center + new Vector3(offset, -0.5f, 0);

diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs
index 6c61f2e7..5260a751 100644
--- a/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs
+++ b/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs
@@ -77,7 +77,7 @@ public class LensEffect_BlurRim : LensEffectBase
 		MaterialEntry blur = ClaimMaterial(StaticDefine.shaders[EShader.Blur].name);

 

 		Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);

-		blur.material.SetVector("_TileOffset", tileOffset);

+		blur.material.SetVector("_UnitTileOffset", tileOffset);

 

 		cb.Blit(tempID, BuiltinRenderTextureType.CameraTarget, blur.material);

 		cb.ReleaseTemporaryRT(tempID);

diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs
index 61bb08fa..6cce6b4c 100644
--- a/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs
+++ b/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs
@@ -73,7 +73,7 @@ public class LensEffect_Dash : LensEffectBase
         MaterialEntry blur = ClaimMaterial(StaticDefine.shaders[EShader.MotionBlur].name);
 
 		Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);

-        blur.material.SetVector("_TileOffset", tileOffset);

+        blur.material.SetVector("_UnitTileOffset", tileOffset);

         blur.material.SetFloat("_Angle", Mathf.Rad2Deg * angle);

         blur.material.SetFloat("_AlphaMultiplier", Mathf.Clamp(1 - curTime / lifeTime, 0, 1));

 

diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs
index 3e5ee4f1..b76666ff 100644
--- a/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs
+++ b/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs
@@ -55,7 +55,7 @@ public class LensEffect_MotionBlur : LensEffectBase
             MaterialEntry blur = ClaimMaterial(StaticDefine.shaders[EShader.Blur].name);

 

             Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);

-            blur.material.SetVector("_TileOffset", tileOffset);

+            blur.material.SetVector("_UnitTileOffset", tileOffset);

 

             cb.Blit(tempID, BuiltinRenderTextureType.CameraTarget, blur.material);

             tempID = Shader.PropertyToID("_Temp1");