summaryrefslogtreecommitdiff
path: root/Assets/Scripts/Unit
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts/Unit')
-rw-r--r--Assets/Scripts/Unit/AI/Conditionals.meta8
-rw-r--r--Assets/Scripts/Unit/Components/UnitAfterImage.cs2
-rw-r--r--Assets/Scripts/Unit/Components/UnitImageEffect.cs14
-rw-r--r--Assets/Scripts/Unit/Components/UnitLensEffect.cs128
-rw-r--r--Assets/Scripts/Unit/Components/UnitLensEffect.cs.meta11
-rw-r--r--Assets/Scripts/Unit/Components/UnitPostEffect.cs15
-rw-r--r--Assets/Scripts/Unit/Components/UnitPostEffect.cs.meta11
-rw-r--r--Assets/Scripts/Unit/Components/UnitRender.cs23
-rw-r--r--Assets/Scripts/Unit/Controller/PCController.cs14
-rw-r--r--Assets/Scripts/Unit/LensEffect.meta (renamed from Assets/Scripts/Unit/AI/Actions.meta)2
-rw-r--r--Assets/Scripts/Unit/LensEffect/RendererProxy.cs33
-rw-r--r--Assets/Scripts/Unit/LensEffect/RendererProxy.cs.meta11
-rw-r--r--Assets/Scripts/Unit/TimelineEventProxy.cs10
-rw-r--r--Assets/Scripts/Unit/UnitDetail.cs9
14 files changed, 256 insertions, 35 deletions
diff --git a/Assets/Scripts/Unit/AI/Conditionals.meta b/Assets/Scripts/Unit/AI/Conditionals.meta
deleted file mode 100644
index 70a86da5..00000000
--- a/Assets/Scripts/Unit/AI/Conditionals.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 85b7e0c7ed1d12f42a5178bfbf3d934c
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Unit/Components/UnitAfterImage.cs b/Assets/Scripts/Unit/Components/UnitAfterImage.cs
index 369f63c9..622e87ba 100644
--- a/Assets/Scripts/Unit/Components/UnitAfterImage.cs
+++ b/Assets/Scripts/Unit/Components/UnitAfterImage.cs
@@ -2,6 +2,8 @@
using System.Collections.Generic;
using UnityEngine;
+// Unit残影，通过复制avatar实现
+
public class AfterImageSpawner
{
private float m_CurTime;
diff --git a/Assets/Scripts/Unit/Components/UnitImageEffect.cs b/Assets/Scripts/Unit/Components/UnitImageEffect.cs
index 4681826f..fcdd5c1f 100644
--- a/Assets/Scripts/Unit/Components/UnitImageEffect.cs
+++ b/Assets/Scripts/Unit/Components/UnitImageEffect.cs
@@ -1,7 +1,9 @@
using System.Collections;
using System.Collections.Generic;
-using UnityEngine;
-
+using UnityEngine;
+
+// Unit的一种后处理效果，渲染到一个RT上，对这个RT做效果
+
public class UnitImageEffectHolder
{
public float size;
@@ -30,7 +32,6 @@ public class UnitImageEffectHandle
public UnitImageEffectEndCallback onStop;
}
-//Unit后处理效果
public class UnitImageEffect : UnitComponent
{
public List<UnitImageEffectHandle> effects = new List<UnitImageEffectHandle>();
@@ -125,9 +126,10 @@ public class UnitImageEffect : UnitComponent
holder.gameObject.transform.position = Vector3.zero;
holders.Add(holder);
holder = null;
- }
-
-
+ }
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
public void ShowMotionBlur(float lifeTime, float angle, float distance)
{
UnitImageEffectHandle handle = m_HandlePool.Get();
diff --git a/Assets/Scripts/Unit/Components/UnitLensEffect.cs b/Assets/Scripts/Unit/Components/UnitLensEffect.cs
new file mode 100644
index 00000000..4b710aa4
--- /dev/null
+++ b/Assets/Scripts/Unit/Components/UnitLensEffect.cs
@@ -0,0 +1,128 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+//https://docs.unity3d.com/ScriptReference/Rendering.RenderTargetIdentifier.html
+
+// Unit效果之一，镜头效果，通过command buffer实现
+
+//public class MaterailEntry
+//{
+// public Material material;
+//}
+
+public class UnitLensEffect : UnitComponent
+{
+ private List<RendererProxy> renderers;
+
+ private static ObjectPool<CommandBuffer> m_CommandBufferPool = new ObjectPool<CommandBuffer>(null, null);
+
+ CommandBuffer m_CommandBuffer;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ renderers = new List<RendererProxy>();
+ }
+
+ public override void OnPostInitialize()
+ {
+ base.OnPostInitialize();
+
+ IBodyRendererAgent body = owner.unitRender.body;
+ if (body == null || body.renderers == null)
+ return;
+ for (int i = 0; i < body.renderers.Length; ++i)
+ {
+ var renderer = body.renderers[i];
+ if (renderer == null)
+ continue;
+ RendererProxy proxy = renderer.renderer.gameObject.GetOrAddComponent<RendererProxy>();
+ proxy.Initialize(renderer);
+ proxy.onWillRenderObject = OnWillRenderObject;
+ proxy.onRenderObject = OnRenderObject;
+ renderers.Add(proxy);
+ }
+
+ m_CommandBuffer = ClaimCommandBuffer();
+
+ MainCamera.Instance.lensEffectHandler.onPreCull += OnWillRenderUnit;
+ MainCamera.Instance.lensEffectHandler.onPostRender += OnRenderUnit;
+ }
+
+ public override void Release()
+ {
+ base.Release();
+
+ MainCamera.Instance.lensEffectHandler.onPreRender -= OnWillRenderUnit;
+ MainCamera.Instance.lensEffectHandler.onPostRender -= OnRenderUnit;
+ }
+
+ private void OnWillRenderUnit()
+ {
+ m_CommandBuffer.Clear();
+
+ MainCamera.Instance.camera.AddCommandBuffer(CameraEvent.BeforeImageEffectsOpaque, m_CommandBuffer);
+ }
+
+ private void OnRenderUnit()
+ {
+
+ MainCamera.Instance.camera.RemoveCommandBuffer(CameraEvent.BeforeImageEffectsOpaque, m_CommandBuffer);
+ }
+
+ private void OnWillRenderObject(BodyPartRenderer renderer)
+ {
+ //Camera cam = SceneManager.Instance.mainCamera;
+ //if (cam == null)
+ // return;
+ //Material mat = new Material(Shader.Find(StaticDefine.shaders[EShader.SolidColor].name));
+ //mat.SetColor("_Color", Color.red);
+
+ //Matrix4x4 obj2Wod = Matrix4x4.identity;
+ ////obj2Wod = TransformUtility.GetLocalToWorldMatrixRootBone(owner.unitDetail.rootBone.transform);
+ //Vector3 pos = owner.unitDetail.rootBone.transform.position;
+ //Quaternion rot = owner.unitDetail.rootBone.transform.rotation;
+ //obj2Wod = MatrixUtility.RotateAndTranslate(pos, rot);
+ //mat.SetMatrix("_ObjectToWorld", obj2Wod);
+ //mat.SetTexture("_MainTex", renderer.renderer.material.GetTexture("_MainTex"));
+
+ //cb.Clear();
+ //cb.name = "Unit Renderer";
+
+ //// create render texture for glow map
+ //int tempID = Shader.PropertyToID("_Temp1");
+ //cb.GetTemporaryRT(tempID, -1, -1, 24, FilterMode.Bilinear);
+ //cb.SetRenderTarget(tempID);
+ //cb.ClearRenderTarget(true, true, new Color(0, 0, 0, 0));
+ //cb.DrawRenderer(renderer.renderer, mat);
+
+ //cb.SetRenderTarget(BuiltinRenderTextureType.CameraTarget);
+ //Material blur = new Material(Shader.Find(StaticDefine.shaders[EShader.Blur].name));
+ //cb.Blit(tempID, BuiltinRenderTextureType.CameraTarget, blur);
+
+ //cam.AddCommandBuffer(CameraEvent.AfterImageEffectsOpaque, cb);
+ }
+
+ private void OnRenderObject(BodyPartRenderer renderer)
+ {
+ //Camera cam = SceneManager.Instance.mainCamera;
+ //cam.RemoveCommandBuffer(CameraEvent.AfterImageEffectsOpaque, cb);
+ }
+
+ static CommandBuffer ClaimCommandBuffer()
+ {
+ CommandBuffer cb = m_CommandBufferPool.Get();
+ cb.Clear();
+ return cb;
+ }
+
+ static void ReleaseCommandBuffer(ref CommandBuffer cb)
+ {
+ m_CommandBufferPool.Release(cb);
+ cb = null;
+ }
+
+}
diff --git a/Assets/Scripts/Unit/Components/UnitLensEffect.cs.meta b/Assets/Scripts/Unit/Components/UnitLensEffect.cs.meta
new file mode 100644
index 00000000..5a91ee87
--- /dev/null
+++ b/Assets/Scripts/Unit/Components/UnitLensEffect.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d2d69fdca26298548ba2c146496c33c3
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Unit/Components/UnitPostEffect.cs b/Assets/Scripts/Unit/Components/UnitPostEffect.cs
new file mode 100644
index 00000000..ad98ff6a
--- /dev/null
+++ b/Assets/Scripts/Unit/Components/UnitPostEffect.cs
@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UnitPostEffect : UnitComponent
+{
+
+ public override void Initialize()
+ {
+ base.Initialize();
+ }
+
+
+
+} \ No newline at end of file
diff --git a/Assets/Scripts/Unit/Components/UnitPostEffect.cs.meta b/Assets/Scripts/Unit/Components/UnitPostEffect.cs.meta
new file mode 100644
index 00000000..d91936b9
--- /dev/null
+++ b/Assets/Scripts/Unit/Components/UnitPostEffect.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a7d49a2074b33d342beb20900188941d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Unit/Components/UnitRender.cs b/Assets/Scripts/Unit/Components/UnitRender.cs
index d1ea0ffb..a5822ffe 100644
--- a/Assets/Scripts/Unit/Components/UnitRender.cs
+++ b/Assets/Scripts/Unit/Components/UnitRender.cs
@@ -6,6 +6,7 @@ using UnityEngine;
[DisallowMultipleComponent]
public class UnitRender : UnitComponent
{
+ public IBodyRendererAgent body { get { return m_Body; } }
private IBodyRendererAgent m_Body;
public Renderer mainRenderer
@@ -34,13 +35,13 @@ public class UnitRender : UnitComponent
LayerMask mask = LayerMask.GetMask("PlayerCharacter");
if (!isVisible)
{
- SceneManager.Instance.mainCamera.cullingMask &= ~mask.value;
+ //SceneManager.Instance.mainCamera.cullingMask &= ~mask.value;
}
else
{
- SceneManager.Instance.mainCamera.cullingMask |= mask.value;
- }
- }
+ //SceneManager.Instance.mainCamera.cullingMask |= mask.value;
+ }
+ }
public void SetVisibilityInAllCameras(bool isVisible)
{
@@ -49,12 +50,12 @@ public class UnitRender : UnitComponent
if (isVisible)
{
- mainRenderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.On;
- }
- else
+ //mainRenderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.On;
+ }
+ else
{
- mainRenderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.ShadowsOnly;
- }
- }
+ //mainRenderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.ShadowsOnly;
+ }
+ }
-}
+}
diff --git a/Assets/Scripts/Unit/Controller/PCController.cs b/Assets/Scripts/Unit/Controller/PCController.cs
index 4c665e7a..90520017 100644
--- a/Assets/Scripts/Unit/Controller/PCController.cs
+++ b/Assets/Scripts/Unit/Controller/PCController.cs
@@ -8,11 +8,13 @@ public class PCController : UnitController
{
public static PCController instance;
- public UnitAfterImage unitAfterImage;
-
+ #region Unit的三种效果
+ public UnitAfterImage unitAfterImage;
public UnitImageEffect unitImageEffect;
+ public UnitLensEffect unitLensEffect;
+ #endregion
- public override UnitType type { get { return UnitType.PC; } }
+ public override UnitType type { get { return UnitType.PC; } }
private void Awake()
{
@@ -34,7 +36,11 @@ public class PCController : UnitController
unitImageEffect = GetOrAddUnitComponent<UnitImageEffect>();
unitImageEffect.Initialize();
- }
+
+ unitLensEffect = GetOrAddUnitComponent<UnitLensEffect>();
+ unitLensEffect.Initialize();
+
+ }
public override void Update()
{
diff --git a/Assets/Scripts/Unit/AI/Actions.meta b/Assets/Scripts/Unit/LensEffect.meta
index 9b4ad463..ad9ac741 100644
--- a/Assets/Scripts/Unit/AI/Actions.meta
+++ b/Assets/Scripts/Unit/LensEffect.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 971e9d55b8bc0894eb6a110fb962000b
+guid: 3d1f1847b55e52a448151b0186678736
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Scripts/Unit/LensEffect/RendererProxy.cs b/Assets/Scripts/Unit/LensEffect/RendererProxy.cs
new file mode 100644
index 00000000..17d8d611
--- /dev/null
+++ b/Assets/Scripts/Unit/LensEffect/RendererProxy.cs
@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[RequireComponent(typeof(Renderer))]
+public class RendererProxy : MonoBehaviour
+{
+ public delegate void OnWillRenderObjectHandler(BodyPartRenderer renderer);
+ public OnWillRenderObjectHandler onWillRenderObject;
+
+ public delegate void OnRenderObjectHandler(BodyPartRenderer renderer);
+ public OnRenderObjectHandler onRenderObject;
+
+ BodyPartRenderer bodyPartRenderer;
+
+ public void Initialize(BodyPartRenderer renderer)
+ {
+ bodyPartRenderer = renderer;
+ }
+
+ void OnWillRenderObject()
+ {
+ if(onWillRenderObject != null)
+ onWillRenderObject(bodyPartRenderer);
+ }
+
+ void OnRenderObject()
+ {
+ if(onRenderObject != null)
+ onRenderObject(bodyPartRenderer);
+ }
+
+}
diff --git a/Assets/Scripts/Unit/LensEffect/RendererProxy.cs.meta b/Assets/Scripts/Unit/LensEffect/RendererProxy.cs.meta
new file mode 100644
index 00000000..5f8c904e
--- /dev/null
+++ b/Assets/Scripts/Unit/LensEffect/RendererProxy.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 81836ced17364c94d8130f6eeb2bf115
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs
index 9e41e30e..866c6d3b 100644
--- a/Assets/Scripts/Unit/TimelineEventProxy.cs
+++ b/Assets/Scripts/Unit/TimelineEventProxy.cs
@@ -51,8 +51,14 @@ public partial class TimelineEventProxy
EventGame_TimeScale, // 缩放时间
EventMesh_ImageEffect_MotionBlur, // 运动模糊
- EventMesh_ImageEffect_Glitch, // glitch
- EventMesh_AfterImage, // 角色残像
+ EventMesh_ImageEffect_Glitch, // glitch
+
+ EventMesh_LensEffect_Bloom, // bloom
+ EventMesh_LensEffect_MotionBlur, // motionBlur
+
+ EventMesh_PostEffect_Curly, //
+
+ EventMesh_AfterImage, // 角色残像
EventMesh_AfterImageStop, // 角色残像停止事件
EventMesh_FadeIn, // 角色透明度
EventMesh_FadeOut, // 角色透明度
diff --git a/Assets/Scripts/Unit/UnitDetail.cs b/Assets/Scripts/Unit/UnitDetail.cs
index 3f7f23e9..09eefa51 100644
--- a/Assets/Scripts/Unit/UnitDetail.cs
+++ b/Assets/Scripts/Unit/UnitDetail.cs
@@ -125,8 +125,8 @@ public class BodyPartRenderer
public interface IBodyRendererAgent
{
- BodyPartRenderer mainRenderer { get; }
- BodyPartRenderer[] renderers{ get; }
+ BodyPartRenderer mainRenderer { get; }
+ BodyPartRenderer[] renderers { get; }
}
public interface IBodyJointAgent
@@ -142,7 +142,10 @@ public interface IBodyJointAgent
[DisallowMultipleComponent]
public class UnitDetail : MonoBehaviour, IBodyRendererAgent, IBodyJointAgent
{
- public bool showGizmos;
+ public bool showGizmos;
+
+ [FormerlySerializedAs("root")]
+ public Transform rootBone;
[Tooltip("残影用的prefab")]
public string afterImageAvatarPath;
generated by cgit v1.1-26-g67d0 at 2025-05-22 15:09:34 +0000