diff options
| author | chai <chaifix@163.com> | 2022-03-10 14:07:40 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2022-03-10 14:07:40 +0800 |
| commit | 22891bf59032ba88262824255a706d652031384b (patch) | |
| tree | 7595439ba9966c9402d37e37cee5e8cf098757d5 /Erika/Assets/Scripts/Unit | |
| parent | 8b04ea73e540067f83870b61d89db4868fea5e8a (diff) | |
* move folder
Diffstat (limited to 'Erika/Assets/Scripts/Unit')
164 files changed, 7073 insertions, 0 deletions
diff --git a/Erika/Assets/Scripts/Unit/AI.meta b/Erika/Assets/Scripts/Unit/AI.meta new file mode 100644 index 00000000..e64e1ff9 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5167b72d3e56949419ac4e7b10def160 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AI/Actions.meta b/Erika/Assets/Scripts/Unit/AI/Actions.meta new file mode 100644 index 00000000..9b4ad463 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AI/Actions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 971e9d55b8bc0894eb6a110fb962000b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AI/Conditionals.meta b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta new file mode 100644 index 00000000..70a86da5 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85b7e0c7ed1d12f42a5178bfbf3d934c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Action.meta b/Erika/Assets/Scripts/Unit/Action.meta new file mode 100644 index 00000000..0efb2bf1 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Action.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5350e9767900c074d87314281414977b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs b/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs new file mode 100644 index 00000000..771e946b --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WaitForActionReachEnd : IEnumerator +{ + UnitAnimation m_UnitAnimation; + int m_Layer;
+
+ public WaitForActionReachEnd(UnitAnimation unitAnim, int layer = 0) + { + m_UnitAnimation = unitAnim; + m_Layer = layer; + } + + public object Current => null; + + public bool MoveNext() + { + var layer = m_UnitAnimation.layers[m_Layer]; + return layer.playbackNormalizedTime < 1f; + } + + public void Reset() + { + } +} diff --git a/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs.meta b/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs.meta new file mode 100644 index 00000000..d687ea23 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b4bf8dd0e94ed6543a91f6d3563d6dcb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Action/WaitForLanding.cs b/Erika/Assets/Scripts/Unit/Action/WaitForLanding.cs new file mode 100644 index 00000000..5c9736ac --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Action/WaitForLanding.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WaitForLanding : IEnumerator +{
+ UnitController controller;
+
+ public WaitForLanding(UnitController controller)
+ {
+ this.controller = controller;
+ }
+
+ public object Current => null;
+
+ public bool MoveNext()
+ { + return controller.isInAir;
+ }
+
+ public void Reset()
+ {
+ } +} diff --git a/Erika/Assets/Scripts/Unit/Action/WaitForLanding.cs.meta b/Erika/Assets/Scripts/Unit/Action/WaitForLanding.cs.meta new file mode 100644 index 00000000..5098bc64 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Action/WaitForLanding.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a8352853e3875584bb29bdcff4d9a586 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs b/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs new file mode 100644 index 00000000..82f3e792 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WaitForTransitionDone : IEnumerator +{
+ UnitAnimation m_UnitAnimation;
+
+ public WaitForTransitionDone(UnitAnimation unitAnim)
+ {
+ m_UnitAnimation = unitAnim;
+ }
+
+ public object Current => null;
+
+ public bool MoveNext()
+ { + return m_UnitAnimation.isInTransition;
+ }
+
+ public void Reset()
+ {
+ } +} diff --git a/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs.meta b/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs.meta new file mode 100644 index 00000000..54f35f87 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1729935affb1cc14c839545a43360dcb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AfterImage.meta b/Erika/Assets/Scripts/Unit/AfterImage.meta new file mode 100644 index 00000000..952c1fde --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AfterImage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9153d0fdbafce2244b1c761816e5f9c0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AfterImage/AfterImageAvatar.cs b/Erika/Assets/Scripts/Unit/AfterImage/AfterImageAvatar.cs new file mode 100644 index 00000000..ec04f3be --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AfterImage/AfterImageAvatar.cs @@ -0,0 +1,49 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// 单个残影的参数 +public struct AfterImageAvatarInfo
+{
+
+} + +public class AfterImageAvatar : MonoBehaviour +{
+ #region inspector + public Renderer[] renderers; + + public Animator animator;
+ #endregion + + float m_CurTime;
+
+ float m_LifeTime;
+
+ public void Initialize(AfterImageAvatarInfo info)
+ {
+
+ } + + public void Initialize(UnitController prototype) + { + transform.position = prototype.transform.position; + + animator.runtimeAnimatorController = prototype.unitAnimation.animator.runtimeAnimatorController; + animator.Play(prototype.unitAnimation.baseLayer.stateHash, 0, prototype.unitAnimation.baseLayer.playbackNormalizedTime); + animator.speed = 0.02f;
+ animator.Update(1 / 60f);
+
+ m_LifeTime = 0.2f; + } + + public void Update()
+ {
+ m_CurTime += Time.deltaTime;
+ if (m_CurTime > m_LifeTime)
+ {
+ GameObject.Destroy(this.gameObject);
+ }
+ } + +} diff --git a/Erika/Assets/Scripts/Unit/AfterImage/AfterImageAvatar.cs.meta b/Erika/Assets/Scripts/Unit/AfterImage/AfterImageAvatar.cs.meta new file mode 100644 index 00000000..85c289bb --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AfterImage/AfterImageAvatar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 89864711140932040a5827c91d9e5adc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AnimationData.cs b/Erika/Assets/Scripts/Unit/AnimationData.cs new file mode 100644 index 00000000..9af3d51c --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AnimationData.cs @@ -0,0 +1,526 @@ +using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+// 不要修改枚举的顺序，只能在后面新加，不能删除
+
+public enum EAnimationToogle
+{
+ Combo = 0, // 连击
+ SuperArmor = 1, // 霸体
+ Break = 2, // 打断
+}
+
+[Serializable]
+public struct FromTo
+{
+ [SerializeField] public float from;
+ [SerializeField] public float to;
+ public Vector2 fromTo
+ {
+ get
+ {
+ return new Vector2(from, to);
+ }
+ set
+ {
+ from = value.x;
+ to = value.y;
+ }
+ }
+ public FromTo(float from, float to)
+ {
+ this.from = from;
+ this.to = to;
+ }
+ public FromTo(Vector2 fromTo)
+ {
+ this.from = fromTo.x;
+ this.to = fromTo.y;
+ }
+}
+
+[Serializable]
+public class ToggleTimeDictionary : SerializableDictionary<EAnimationToogle, FromTo> { }
+
+public enum EAnimationCurve
+{
+ TimeScale = 0, //
+ RootMotionScale = 1,
+}
+
+[Serializable]
+public class CurveDictionary : SerializableDictionary<EAnimationCurve, AnimationCurve> { }
+
+[Serializable]
+public struct AnimationParameter
+{
+ [Serializable]
+ public struct Setter
+ {
+ [SerializeField] public float normalizedTime;
+ [SerializeField] public float value;
+ }
+ [SerializeField] public List<Setter> setters;
+}
+
+public enum EAnimationParameter
+{
+ Visibility = 0,
+}
+
+[Serializable]
+public class ParameterDictionary : SerializableDictionary<EAnimationParameter, AnimationParameter> { }
+
+// 动画属性
+public enum EAnimationProperty
+{
+ ComboTimeOffset = 1, // 如果是连击跳转过来，动作开始的时间偏移
+ IgnoreY = 2, // 忽略roomotion在y轴的变化
+ TransitionInDuration = 3, // 过渡到这个动作的时间
+ TransitionOutDuration = 4, // 过渡到下一个动作的时间
+ CanBeInterrupted = 5, // 是否可以被打断
+ ORMEnforcement = 6, // 限制Y坐标的rootmotion不能小于0，仅限override rootmotion
+ Endpoint = 7, // 结束点，范围[0-1]，如果只截取动作的一部分，用这个属性设置
+ Startpoint = 8, // 类似endpoint
+}
+
+[Serializable]
+public class PropertyDictionary : SerializableDictionary<EAnimationProperty, float> { }
+
+[Serializable]
+public class RootMotionOverrideData
+{
+ [Serializable]
+ public class PosData
+ {
+ [SerializeField] public Vector3 position;
+ [SerializeField] public int frame;
+ public PosData(int frame, Vector3 pos)
+ {
+ this.frame = frame;
+ this.position = pos;
+ }
+ }
+ [SerializeField] public List<PosData> positions;
+ public RootMotionOverrideData()
+ {
+ positions = new List<PosData>();
+ }
+ public Vector3 GetPosition(float frame)
+ {
+ if (positions == null || positions.Count == 0)
+ return Vector3.zero;
+ positions.Sort((p1, p2) => {
+ if (p1.frame < p2.frame)
+ return -1;
+ if (p1.frame > p2.frame)
+ return 1;
+ return 0;
+ });
+ int prev = 0;
+ int next = 0;
+ for(int i = 0;i < positions.Count; ++i)
+ {
+ if(positions[i].frame > frame)
+ {
+ break;
+ }
+ prev = i;
+ next = Mathf.Clamp(i + 1, 0, positions.Count - 1);
+ }
+ float t = 0;
+ if(prev != next)
+ {
+ t = (frame - positions[prev].frame) / (positions[next].frame - positions[prev].frame);
+ }
+ Vector3 pos = Vector3.Lerp(positions[prev].position, positions[next].position, t);
+ return pos;
+ }
+
+ public Vector3 GetRootMotionDistance(float prevFrame, float curFrame)
+ {
+ Vector3 p1 = GetPosition(prevFrame);
+ Vector3 p2 = GetPosition(curFrame);
+ return p2 - p1;
+ }
+
+ public void SetPosition(int frame, Vector3 position)
+ {
+ if(positions == null)
+ {
+ positions = new List<PosData>();
+ }
+ PosData pd = positions.Find(s => s.frame == frame);
+ if(pd != null)
+ {
+ pd.position = position;
+ }
+ else
+ {
+ positions.Add(new PosData(frame, position));
+ }
+ }
+
+ public void RemovePositionAtFrame(float frame)
+ {
+ if (positions == null)
+ return;
+ PosData pd = positions.Find(s => s.frame == frame);
+ if(pd != null)
+ {
+ positions.Remove(pd);
+ }
+ }
+}
+
+// 某个动画的数据，包括帧事件、碰撞盒、速度曲线
+[CreateAssetMenu(fileName = "Animation Data")]
+public class AnimationData : ScriptableObject
+{
+ public string animationName;
+ public string animationPath;
+
+ public string note;
+
+ public List<AnimationEventBase> animationEvents;
+
+ public List<ColliderData> hurtBoxes;
+ public List<ColliderData> hitBoxes;
+ public List<ColliderData> throwBoxes;
+ public List<ColliderData> blockBoxes;
+ public List<ColliderData> defendBoxes;
+
+ public bool overrideRootMotion;
+ public RootMotionOverrideData rootMotionOverrideData;
+
+ // 对应的进度的播放速度，默认是1
+ [UnityEngine.Serialization.FormerlySerializedAs("curve")]
+ public AnimationCurve speedCurve;
+
+ public CurveDictionary curves;
+
+ public ToggleTimeDictionary toggles;
+
+ public ParameterDictionary parameters;
+
+ public PropertyDictionary properties;
+
+ public const int FPS = 30;
+
+ public AnimationData()
+ {
+ Keyframe frame0 = new Keyframe(0, 1);
+ Keyframe frame1 = new Keyframe(1, 1);
+ speedCurve = new AnimationCurve(frame0, frame1);
+ }
+
+ public List<ColliderData> GetColliderBoxesByType(ColliderBox.EColliderType type)
+ {
+ switch (type)
+ {
+ case ColliderBox.EColliderType.HurtBox:
+ return hurtBoxes;
+ case ColliderBox.EColliderType.HitBox:
+ return hitBoxes;
+ case ColliderBox.EColliderType.BlockBox:
+ return blockBoxes;
+ case ColliderBox.EColliderType.ThrowBox:
+ return throwBoxes;
+ case ColliderBox.EColliderType.DefendBox:
+ return defendBoxes;
+ }
+ return null;
+ }
+
+ public bool HasProperty(EAnimationProperty property)
+ {
+ if (!properties.ContainsKey(property))
+ return false;
+ return true;
+ }
+
+ public float GetProperty(EAnimationProperty property, float defaultValue = 0)
+ {
+ if (!HasProperty(property))
+ return defaultValue;
+ return properties[property];
+ }
+
+ public bool HasParameter(EAnimationParameter parameterName)
+ {
+ if (!parameters.ContainsKey(parameterName))
+ return false;
+ return true;
+ }
+
+ public float GetParameter(EAnimationParameter parameterName, float normalizedTime)
+ {
+ if (!parameters.ContainsKey(parameterName))
+ return 0;
+ var parameter = parameters[parameterName];
+ parameter.setters.Sort((AnimationParameter.Setter a, AnimationParameter.Setter b) =>
+ {
+ return a.normalizedTime - b.normalizedTime < 0 ? -1 : 1;
+ });
+ float value = 0;
+ for (int i = 0; i < parameter.setters.Count; ++i)
+ {
+ AnimationParameter.Setter setter = parameter.setters[i];
+ if (setter.normalizedTime > normalizedTime)
+ break;
+ value = setter.value;
+ }
+ return value;
+ }
+
+ public bool HasCurve(EAnimationCurve curve)
+ {
+ return curves != null && curves.ContainsKey(curve);
+ }
+
+ public AnimationCurve GetCurve(EAnimationCurve curve)
+ {
+ if (!HasCurve(curve))
+ return null;
+ return curves[curve];
+ }
+
+ public bool HasToggle(EAnimationToogle toggle)
+ {
+ return toggles != null && toggles.ContainsKey(toggle);
+ }
+
+ public bool IsToggleOpen(EAnimationToogle toggle, float normalizedTime)
+ {
+ if (!HasToggle(toggle))
+ {
+ return false;
+ }
+ return toggles[toggle].to >= normalizedTime && normalizedTime >= toggles[toggle].from;
+ }
+
+ public ColliderInfo GetColliderInfo(ColliderBox.EColliderType type, int index, float playbackTime)
+ {
+ return GetColliderInfoByFrame(type, index, playbackTime * FPS);
+ }
+
+ public ColliderInfo GetColliderInfoByFrame(ColliderBox.EColliderType type, int index, float frame)
+ {
+ ColliderInfo info = new ColliderInfo();
+ var colliders = GetColliderBoxesByType(type);
+ if (colliders == null || colliders.Count <= index)
+ return info; //info.isValid == false
+ info = colliders[index].GetColliderInfo(frame);
+ return info;
+ }
+
+ public ColliderInfo[] GetCollidersInfo(ColliderBox.EColliderType type, float playbackTime)
+ {
+ return GetCollidersInfoByFrame(type, playbackTime * FPS);
+ }
+
+ public ColliderInfo[] GetCollidersInfoByFrame(ColliderBox.EColliderType type, float frame)
+ {
+ var colliders = GetColliderBoxesByType(type);
+ if (colliders == null || colliders.Count == 0)
+ return null;
+ ColliderInfo[] infos = new ColliderInfo[colliders.Count];
+ for(int i = 0; i < colliders.Count; ++i)
+ {
+ infos[i] = colliders[i].GetColliderInfo(frame);
+ }
+ return infos;
+ }
+
+ public ColliderInfo[] GetActiveCollidersInfo(ColliderBox.EColliderType type, float playbackTime)
+ {
+ return GetActiveCollidersInfoByFrame(type , playbackTime * FPS);
+ }
+
+ public ColliderInfo[] GetActiveCollidersInfoByFrame(ColliderBox.EColliderType type, float frame)
+ {
+ var all = GetCollidersInfoByFrame(type, frame);
+ if (all == null || all.Length == 0)
+ return null;
+ int activeCount = 0;
+ foreach(var c in all)
+ {
+ if (c.active)
+ activeCount++;
+ }
+ if (activeCount == 0)
+ return null;
+ ColliderInfo[] active = new ColliderInfo[activeCount];
+ int i = 0;
+ foreach(var c in all)
+ {
+ if(c.active)
+ {
+ active[i++] = c;
+ }
+ }
+ return active;
+ }
+
+ public int GetBoxesCount()
+ {
+ int hurt = hurtBoxes != null ? hurtBoxes.Count : 0;
+ int hit = hitBoxes != null ? hitBoxes.Count : 0;
+ int thro = throwBoxes != null ? throwBoxes.Count : 0;
+ int block = blockBoxes != null ? blockBoxes.Count : 0;
+ int defend = defendBoxes != null ? defendBoxes.Count : 0;
+ return hurt + hit + thro + block + defend;
+ }
+
+ public void AddBox(ref List<ColliderData> boxList, ColliderData box)
+ {
+ if (boxList == null)
+ {
+ boxList = new List<ColliderData>();
+ return;
+ }
+ boxList.Add(box);
+ }
+
+ public void DeleteBox(ColliderData box)
+ {
+ if (hurtBoxes != null) hurtBoxes.Remove(box);
+ if (hitBoxes != null) hitBoxes.Remove(box);
+ if (throwBoxes != null) throwBoxes.Remove(box);
+ if (blockBoxes != null) blockBoxes.Remove(box);
+ if (defendBoxes != null) defendBoxes.Remove(box);
+ }
+
+ public ColliderData GetColliderByIndex(int index)
+ {
+ if (hurtBoxes != null && hurtBoxes.Count > index)
+ return hurtBoxes[index];
+ else
+ index -= hurtBoxes.Count;
+ if (hitBoxes != null && hitBoxes.Count > index)
+ return hitBoxes[index];
+ else
+ index -= hitBoxes.Count;
+ if (throwBoxes != null && throwBoxes.Count > index)
+ return throwBoxes[index];
+ else
+ index -= throwBoxes.Count;
+ if (blockBoxes != null && blockBoxes.Count > index)
+ return blockBoxes[index];
+ else
+ index -= blockBoxes.Count;
+ if (defendBoxes != null && defendBoxes.Count > index)
+ return defendBoxes[index];
+ else
+ index -= defendBoxes.Count;
+ return null;
+ }
+
+ public void AddEvent(AnimationEventBase animEvent)
+ {
+ if (this.animationEvents == null)
+ this.animationEvents = new List<AnimationEventBase>();
+ animationEvents.Add(animEvent);
+ }
+
+ public List<AnimationEventBase> GetAnimationEventsAtFrame(int frame)
+ {
+ if (animationEvents == null)
+ return null;
+
+ List<AnimationEventBase> events = ListPool<AnimationEventBase>.Get();
+ events.Clear();
+ foreach (var animeEvent in animationEvents)
+ {
+ if (animeEvent == null)
+ continue;
+ if(animeEvent.startFrame == frame)
+ {
+ events.Add(animeEvent);
+ }
+ }
+ return events;
+ }
+
+ public int GetMaxAnimationEventsCount()
+ {
+ List<int> frames = GetAnimationEventFrameIndices();
+ if(frames == null)
+ {
+ ListPool<int>.Release(frames);
+ return 0;
+ }
+ int count = 0;
+ for(int i = 0; i < frames.Count; ++i)
+ {
+ List<AnimationEventBase> events = GetAnimationEventsAtFrame(frames[i]);
+ if (count < events.Count)
+ {
+ count = events.Count;
+ }
+ ListPool<AnimationEventBase>.Release(events);
+ }
+ ListPool<int>.Release(frames);
+ return count;
+ }
+
+ public List<int> GetAnimationEventFrameIndices()
+ {
+ if (animationEvents == null)
+ return null;
+
+ List<int> frames = ListPool<int>.Get();
+ frames.Clear();
+ foreach (var animeEvent in animationEvents)
+ {
+ if (animeEvent == null)
+ continue;
+ if (!frames.Contains(animeEvent.startFrame))
+ {
+ frames.Add(animeEvent.startFrame);
+ }
+ }
+ return frames;
+ }
+
+ public void DeleteEvent(AnimationEventBase animEvent)
+ {
+ if(animationEvents.Contains(animEvent))
+ {
+ animationEvents.Remove(animEvent);
+ }
+ }
+
+ public void AddRootMotionOverriderData( )
+ {
+ this.overrideRootMotion = true;
+ this.rootMotionOverrideData = new RootMotionOverrideData();
+ }
+
+ public void DeleteRootMotionOverrideData()
+ {
+ this.overrideRootMotion = false;
+ this.rootMotionOverrideData = null;
+ }
+
+#if UNITY_EDITOR
+ public void OnSaveToDisk()
+ {
+ foreach(var animEvent in animationEvents)
+ {
+ if (animEvent == null)
+ continue;
+ if(!AssetDatabase.IsSubAsset(animEvent))
+ {
+ AssetDatabase.AddObjectToAsset(animEvent, this);
+ }
+ }
+ }
+#endif
+
+}
diff --git a/Erika/Assets/Scripts/Unit/AnimationData.cs.meta b/Erika/Assets/Scripts/Unit/AnimationData.cs.meta new file mode 100644 index 00000000..3096f841 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AnimationData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cab6406109041434e890f22d6455172f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider.meta b/Erika/Assets/Scripts/Unit/Collider.meta new file mode 100644 index 00000000..58f0c5a3 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bdd24f4780cd7394c8591ad34d8938cf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderAttributes.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderAttributes.cs new file mode 100644 index 00000000..27889441 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderAttributes.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ColliderTypeAttribute : Attribute +{ + public ColliderTypeAttribute(ColliderBox.EColliderType type) + { + this.type = type; + } + + public ColliderBox.EColliderType type; +} + + +public class IfAttribute : Attribute +{ + public IfAttribute(string name) + { + this.conditionName = name; + } + + public string conditionName; + +} + +public class IfNotAttribute : Attribute +{ + public IfNotAttribute(string name) + { + this.conditionName = name; + } + + public string conditionName; + +} + +public class WhenAttribute : Attribute +{ + public WhenAttribute(string name, object value) + { + this.conditionName = name; + this.value = (int)value; + } + + public WhenAttribute(string name, params object[] values)
+ {
+ this.conditionName = name;
+ this.values = new List<float>();
+ foreach(var v in values)
+ {
+ this.values.Add((float)v);
+ }
+ } + + public bool IsSatisfied(float v)
+ {
+ if (values != null)
+ return values.Contains(v);
+ return value == v;
+ } + + public string conditionName; + public float value; + public List<float> values; +} + +public class AndWhenAttribute : Attribute +{ + public AndWhenAttribute(string name, object value) + { + this.conditionName = name;
+ this.value = (int)value; + } + + public AndWhenAttribute(string name, params object[] values)
+ {
+ this.conditionName = name;
+ this.values = new List<float>();
+ foreach (var v in values)
+ {
+ this.values.Add((float)v);
+ }
+ } + + public bool IsSatisfied(float v)
+ {
+ if (values != null)
+ return values.Contains(v);
+ return value == v;
+ } + + public string conditionName; + public float value; + public List<float> values; +} + +public class WhenNotAttribute : Attribute +{ + public WhenNotAttribute(string name, object value) + { + this.conditionName = name; + this.value = (int)value; + } + + public string conditionName; + public int value; +} + +public class CommentAttribute : Attribute +{ + public CommentAttribute(string comment, TextAnchor alignment = TextAnchor.MiddleLeft) + { + this.comment = comment; + this.alignment = alignment; + } + public string comment; + public TextAnchor alignment; +} + +public class FoldoutAttribute : Attribute +{
+ public FoldoutAttribute(string title, int count)
+ {
+ this.title = title;
+ this.count = count;
+ }
+ public string title; + public int count; // 下面的元素的个数 +} + + +public class HDRAttribute : Attribute
+{
+} diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderAttributes.cs.meta b/Erika/Assets/Scripts/Unit/Collider/ColliderAttributes.cs.meta new file mode 100644 index 00000000..9cdbeaf7 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderAttributes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 618a95231c298694696513e29164d269 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs new file mode 100644 index 00000000..24319ef2 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs @@ -0,0 +1,34 @@ +using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[Serializable]
+public partial class ColliderBox
+{
+ // pivot
+ public enum Pivot
+ {
+ MiddleBottom = 0,
+ MiddleCenter = 1,
+ }
+
+ // 分化为不同的collider类型
+ public enum EColliderType
+ {
+ HitBox,
+ HurtBox,
+ ThrowBox,
+ BlockBox,
+ DefendBox,
+ }
+
+ [DisallowModifiyInGUI]
+ [Tooltip("Collider类型")]
+ public EColliderType type;
+
+ [DisallowModifiyInGUI]
+ [Tooltip("Collider原点")]
+ public Pivot pivot;
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs.meta b/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs.meta new file mode 100644 index 00000000..439b4b67 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f8d463de484da614bb9cad410152198a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs new file mode 100644 index 00000000..9f1d629a --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs @@ -0,0 +1,124 @@ +using UnityEngine;
+
+// 打击感相关资料
+// https://gameinstitute.qq.com/community/detail/112371
+//
+
+public partial class ColliderBox +{
+
+ public enum EColorDriftMode : int + { + None = 0, + UI = 1, + All = 2, + } + + public enum EBlurMode : int
+ {
+ None = 0,
+ Gauß = 1,
+ Radial = 2,
+ } + + public enum ESparkAnchor : int + { + CenterOfIntersection = 0, // hitbox和hurtbox相交的矩形中心
+ CenterOfOther = 1, // 被攻击的对象的几何中心
+ PositionOfOther = 2, // 被攻击对象的原点 + CenterOfHitbox = 3, // hitbox的中心 + FrontOfHitbox = 4, // hitbox的前方 + }
+
+ public enum EMeshEffect : int
+ {
+ None = 0,
+ White = 1,
+ Red = 2,
+ }
+
+ // 击中反馈
+ public enum EHitResponse
+ {
+ Light = 0,
+ Heavy = 1,
+ HitAir = 2,
+ HitGround = 3,
+ HitInAir = 4,
+ }
+
+ [ColliderType(EColliderType.HitBox)]
+ + [Tooltip("允许多次击中")] + public bool multiHit;
+
+ public EHitResponse hitResponse;
+
+ [Tooltip("击退距离")]
+ public Vector3 hitBack; + + [Tooltip("击退曲线")]
+ public AnimationCurve hitCurve; + + [Comment("[ 击中效果 ]", TextAnchor.MiddleCenter)]
+
+ [Foldout("时间效果", 3)]
+ [Tooltip("全局顿帧")]
+ public float freezeGlobal;
+ [Tooltip("自身顿帧")]
+ public float freezeFramesSelf;
+ //[WhenNot("freezeFramesSelf", 0)]
+ //public AnimationCurve freezeFramesSelfCurve;
+ [Tooltip("对方顿帧")]
+ public float freezeFramesOther;
+ //[WhenNot("freezeFramesOther", 0)]
+ //public AnimationCurve freezeFramesOtherCurve;
+
+ [Foldout("粒子效果", 10)]
+ [Tooltip("击中后的粒子效果")] + public string sparkPath; + [Tooltip("粒子的锚点")] + public ESparkAnchor sparkAnchor = ESparkAnchor.CenterOfOther; + [Tooltip("击中后的粒子位置偏移")] + public Vector3 sparkOffset;
+ [Tooltip("击中后的粒子大小")] + public Vector3 sparkScale = Vector3.one; + [Tooltip("多个粒子，最多支持3个")] + public bool multiSparks; + [If("multiSparks"), Tooltip("击中后的粒子效果")] + public string spark2Path; + [If("multiSparks"), Tooltip("粒子的锚点")] + public ESparkAnchor spark2Anchor = ESparkAnchor.CenterOfOther; + [If("multiSparks"), Tooltip("击中后的粒子位置偏移")] + public Vector3 spark2Offset;
+ [If("multiSparks"), Tooltip("击中后的粒子效果")] + public string spark3Path; + [If("multiSparks"), Tooltip("粒子的锚点")] + public ESparkAnchor spark3Anchor = ESparkAnchor.CenterOfOther; + [If("multiSparks"), Tooltip("击中后的粒子位置偏移")] + public Vector3 spark3Offset;
+
+ [Foldout("网格效果", 2)] + public EMeshEffect selfEffect; + public EMeshEffect otherEffect; + + [Foldout("相机效果", 4)] + [Tooltip("拉近相机")] + public bool zoomCamera;
+ [Tooltip("是否震屏")] + public bool shakeScreen; + [If("shakeScreen"), Tooltip("是否震屏")] + public Vector2 shakeOffset; + [If("shakeScreen"), Tooltip("震屏力度")] + public float shakeStrength;
+
+ [Foldout("屏幕效果", 2)] + [Tooltip("颜色漂移效果")]
+ public EColorDriftMode colorDrift; + public EBlurMode blur;
+
+ [Foldout("音效", 1)]
+ [Tooltip("音效")]
+ public string soundPath; + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs.meta b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs.meta new file mode 100644 index 00000000..639f1fc5 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ddd96c09da9d8ff468e34a19a4698555 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs new file mode 100644 index 00000000..788b457a --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +public partial class ColliderBox +{ + + [ColliderType(EColliderType.HurtBox)]
+
+ [Tooltip("是否开启重力")] + public bool useGravity; + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs.meta b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs.meta new file mode 100644 index 00000000..607eaa13 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9a6f3f28157915d4799d28475c61a11a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox_ThrowBox.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_ThrowBox.cs new file mode 100644 index 00000000..932f1062 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_ThrowBox.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public partial class ColliderBox +{
+ [ColliderType(EColliderType.ThrowBox)]
+
+ [Tooltip("是否允许抓取多个")] + public bool multiple; + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox_ThrowBox.cs.meta b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_ThrowBox.cs.meta new file mode 100644 index 00000000..14bc67b2 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_ThrowBox.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 855e124ac6f58354a86276f0cda17fa1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderData.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderData.cs new file mode 100644 index 00000000..58743aff --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderData.cs @@ -0,0 +1,136 @@ +using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+// 用来返回某一时刻的碰撞盒几何数据
+public struct ColliderInfo
+{
+ public bool active;
+ public float frame;
+ public Vector3 position;
+ public Vector3 size;
+ public ColliderBox.EColliderType type { get { return collider.type; } }
+ public ColliderBox.Pivot pivot { get { return collider.pivot; } }
+ public ColliderBox collider;
+ public int colliderHash { get { return collider.GetHashCode(); } }
+
+ public bool isValid { get { return collider != null; } } // 没有对应的数据时为false
+}
+
+// 某个碰撞盒的属性和帧数据，从属于animation data
+[Serializable]
+public class ColliderData
+{
+ [Serializable]
+ public class ColliderFrame
+ {
+ public int frame;
+ public bool active;
+ public Vector3 position;
+ public Vector3 size;
+ }
+
+ public ColliderBox.EColliderType type { get { return collider.type; } }
+ public ColliderBox.Pivot pivot { get { return collider.pivot; } }
+
+ public ColliderBox collider;
+
+ public List<ColliderFrame> frames;
+
+ public ColliderData(ColliderBox.EColliderType type, ColliderBox.Pivot pivot)
+ {
+ this.frames = new List<ColliderFrame>();
+ if (collider == null)
+ collider = new ColliderBox();
+ collider.type = type;
+ collider.pivot = pivot;
+ }
+
+ public ColliderInfo GetColliderInfo(float frame)
+ {
+ ColliderInfo info = new ColliderInfo();
+ info.active = false; // default
+ info.collider = collider;
+ info.frame = frame;
+ int previous = 0;
+ int end = -1;
+ for (int i = 0; i < frames.Count; ++i)
+ {
+ if(frame >= frames[i].frame)
+ {
+ previous = frames[i].frame;
+ }
+ if(frames[i].frame > frame)
+ {
+ end = frames[i].frame;
+ break;
+ }
+ }
+ if(end == -1)
+ {
+ if(type == ColliderBox.EColliderType.HurtBox)
+ {
+ ColliderFrame pre = frames.Find(s => s.frame == previous);
+ if (pre == null)
+ return info;
+ info.active = pre.active;
+ info.position = pre.position;
+ info.size = pre.size;
+ }
+ }
+ else
+ {
+ ColliderFrame pre = frames.Find(s => s.frame == previous);
+ ColliderFrame next = frames.Find(s => s.frame == end);
+ if (pre == null || next == null)
+ return info;
+ info.active = pre.active;
+ float t = (frame - previous) / (end - previous);
+ info.position = Vector3.Lerp(pre.position, next.position, t);
+ info.size = Vector3.Lerp(pre.size, next.size, t);
+ }
+ return info;
+ }
+
+ public ColliderFrame AddFrame(int frameIndex)
+ {
+ if (frames == null)
+ frames = new List<ColliderFrame>();
+ ColliderFrame frame = new ColliderFrame();
+ frame.frame = frameIndex;
+ frame.active = true;
+ frame.position = Vector3.zero;
+ frame.size = new Vector3(0.5f,1,1);
+ frames.Add(frame);
+ frames.Sort((a, b) => {
+ if (a == null)
+ return 1;
+ if (b == null)
+ return -1;
+ if (a.frame < b.frame)
+ return -1;
+ if (a.frame > b.frame)
+ return 1;
+ return 0;
+ });
+ return frame;
+ }
+
+ public void DeleteFrame(int frameIndex)
+ {
+ if (frames == null)
+ return;
+ ColliderFrame frame = null;
+ foreach(var f in frames)
+ {
+ if (f.frame == frameIndex)
+ frame = f;
+ }
+ if(frame != null)
+ {
+ frames.Remove(frame);
+ }
+ }
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderData.cs.meta b/Erika/Assets/Scripts/Unit/Collider/ColliderData.cs.meta new file mode 100644 index 00000000..c66d5502 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 80e8515ea336e6a4ca6ebadad243468f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs new file mode 100644 index 00000000..408ce5a4 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ColliderRegistry : Singleton<ColliderRegistry> +{ + public List<UnitCollider> colliders = new List<UnitCollider>(); + public List<Projectile> projectiles = new List<Projectile>(); + + public void AddCollider(UnitCollider collider) + { + if (!colliders.Contains(collider)) + colliders.Add(collider); + } + + public void RemoveCollider(UnitCollider collider) + { + if (colliders.Contains(collider)) + colliders.Remove(collider); + }
+
+
+ public void AddProjectile(Projectile projectile)
+ {
+ if (!projectiles.Contains(projectile))
+ projectiles.Add(projectile);
+ }
+
+ public void RemoveProjectile(Projectile projectile)
+ {
+ if (projectiles.Contains(projectile))
+ projectiles.Remove(projectile);
+ } + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs.meta b/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs.meta new file mode 100644 index 00000000..8007287c --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7787595f1b3721847aeca526a55446b9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs b/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs new file mode 100644 index 00000000..83052073 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs @@ -0,0 +1,262 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +public struct ColliderDescriptor +{ + public ColliderInfo colliderInfo; + public UnitCollider unitCollider; +} + +[Serializable] +public struct Box
+{
+ [SerializeField] public Vector3 center;
+ [SerializeField] public Vector3 size;
+} + +public struct CollisionInfo +{ + public ColliderDescriptor collider; // 主动
+ public ColliderDescriptor collidee; // 从动 + public Box intersection; + public bool isCollision; +} + +public class CollisionSystem : SingletonMB<CollisionSystem> +{ + public delegate void StageHandle(); + + public StageHandle onSolveHit; + + [SerializeField] + private int m_UnitColliderCount; + + ColliderRegistry registry { get { return ColliderRegistry.Instance; } } + + private void Start() + { + } + + void Update() + { + m_UnitColliderCount = registry.colliders != null ? registry.colliders.Count : 0; + + SolveHit(); + SolveProjectile(); + } + + // hitbox <-> hurtbox + void SolveHit() + { + // collect all hit box + List<ColliderDescriptor> hitboxes = ListPool<ColliderDescriptor>.Get(); + foreach (var collider in registry.colliders) + { + ColliderInfo[] boxes = collider.GetCurrentBoxesInfoByType(ColliderBox.EColliderType.HitBox); + if (boxes == null || boxes.Length == 0) + continue; + for(int i = 0; i < boxes.Length; ++i) + { + ColliderDescriptor descriptor = new ColliderDescriptor(); + descriptor.colliderInfo = boxes[i]; + descriptor.unitCollider = collider; + hitboxes.Add(descriptor); + } + } + // collect all hurt box + List<ColliderDescriptor> hurtboxes = ListPool<ColliderDescriptor>.Get(); + foreach (var collider in registry.colliders) + { + ColliderInfo[] boxes = collider.GetCurrentBoxesInfoByType(ColliderBox.EColliderType.HurtBox); + if (boxes == null || boxes.Length == 0) + continue; + for (int i = 0; i < boxes.Length; ++i) + { + ColliderDescriptor descriptor = new ColliderDescriptor(); + descriptor.colliderInfo = boxes[i]; + descriptor.unitCollider = collider; + hurtboxes.Add(descriptor); + } + } + + // solve + for(int i = 0; i < hitboxes.Count; ++ i) + { + ColliderDescriptor hitbox = hitboxes[i]; + for (int j = 0; j < hurtboxes.Count; ++j) + { + ColliderDescriptor hurtbox = hurtboxes[j]; + if (hitbox.unitCollider == hurtbox.unitCollider) + continue;
+ if (hitbox.unitCollider.owner.type == hurtbox.unitCollider.owner.type) + continue; + CollisionInfo collision = ColliderUtility.GetCollision(hitbox, hurtbox); + if (!collision.isCollision) + continue; + if (!hitbox.unitCollider.CanCollide(hitbox.colliderInfo.colliderHash, hurtbox.unitCollider.owner.GetHashCode())) + continue; + hitbox.unitCollider.RecordCollision(hitbox.colliderInfo.colliderHash, hurtbox.unitCollider.owner.GetHashCode()); + hitbox.unitCollider.owner.OnHit(collision); + hurtbox.unitCollider.owner.OnGetHit(collision); + } + } + + ListPool<ColliderDescriptor>.Release(hitboxes); + ListPool<ColliderDescriptor>.Release(hurtboxes); + }
+
+ void SolveProjectile()
+ {
+ // collect all hurt box
+ List<ColliderDescriptor> hurtboxes = ListPool<ColliderDescriptor>.Get();
+ foreach (var collider in registry.colliders)
+ {
+ ColliderInfo[] boxes = collider.GetCurrentBoxesInfoByType(ColliderBox.EColliderType.HurtBox);
+ if (boxes == null || boxes.Length == 0)
+ continue;
+ for (int i = 0; i < boxes.Length; ++i)
+ {
+ ColliderDescriptor descriptor = new ColliderDescriptor();
+ descriptor.colliderInfo = boxes[i];
+ descriptor.unitCollider = collider;
+ hurtboxes.Add(descriptor);
+ }
+ } +
+ foreach (var projectile in registry.projectiles)
+ {
+ if (projectile == null)
+ continue;
+ for(int i = 0; i < hurtboxes.Count; ++i)
+ {
+ ColliderDescriptor hurtCollider = hurtboxes[i];
+ if (hurtCollider.unitCollider == null)
+ continue;
+ if (projectile.owner == null || hurtCollider.unitCollider.owner == null || projectile.owner.type == hurtCollider.unitCollider.owner.type)
+ continue;
+ Box hurtbox = ColliderUtility.GetColliderInWorldSpace(hurtCollider);
+ foreach (var itor in projectile.GetCollidersInWorldSpace())
+ {
+ Box box = (Box)itor;
+ Box intersection = ColliderUtility.GetIntersection(box, hurtbox);
+ if (intersection.size.magnitude == 0)
+ continue;
+ if (!projectile.CanHit(hurtCollider.unitCollider.owner.GetHashCode()))
+ continue;
+ projectile.RecordTarget(hurtCollider.unitCollider.owner.GetHashCode());
+
+ CollisionInfo collision = new CollisionInfo();
+ collision.isCollision = true;
+ collision.intersection = intersection;
+ collision.collidee = hurtCollider;
+ hurtCollider.unitCollider.owner.OnGetShot(collision);
+ projectile.OnShot(collision);
+
+ goto next;
+ }
+ }
+ next:;
+ }
+ }
+
+ // throwbox <-> hurtbox
+ void SolveThrow() + { + + } + + // defendbox <-> hurtbox + void SolveDefend() + { + + } + + // blockbox <-> hitbox + void SolveBlock() + { + + } + + private void OnDrawGizmos()
+ {
+ } + +} + +public static class ColliderUtility
+{
+ public static CollisionInfo GetCollision(ColliderDescriptor collider, ColliderDescriptor collidee)
+ {
+ CollisionInfo collision = new CollisionInfo();
+ collision.collider = collider;
+ collision.collidee = collidee;
+ Box colliderBox = GetColliderInWorldSpace(collider);
+ Box collideeBox = GetColliderInWorldSpace(collidee);
+ Box intersection = GetIntersection(colliderBox, collideeBox);
+ collision.intersection = intersection;
+ collision.isCollision = intersection.size.magnitude != 0;
+ return collision;
+ }
+
+ public static Box GetColliderInWorldSpace(ColliderDescriptor collider)
+ {
+ Box box = new Box();
+ Vector3 fac = new Vector3(1, 1, collider.unitCollider.owner.transform.forward.normalized == Vector3.forward ? 1 : -1);
+ Vector3 unitPos = collider.unitCollider.owner.transform.position;
+ Vector3 pos = Vector3.zero; // gizmo位置
+ Vector3 localPos = collider.unitCollider.owner.transform.rotation * collider.colliderInfo.position;
+ Vector3 localSize = collider.colliderInfo.size;
+ var pivot = collider.colliderInfo.pivot;
+ switch (pivot)
+ {
+ case ColliderBox.Pivot.MiddleBottom:
+ localPos.y += localSize.y / 2;
+ break;
+ }
+ pos = unitPos + Vector3.Scale(localPos, fac);
+ box.center = pos;
+ box.size = localSize;
+ return box;
+ }
+
+ public static Box GetIntersection(Box b1, Box b2)
+ {
+ bool isIntersection = true;
+
+ float l1 = b1.center.x - b1.size.x / 2;
+ float r1 = b1.center.x + b1.size.x / 2;
+ float l2 = b2.center.x - b2.size.x / 2;
+ float r2 = b2.center.x + b2.size.x / 2;
+ isIntersection &= r1 >= l2 && l1 <= r2;
+
+ float o1 = b1.center.y - b1.size.y / 2;
+ float t1 = b1.center.y + b1.size.y / 2;
+ float o2 = b2.center.y - b2.size.y / 2;
+ float t2 = b2.center.y + b2.size.y / 2;
+ isIntersection &= t1 >= o2 && o1 <= t2;
+
+ float c1 = b1.center.z - b1.size.z / 2;
+ float f1 = b1.center.z + b1.size.z / 2;
+ float c2 = b2.center.z - b2.size.z / 2;
+ float f2 = b2.center.z + b2.size.z / 2;
+ isIntersection &= f1 >= c2 && c1 <= f2;
+
+ if(!isIntersection)
+ {
+ return new Box();
+ }
+
+ Box box = new Box();
+ float l = Mathf.Max(l1, l2);
+ float r = Mathf.Min(r1, r2);
+ float b = Mathf.Max(o1, o2);
+ float t = Mathf.Min(t1, t2);
+ float c = Mathf.Max(c1, c2);
+ float f = Mathf.Max(f1, f2);
+ box.center = new Vector3((l + r) / 2, (b + t) / 2, (c + f) / 2 );
+ box.size = new Vector3(r - l, t - b, f - c);
+ return box;
+ }
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs.meta b/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs.meta new file mode 100644 index 00000000..948c0ac7 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dc2cc9a83ab4066478ac795935406ee2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components.meta b/Erika/Assets/Scripts/Unit/Components.meta new file mode 100644 index 00000000..3d416e3a --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98e1c36fe676e0b4f8ea933e9619db82 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAfterImage.cs b/Erika/Assets/Scripts/Unit/Components/UnitAfterImage.cs new file mode 100644 index 00000000..622e87ba --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAfterImage.cs @@ -0,0 +1,43 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// Unit残影，通过复制avatar实现 + +public class AfterImageSpawner +{ + private float m_CurTime; + + private float m_Duration; + + public void OnUpdate() + { + float dt = Time.deltaTime; + m_CurTime += dt; + + + } + +} + +[DisallowMultipleComponent] +public class UnitAfterImage : UnitComponent +{ + + private List<AfterImageSpawner> m_Spawners; + + public override void OnUpdate() + { + base.OnUpdate(); + + if(m_Spawners != null) + { + for(int i = 0; i < m_Spawners.Count; ++i) + { + m_Spawners[i].OnUpdate(); + } + } + + } + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAfterImage.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitAfterImage.cs.meta new file mode 100644 index 00000000..21cdf37f --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAfterImage.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 567816c152acc834f9bd41efec9ee51c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation.meta b/Erika/Assets/Scripts/Unit/Components/UnitAnimation.meta new file mode 100644 index 00000000..580176c0 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21e3b4128e398d745a22f45d6268b4c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/DroneAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/DroneAnimation.cs new file mode 100644 index 00000000..29caab7b --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/DroneAnimation.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DroneAnimation : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/DroneAnimation.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/DroneAnimation.cs.meta new file mode 100644 index 00000000..219b76ff --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/DroneAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 352eb281e97bf67499a8a85ab013f0f0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs new file mode 100644 index 00000000..ee111f73 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs @@ -0,0 +1,128 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MonsterAnimation : UnitAnimation +{ + public enum ELayer + { + Basic = 0, + + Count, + } + + // 动作名，和animator里的state对应 + public enum EAnimState + { + // layer 0 + Idle = 0, + Move, + Jump, + + HitLight, + HitAir, + HitInAir, + HitBackHeavy, +
+ Rise, + } + + public override void Initialize() + { + base.Initialize(); + + m_Animator = this.m_Owner.unitObj.GetComponent<Animator>(); + + m_Animator.speed = 0; + + m_LayerInfo = new AnimatorLayerInfo[2]; + m_LayerInfo[0] = new AnimatorLayerInfo(this, m_Animator, (int)ELayer.Basic); + //m_LayerInfo[1] = new AnimatorLayerInfo(this, m_Animator, ELayer.Attack); + + if (m_Animator == null) + { + LogHelper.LogError("没有挂Animator组件"); + } + + } + + public override void OnUpdate() + { + base.OnUpdate(); + + UpdateLayer(); + UpdateAnimation(); + UpdateRootMotion(); + } + + void UpdateLayer() + { + m_LayerInfo[0].OnUpdate(); + return; + for (int i = 0; i < m_LayerInfo.Length; ++i) + { + m_LayerInfo[i].OnUpdate(); + } + } + + void UpdateAnimation() + { + m_Animator.speed = 1; + m_Animator.Update(Time.deltaTime); + m_Animator.speed = 0; + } + + void UpdateRootMotion() + { + m_Owner.unitRootMotion.UpdateRootMotion(); + } + + public void AnimIdle() + { + this.CrossFade(EAnimState.Idle, 0.2f, 0); + } + + public void AnimHitLight() + { + this.Play(EAnimState.HitLight, 0, 0); + //m_Animator.CrossFade("HitLight", 0.05f, 0, 0, 0); + } + + public void AnimHitAir() + { + this.Play(EAnimState.HitAir, 0, 0); + //m_Animator.CrossFade("HitLight", 0.05f, 0, 0, 0); + } + + public void AnimHitInAir()
+ {
+ this.Play(EAnimState.HitInAir, 0, 0); + } + + public void AnimHitBackHeavy()
+ {
+ this.Play(EAnimState.HitBackHeavy, 0, 0); + } + + public void AnimRise() + { + this.CrossFade(EAnimState.Rise, 0); + } + + private void Play(EAnimState animState, int layerIndex = 0, float normalizedTime = float.NegativeInfinity) + { + AnimatorLayerInfo layer = this.layers[layerIndex]; + if (layer == null) + return; + layer.OnPlay(animState.ToString(), normalizedTime); + } + + public void CrossFade(EAnimState animState, float normalizedTransitionDuration, int layerIndex = 0, float normalizedTimeOffset = float.NegativeInfinity, float normalizedTransitionTime = 0.0f) + { + AnimatorLayerInfo layer = this.layers[layerIndex]; + if (layer == null) + return; + layer.OnCrossFade(animState.ToString(), normalizedTransitionDuration, normalizedTimeOffset, normalizedTransitionTime); + } + +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs.meta new file mode 100644 index 00000000..448e6a1a --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cfaa5c94122a41d4f8fa844112514102 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs new file mode 100644 index 00000000..f80a8312 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs @@ -0,0 +1,255 @@ +#define ANIM_CROSS_FADE +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PCAnimation : UnitAnimation +{ + +#if !ANIM_CROSS_FADE + // 切换动画 + public enum ETrigger + { + ToIdle, + ToMove, + ToJump, + ToAttack, + ToAirAttack, + ToLanding, + } +#endif + + public enum ELayer + { + Basic = 0, + Attack, + SwordAttack, + GunAttack, + UpperBody, + LowerBody, + Count, + } + + + // 动作名，和animator里的state对应 + public enum EAnimState + { + // layer 0 + Idle = 0, + Move, + Jump, + Hit, + Attack, + Rise, + Stinger, + Turn, + Landing, + + Attack0, + Attack1, + Attack2, + Attack3,
+
+ AttackToAir,
+
+ AirAttack0, + AirAttack1, + AirAttack2, + AirAttack3,
+ AirAttack4,
+
+ AirDash, + + LandingGround, + } + + public override AnimatorLayerInfo baseLayer
+ {
+ get { return layers[(int)ELayer.Basic]; }
+ } + + private UnitActionData m_ActionData; + + public bool applyRootMotion { get; set; } + public bool applyRootCurve { get; set; } // 程序生成的root motion + + public bool updateAnimationAuto { get; private set; } // 自动更新动画 + + private AnimatorOverrideController controller
+ {
+ get
+ {
+ Debug.Assert(owner.unitAnimation.animator.runtimeAnimatorController is AnimatorOverrideController);
+ return owner.unitAnimation.animator.runtimeAnimatorController as AnimatorOverrideController;
+ }
+ } + + public override void Initialize() + { + base.Initialize(); + + m_Animator = this.m_Owner.unitObj.GetComponent<Animator>(); + + m_Animator.speed = 0; + + m_LayerInfo = new AnimatorLayerInfo[2]; + m_LayerInfo[0] = new AnimatorLayerInfo(this, m_Animator, (int)ELayer.Basic); + //m_LayerInfo[1] = new AnimatorLayerInfo(this, m_Animator, ELayer.Attack); + + if (m_Animator == null) + { + LogHelper.LogError("没有挂Animator组件"); + } + + applyRootMotion = true; + + updateAnimationAuto = true; + } + + public override void OnUpdate() + { + base.OnUpdate(); + + UpdateLayer(); + UpdateAnimation(); + UpdateRootMotion(); + UpdateRootCurve(); + } + + void UpdateLayer() + { + m_LayerInfo[0].OnUpdate(); + return; + for (int i = 0; i < m_LayerInfo.Length; ++i) + { + m_LayerInfo[i].OnUpdate(); + } + } + + void UpdateAnimation() + { + if(updateAnimationAuto)
+ {
+ m_Animator.speed = 1;
+ m_Animator.Update(Time.deltaTime);
+ m_Animator.speed = 0; + }
+ } + + void UpdateRootMotion() + { + if (!applyRootMotion) + return; + + m_Owner.unitRootMotion.UpdateRootMotion(); + } + + void UpdateRootCurve() + { + if (!applyRootCurve) + return; + }
+
+ AnimationData GetAnimationDataOfState(string name)
+ {
+ string animName = controller[name].name;
+ string path = owner.folder + "AnimationData/" + animName + ".asset";
+ AnimationData data = ResourceManager.Instance.LoadAsset<AnimationData>(path);
+ return data;
+ }
+
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+ public void AnimIdle() + { + CrossFade(EAnimState.Idle, 0.2f, 0); + } + + public void AnimMove() + { + CrossFade(EAnimState.Move, 0.01f, 0); + } + + public void AnimJump() + { + CrossFade(EAnimState.Jump, 0.01f); + } + + public void AnimAirAttack(int id) + { + m_Owner.unitCollider.OnAnimationChange(); + EAnimState state = EAnimState.AirAttack0; + if (id == 1) state = EAnimState.AirAttack1; + else if (id == 2) state = EAnimState.AirAttack2; + else if (id == 3) state = EAnimState.AirAttack3;
+ else if (id == 4) state = EAnimState.AirAttack4;
+
+ AnimationData data = GetAnimationDataOfState(state.ToString());
+ Debug.Assert(data != null);
+ float offset = data.GetProperty(EAnimationProperty.ComboTimeOffset, 0);
+ float duration = data.GetProperty(EAnimationProperty.TransitionInDuration, 0.1f);
+ CrossFade(state, duration, offset); + } + + public void AnimAttackToAir(float offset)
+ {
+ m_Owner.unitCollider.OnAnimationChange();
+ Play(EAnimState.AttackToAir, offset);
+ } +
+ public void AnimAttack(int id) + { + m_Owner.unitCollider.OnAnimationChange(); + switch (id) + { + case 0: + CrossFade(EAnimState.Attack0, 0.02f); + break; + case 1: + CrossFade(EAnimState.Attack1, 0.02f); + break; + case 2: + CrossFade(EAnimState.Attack2, 0.02f); + break; + case 3: + CrossFade(EAnimState.Attack3, 0.02f); + break; + } + } + + public void AnimAirDash() + { + AnimationData data = GetAnimationDataOfState(EAnimState.AirDash.ToString()); + if (baseLayer.stateInfo.IsName(EAnimState.AirDash.ToString())) + { + float offset = data.GetProperty(EAnimationProperty.ComboTimeOffset, 0); + this.Play(EAnimState.AirDash, offset); + } + else + { + CrossFade(EAnimState.AirDash, 0.02f); + } + } + + public void AnimLanding() + { + CrossFade(EAnimState.Landing, 0.05f); + } + + public void AnimLandingGround() + { + CrossFade(EAnimState.LandingGround, 0.00f); + } + + private void Play(EAnimState animState, float normalizedTime = float.NegativeInfinity, int layerIndex = 0) + { + base.Play(animState.ToString(), layerIndex, normalizedTime); + } + + private void CrossFade(EAnimState animState, float normalizedTransitionDuration, float normalizedTimeOffset = float.NegativeInfinity, float normalizedTransitionTime = 0.0f, int layerIndex = 0) + { + base.CrossFade(animState.ToString(), normalizedTransitionDuration, layerIndex, normalizedTimeOffset, normalizedTransitionTime); + } + +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs.meta new file mode 100644 index 00000000..6999e268 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f844378e1edf4b249b3b2f9a8e4a6842 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/RobotAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/RobotAnimation.cs new file mode 100644 index 00000000..a25f453e --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/RobotAnimation.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RobotAnimation : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/RobotAnimation.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/RobotAnimation.cs.meta new file mode 100644 index 00000000..f1cbe366 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/RobotAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1f127e594317b84478999dccd109e5bf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs new file mode 100644 index 00000000..1d407fc2 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs @@ -0,0 +1,302 @@ +#define ANIM_CROSS_FADE +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +#if UNITY_EDITOR +using UnityEditor; +#endif + +// 单独一层动画 +public class AnimatorLayerInfo +{ + public int layer; + + public int layerIndex { get { return (int)layer; } } + + public string name { get { return m_Animator.GetLayerName(layerIndex); } } + + public bool isBaseLayer { get { return layerIndex == 0; } } + + private Animator m_Animator; + + // 当前动作的animation data，如果是blendtree选第一个动作 + private AnimationData m_AnimationData; + public AnimationData animationData + { + get + { + AnimatorClipInfo[] clipInfos = clipsInfo; + if (clipInfos == null || clipInfos.Length == 0) + return null; + var clip = clipInfos[0]; //选第一个 + string folder = m_UnitAnimation.owner.folder; + string name = clip.clip.name; + if (m_AnimationData != null && m_AnimationData.animationName == name) + return m_AnimationData; + string path = folder + "AnimationData/" + name + ".asset" ; // 要注意这里使用名字区别的，因为最终每个角色的动画都会在一个目录下面 + m_AnimationData = ResourceManager.Instance.LoadAsset<AnimationData>(path); + return m_AnimationData; + } + } + + // 当前在播放的动作 + // 如果处于transition中，认为当前状态是transition的目标状态（和Animator规则不一样） + public AnimatorStateInfo stateInfo + { + get + { + AnimatorStateInfo stateInfo = m_Animator.GetCurrentAnimatorStateInfo(layerIndex); + if (isInTransition) // 过渡中的动作认为当前动作是下一个动作 + { + stateInfo = m_Animator.GetNextAnimatorStateInfo(layerIndex); + } + // Debug.Assert(stateInfo.IsName(layerName + "." + m_CurrentState)); + return stateInfo; + } + } + + private int preStateHash = -1; + + // 当前正在播放和融合的片段信息 + public AnimatorClipInfo[] clipsInfo + { + get + { + AnimatorClipInfo[] clips = null; + if (!isInTransition)
+ {
+ clips = m_Animator.GetCurrentAnimatorClipInfo(layerIndex);
+ if (clips.Length == 0)
+ {
+ clips = m_Animator.GetNextAnimatorClipInfo(layerIndex);
+ } + } + else // 过渡中的动作认为当前动作是下一个动作
+ {
+ clips = m_Animator.GetNextAnimatorClipInfo(layerIndex);
+ } + return clips; + } + } + + public AnimatorClipInfo clipInfo
+ {
+ get
+ {
+ return clipsInfo[0];
+ }
+ } + + public int stateHash + { + get + { + return stateInfo.shortNameHash; + } + } + + // 并非准确的播放时间，只是逻辑时间，因为动画会加速减速 + public float playbackTimeInSeconds + { + get + { + return playbackNormalizedTime * clipInfo.clip.length; + } + } + + // 这个是真实世界的时间 + private float m_PlaybackRealTime; + public float playbackRealTimeInSeconds + { + get + { + return m_PlaybackRealTime; + } + } + + // 播放进度百分比，[0-1]，是逻辑上的，如果动画不是loop，那么播放完后normalizedTime是1 + public float playbackNormalizedTime + { + get + { + AnimatorStateInfo state = stateInfo; + if (!state.loop && state.normalizedTime > 1) + return 1; + //if (state.IsName("Attack0"))
+ //{
+ // Debug.Log("normalizedTime=" + state.normalizedTime); + // Debug.Log("playbackTimeInSeconds=" + state.normalizedTime * clipInfo.clip.length); + //} + return state.normalizedTime % 1f; + } + } + + public float playbackSpeed + { + get + { + return m_Animator.GetFloat("PlaybackSpeed" + layerIndex); + } + set + { + float v = Mathf.Clamp(value, 0, 10); + m_Animator.SetFloat("PlaybackSpeed" + layerIndex, v); + } + } + + public float weight + { + get + { + return m_Animator.GetLayerWeight(layerIndex); + } + } + + public int nextStateHash + { + get + { + AnimatorStateInfo nextState = m_Animator.GetNextAnimatorStateInfo(layerIndex); + int hash = nextState.shortNameHash; // 如果不在过渡中，hash是0 + return hash; + } + } + + public bool isInTransition + { + get + { + return m_Animator.IsInTransition(layerIndex); + } + } + + public bool applySpeedCurve { get; set; } + + UnitAnimation m_UnitAnimation; + + Coroutine m_CalcPlaybackTimeCoroutine; + + TimelineEventProxy m_TimelineEventProxy; + + public string m_CurrentState; + + public AnimatorLayerInfo(UnitAnimation unitAnimation, Animator animator, int layer) + { + this.m_UnitAnimation = unitAnimation; + this.m_Animator = animator; + this.layer = layer; + m_CalcPlaybackTimeCoroutine = unitAnimation.StartCoroutine(CalcPlaybackRealTimeCoroutine()); + m_TimelineEventProxy = new TimelineEventProxy(unitAnimation.owner); + applySpeedCurve = true; + } + + IEnumerator CalcPlaybackRealTimeCoroutine() + { + while (true) + { + if(preStateHash != stateHash) + { + m_PlaybackRealTime = 0; + } + m_PlaybackRealTime += Time.deltaTime; + preStateHash = stateHash; + yield return null; + } + } + + public bool IsToggleOpen(EAnimationToogle toggle) + { + if (m_AnimationData == null) + return false; + return m_AnimationData.IsToggleOpen(toggle, playbackNormalizedTime); + } + + public void OnUpdate() + { + // 执行事件 + m_TimelineEventProxy.ExecuteAnimationEvents(animationData, playbackTimeInSeconds * TimelineEventProxy.FPS); + + // 播放速度控制 + if (applySpeedCurve && animationData != null && animationData.speedCurve != null) + { + playbackSpeed = animationData.speedCurve.Evaluate(playbackNormalizedTime); + } + } + + public void OnCrossFade(string animState, float normalizedTransitionDuration, float normalizedTimeOffset, float normalizedTransitionTime ) + { + m_CurrentState = animState;
+ m_Animator.CrossFade(animState.ToString(), normalizedTransitionDuration, layerIndex, normalizedTimeOffset, normalizedTransitionTime);
+ m_TimelineEventProxy.ResetPrevAnimationData();
+
+ playbackSpeed = 1;
+ }
+
+ public void OnPlay(string animState, float normalizedTime) + { + m_CurrentState = animState; + m_Animator.Play(animState, layerIndex, normalizedTime); + m_TimelineEventProxy.ResetPrevAnimationData();
+
+ playbackSpeed = 1;
+ } + +} + +[DisallowMultipleComponent] +public class UnitAnimation : UnitComponent +{ + public AnimatorLayerInfo[] layers { get { return m_LayerInfo; } } + protected AnimatorLayerInfo[] m_LayerInfo; + + public Animator animator { get { return m_Animator; } } + protected Animator m_Animator;
+
+ public virtual AnimatorLayerInfo baseLayer
+ {
+ get { return layers[0]; }
+ } + + public bool isInTransition + { + get + { + return m_Animator.IsInTransition(0); + } + }
+
+ public override void OnUpdate()
+ {
+ base.OnUpdate();
+ }
+
+ public void Play(string animState, int layerIndex = 0, float normalizedTime = float.NegativeInfinity) + {
+ AnimatorLayerInfo layer = this.layers[layerIndex];
+ if (layer == null)
+ return;
+ layer.OnPlay(animState, normalizedTime);
+
+ UnitRootMotion rm = m_Owner.GetComponent<UnitRootMotion>();
+ if(rm)
+ {
+ rm.OnAnimationChange();
+ }
+ }
+
+ public void CrossFade(string animState, float normalizedTransitionDuration, int layerIndex = 0, float normalizedTimeOffset = float.NegativeInfinity, float normalizedTransitionTime = 0.0f)
+ {
+ AnimatorLayerInfo layer = this.layers[layerIndex];
+ if (layer == null)
+ return;
+ layer.OnCrossFade(animState, normalizedTransitionDuration, normalizedTimeOffset, normalizedTransitionTime);
+
+ UnitRootMotion rm = m_Owner.GetComponent<UnitRootMotion>();
+ if (rm)
+ {
+ rm.OnAnimationChange();
+ }
+ } + +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs.meta new file mode 100644 index 00000000..75ce33fe --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4af875f33239ebf409f3e4954c0ee0cb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitBody.cs b/Erika/Assets/Scripts/Unit/Components/UnitBody.cs new file mode 100644 index 00000000..cc7ac348 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitBody.cs @@ -0,0 +1,27 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UnitBody : UnitComponent
+{
+ public override void Initialize()
+ {
+ base.Initialize();
+ }
+
+ public override void OnUpdate()
+ {
+ base.OnUpdate();
+ }
+
+ public override void OnDestroy()
+ {
+ base.OnDestroy();
+ }
+
+ public void OnLateAnimatorUpdate()
+ {
+
+ }
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitBody.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitBody.cs.meta new file mode 100644 index 00000000..01a2d416 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitBody.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d90e40c0e85fa474ba6282bcb5bab16b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs b/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs new file mode 100644 index 00000000..3fd9a6dc --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs @@ -0,0 +1,123 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// 角色当前的碰撞盒 +[DisallowMultipleComponent] +public class UnitCollider : UnitComponent +{ + public bool showGizmos; + + private Dictionary<int/*hitbox hash*/, List<int/*unitController hash*/>> m_HitMask = new Dictionary<int, List<int>>(); + + public override void Awake() + { + base.Awake(); + + ColliderRegistry.Instance.AddCollider(this); + } + + public override void OnDestroy() + { + ColliderRegistry.Instance.RemoveCollider(this); + + base.OnDestroy(); + } + + public override void Initialize() + { + base.Initialize(); + showGizmos = true; + } + + // 返回当前激活的对应类型的碰撞盒数据 + public ColliderInfo[] GetCurrentBoxesInfoByType(ColliderBox.EColliderType type, int layer = 0) + { + var layerInfo = m_Owner.unitAnimation.layers[0]; + AnimationData animData = layerInfo.animationData; + AnimatorClipInfo[] clipInfos = layerInfo.clipsInfo; + //if(clipInfos == null || clipInfos.Length == 0) + //{ + // return null; + //} + float playbackTime = layerInfo.playbackNormalizedTime * clipInfos[0].clip.length; + //float playbackTime = layerInfo.playbackRealTimeInSeconds; + ColliderInfo[] infos = animData.GetActiveCollidersInfo(type, playbackTime); + return infos; + } + + // 动作切换，重置collider mask + public void OnAnimationChange() + { + m_HitMask.Clear(); + } + + public void RecordCollision(int colliderHash, int targetHash) + { + List<int> record; + if (!m_HitMask.TryGetValue(colliderHash, out record)) + { + record = new List<int>(); + m_HitMask.Add(colliderHash, record); + } + record.Add(targetHash); + } + + public bool CanCollide(int colliderHash, int targetHash) + { + List<int> record; + if(!m_HitMask.TryGetValue(colliderHash, out record)) + { + return true; + } + return !record.Contains(targetHash); + } + +#if UNITY_EDITOR + + // 绘制collider调试 + public void OnDrawGizmos() + { + if (!showGizmos) + return; + + Vector3 unitPos = m_Owner.transform.position; + + OnDrawColliders(ColliderBox.EColliderType.HurtBox, Color.green); + OnDrawColliders(ColliderBox.EColliderType.HitBox, Color.red); + } + + void OnDrawColliders(ColliderBox.EColliderType type, Color color) + { + ColliderInfo[] boxes = GetCurrentBoxesInfoByType(type); + if (boxes == null || boxes.Length == 0) + return; + Vector3 unitPos = m_Owner.transform.position; + Quaternion right = Quaternion.Euler(0, 0, 0); + Vector3 fac = new Vector3(1,1, m_Owner.transform.forward.normalized == Vector3.forward ? 1 : -1); + Color oldC = Gizmos.color; + Gizmos.color = color * 0.5f; + for (int i = 0; i < boxes.Length; ++i) + { + var box = boxes[i]; + if (!box.isValid) + continue; + Vector3 localPos = m_Owner.transform.rotation * box.position; + Vector3 localSize = box.size; + var pivot = box.pivot; + Vector3 pos = Vector3.zero; // gizmo位置 + switch (pivot) + { + case ColliderBox.Pivot.MiddleBottom: + localPos.y += localSize.y / 2; + break; + } + pos = unitPos + Vector3.Scale(localPos, fac); + Gizmos.DrawCube(pos, localSize); + } + Gizmos.color = oldC; + } + +#endif + +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs.meta new file mode 100644 index 00000000..fa98ddc9 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1a4f3dea33ad590458ab820a086a8be3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitComponent.cs b/Erika/Assets/Scripts/Unit/Components/UnitComponent.cs new file mode 100644 index 00000000..825b6d92 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitComponent.cs @@ -0,0 +1,46 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UnitComponent : MonoBehaviour +{ + public UnitController owner { get { return m_Owner; } } + + protected UnitController m_Owner; + + public bool IsAlive + { + get + { + return m_Owner != null; + } + } + + public virtual void Awake() + { + } + + public virtual void OnDestroy() + { + } + + public virtual void Initialize() + { + m_Owner = GetComponent<UnitController>(); + } + + public virtual void OnPostInitialize() + { + } + + public virtual void Release() + { + m_Owner = null; + StopAllCoroutines(); + } + + public virtual void OnUpdate() { } + + private void Update() { } + +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitComponent.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitComponent.cs.meta new file mode 100644 index 00000000..2641a06f --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4c2f1fe7707e5364aab4ddc6a962bb6e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitImageEffect.cs b/Erika/Assets/Scripts/Unit/Components/UnitImageEffect.cs new file mode 100644 index 00000000..fcdd5c1f --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitImageEffect.cs @@ -0,0 +1,202 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine;
+
+// Unit的一种后处理效果，渲染到一个RT上，对这个RT做效果
+
+public class UnitImageEffectHolder +{ + public float size; + public GameObject gameObject; + public MeshRenderer renderer + { + get + { + if (gameObject == null) + return null; + return gameObject.GetComponent<MeshRenderer>(); + } + } +} + +public class UnitImageEffectHandle +{ + public delegate void UnitImageEffectStepCallback(float normalizedTime);
+ public delegate void UnitImageEffectEndCallback();
+
+ public float lifeTime; + public float curTime; + public UnitImageEffectHolder holder; + + public UnitImageEffectStepCallback stepFunc; + public UnitImageEffectEndCallback onStop; +} + +public class UnitImageEffect : UnitComponent +{ + public List<UnitImageEffectHandle> effects = new List<UnitImageEffectHandle>(); + + public static GameObject effectPlane; + + private Dictionary<float/*size*/, List<UnitImageEffectHolder>/*pool*/> m_HolderPool = new Dictionary<float, List<UnitImageEffectHolder>>(); + + private ObjectPool<UnitImageEffectHandle> m_HandlePool = new ObjectPool<UnitImageEffectHandle>(null, null); + + public override void OnUpdate() + { + base.OnUpdate(); + List<UnitImageEffectHandle> temp = ListPool<UnitImageEffectHandle>.Get(); + for(int i = 0; i < effects.Count; ++i) + { + var handle = effects[i]; + handle.curTime += Time.deltaTime; + if(handle.curTime > handle.lifeTime) + { + temp.Add(handle); + handle.onStop?.Invoke(); + continue; + } + handle.stepFunc?.Invoke(handle.curTime / handle.lifeTime); + } + for(int j = 0; j < temp.Count; j++) + { + temp[j].holder.gameObject.SetActive(false); + ReleaseHolder(ref temp[j].holder); + effects.Remove(temp[j]); + m_HandlePool.Release(temp[j]); + } + ListPool<UnitImageEffectHandle>.Release(temp); + } + + UnitImageEffectHolder ClaimHolder(float size) + { + List<UnitImageEffectHolder> holders; + if (m_HolderPool.TryGetValue(size, out holders)) + { + if (holders.Count > 0) + { + var holder = holders[holders.Count - 1]; + holders.RemoveAt(holders.Count - 1); + return holder; + } + } + UnitImageEffectHolder newHolder = new UnitImageEffectHolder(); + newHolder.size = size; + Mesh mesh = new Mesh(); + mesh.vertices = new Vector3[4] { + new Vector3(-size/2, size/2, 0), + new Vector3(size/2, size/2, 0), + new Vector3(size/2, -size/2, 0), + new Vector3(-size/2, -size/2, 0) + }; + mesh.uv = new Vector2[4] { + new Vector2(0, 1), + new Vector2(1, 1), + new Vector2(1, 0), + new Vector2(0, 0), + }; + mesh.triangles = new int[6] { + 0, 1, 3, + 1, 2, 3, + }; + mesh.UploadMeshData(true); + newHolder.gameObject = new GameObject("Image Effect Holder(" + size + "m)"); + MeshFilter filter = newHolder.gameObject.AddComponent<MeshFilter>(); + filter.sharedMesh = mesh; + MeshRenderer renderer = newHolder.gameObject.AddComponent<MeshRenderer>(); + renderer.lightProbeUsage = UnityEngine.Rendering.LightProbeUsage.Off; + renderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off; + renderer.receiveShadows = false; + renderer.reflectionProbeUsage = UnityEngine.Rendering.ReflectionProbeUsage.Off; + renderer.motionVectorGenerationMode = MotionVectorGenerationMode.ForceNoMotion; + renderer.allowOcclusionWhenDynamic = false; + return newHolder; + } + + void ReleaseHolder(ref UnitImageEffectHolder holder) + { + float size = holder.size; + List<UnitImageEffectHolder> holders; + if (!m_HolderPool.TryGetValue(size, out holders)) + { + holders = new List<UnitImageEffectHolder>(); + m_HolderPool.Add(size, holders); + } + holder.gameObject.SetActive(false); + 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(); + + handle.lifeTime = lifeTime; + handle.curTime = 0; + float size = UnitManager.Instance.pc.unitDetail.snapshotBound; + handle.holder = ClaimHolder(size); + handle.holder.gameObject.SetActive(true); + string matPath = StaticDefine.imageEffectMaterails[EImageEffectMaterails.MotionBlur]; + handle.holder.renderer.sharedMaterial = ResourceManager.Instance.LoadAsset<Material>(matPath); + + MaterialPropertyBlock block = new MaterialPropertyBlock(); + handle.holder.renderer.GetPropertyBlock(block); + block.SetFloat("_Angle", angle); + block.SetFloat("_Distance", distance); + handle.holder.renderer.SetPropertyBlock(block); + + handle.stepFunc = (float normalTime) => + { + handle.holder.gameObject.transform.position = UnitManager.Instance.pc.center; + + handle.holder.renderer.GetPropertyBlock(block); + block.SetFloat("_Distance", /*(normalTime) * */distance); + handle.holder.renderer.SetPropertyBlock(block); + }; + + effects.Add(handle); + } + + public void ShowGlitch(float lifeTime, bool hideUnitInMainCamera = true) + { + PCController pc = UnitManager.Instance.pc as PCController;
+
+ UnitImageEffectHandle handle = m_HandlePool.Get(); + + handle.lifeTime = lifeTime; + handle.curTime = 0; + float size = UnitManager.Instance.pc.unitDetail.snapshotBound; + handle.holder = ClaimHolder(size); + handle.holder.gameObject.SetActive(true); + string matPath = StaticDefine.imageEffectMaterails[EImageEffectMaterails.Glitch]; + handle.holder.renderer.sharedMaterial = ResourceManager.Instance.LoadAsset<Material>(matPath); + + MaterialPropertyBlock block = new MaterialPropertyBlock(); + handle.holder.renderer.GetPropertyBlock(block); + handle.holder.renderer.SetPropertyBlock(block); + + handle.stepFunc = (float normalTime) => { + UnitCamera.Instance.Render(); + + handle.holder.gameObject.transform.position = UnitManager.Instance.pc.center; + + handle.holder.renderer.GetPropertyBlock(block); + handle.holder.renderer.SetPropertyBlock(block); + }; + + if (hideUnitInMainCamera)
+ {
+ pc.unitRender.SetVisibilityInAllCameras(false);
+ } + + handle.onStop = () => {
+ pc.unitRender.SetVisibilityInAllCameras(true);
+ };
+
+ effects.Add(handle); + } + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Components/UnitImageEffect.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitImageEffect.cs.meta new file mode 100644 index 00000000..32f7eebc --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitImageEffect.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: af35b46f81aa698408be0540784f808d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitLensEffect.cs b/Erika/Assets/Scripts/Unit/Components/UnitLensEffect.cs new file mode 100644 index 00000000..e145c331 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitLensEffect.cs @@ -0,0 +1,234 @@ +using System; +using System.Reflection; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; + +// Unit效果之一，镜头效果，通过command buffer实现 + +public partial class UnitLensEffect : UnitComponent +{
+ private List<RendererProxy> renderers;
+
+ private static ObjectPool<CommandBuffer> m_CommandBufferPool;
+
+ private List<LensEffectBase> m_Effects; + + // 每个角色维护单独的command buffers，而不是共享command buffer。有一定开销，但不重要。 + private Dictionary<ERenderingEvent, CommandBuffer> m_InUseCommandBuffers;
+ private Dictionary<ERenderingEvent, CommandBuffer> m_CachedCommandBuffers;
+
+ static UnitLensEffect()
+ {
+ m_CommandBufferPool = new ObjectPool<CommandBuffer>(null, null);
+ }
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ renderers = new List<RendererProxy>();
+ m_Effects = new List<LensEffectBase>(); + m_InUseCommandBuffers = new Dictionary<ERenderingEvent, CommandBuffer>(); + m_CachedCommandBuffers = new Dictionary<ERenderingEvent, CommandBuffer>(); + }
+
+ public override void OnUpdate()
+ {
+ base.OnUpdate();
+
+ }
+
+ 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 = OnWillRenderObj;
+ proxy.onRenderObject = OnRenderObj;
+ renderers.Add(proxy);
+ }
+
+ MainCamera.Instance.customRenderingPipeline.onPreCull += OnWillRenderUnit;
+ MainCamera.Instance.customRenderingPipeline.onPostRender += OnRenderUnit;
+
+ /////
+ //m_Effects.Add(new LensEffect_MotionBlur());
+ //m_Effects.Add(new LensEffect_BlurRim(Color.blue));
+ //m_Effects.Add(new LensEffect_Buzz());
+ }
+
+ public override void Release()
+ {
+ MainCamera.Instance.customRenderingPipeline.onPreCull -= OnWillRenderUnit;
+ MainCamera.Instance.customRenderingPipeline.onPostRender -= OnRenderUnit;
+
+ base.Release();
+ }
+
+ private void OnWillRenderUnit()
+ { + if (m_Effects == null || m_Effects.Count == 0) + return; + + PrepareCommandBuffers(); +
+ IBodyRendererAgent body = owner.unitRender.body;
+ if (body == null || body.renderers == null)
+ return;
+ if (m_Effects == null || m_Effects.Count == 0)
+ return;
+ foreach (var cb in m_InUseCommandBuffers)
+ {
+ cb.Value.Clear();
+ ERenderingEvent re = cb.Key;
+ CameraEvent ce = re.ToCameraEvent();
+ for (int i = 0; i < m_Effects.Count; ++i)
+ {
+ LensEffectBase eff = m_Effects[i];
+ if (!eff.renderingEvents.HasFlag(re))
+ continue;
+ MethodInfo method = eff.GetType().GetMethod(re.ToString(), BindingFlags.Instance | BindingFlags.Public, null, new Type[] { typeof(LensEffectBase.EStage), typeof(CommandBuffer) }, null);
+ if (method == null)
+ continue;
+ eff.owner = owner;
+ method.Invoke(eff, new object[] { LensEffectBase.EStage.BeforeIterate, cb.Value });
+
+ // iterate unit renderers
+ for (int j = 0; j < body.renderers.Length; ++j)
+ {
+ var renderer = body.renderers[j];
+ if (renderer == null)
+ continue;
+ eff.curBodypartRenderer = renderer;
+ method.Invoke(eff, new object[] { LensEffectBase.EStage.Iterate, cb.Value });
+ }
+
+ method.Invoke(eff, new object[] { LensEffectBase.EStage.AfterIterate, cb.Value });
+ } + MainCamera.Instance.camera.AddCommandBuffer(ce, cb.Value); + }
+ }
+
+ private void OnRenderUnit()
+ { + if (m_Effects == null || m_Effects.Count == 0) + return;
+
+ // 执行每个event的finisher
+ foreach (var cb in m_InUseCommandBuffers)
+ {
+ ERenderingEvent re = cb.Key;
+ for (int i = 0; i < m_Effects.Count; ++i)
+ {
+ LensEffectBase eff = m_Effects[i];
+ if (!eff.renderingEvents.HasFlag(re))
+ continue;
+ MethodInfo method = eff.GetType().GetMethod(re.ToString(), BindingFlags.Instance | BindingFlags.Public, null, new Type[] { typeof(LensEffectBase.EStage), typeof(CommandBuffer) }, null);
+ if (method == null)
+ continue;
+ method.Invoke(eff, new object[] { LensEffectBase.EStage.FinishRender, cb.Value });
+ }
+ }
+
+ List<LensEffectBase> temp = ListPool<LensEffectBase>.Get();
+
+ for (int i = 0; i < m_Effects.Count; ++i)
+ {
+ LensEffectBase eff = m_Effects[i];
+ eff.OnRenderFinish();
+ if (eff.CanDestroy())
+ temp.Add(eff);
+ }
+
+ for (int i = 0; i < temp.Count; ++i)
+ {
+ temp[i].OnDestroy();
+ m_Effects.Remove(temp[i]);
+ }
+
+ ListPool<LensEffectBase>.Release(temp);
+
+ foreach (var cb in m_InUseCommandBuffers)
+ {
+ CameraEvent ce = cb.Key.ToCameraEvent();
+ MainCamera.Instance.camera.RemoveCommandBuffer(ce, cb.Value); + }
+ }
+
+ private void OnWillRenderObj(BodyPartRenderer renderer)
+ {
+ }
+
+ private void OnRenderObj(BodyPartRenderer renderer)
+ {
+ } + + void PrepareCommandBuffers()
+ {
+ if (m_InUseCommandBuffers.Count != 0)
+ {
+ var temp = m_CachedCommandBuffers;
+ m_CachedCommandBuffers = m_InUseCommandBuffers;
+ m_InUseCommandBuffers = temp;
+ }
+ ERenderingEvent usedEvent = ERenderingEvent.None; + for (int i = 0; i < m_Effects.Count; ++i)
+ {
+ usedEvent |= m_Effects[i].renderingEvents;
+ }
+ foreach (ERenderingEvent evt in Enum.GetValues(typeof(ERenderingEvent)))
+ {
+ if (evt == ERenderingEvent.None)
+ continue;
+ if (usedEvent.HasFlag(evt))
+ {
+ CommandBuffer cb;
+ if (m_CachedCommandBuffers.TryGetValue(evt, out cb))
+ {
+ m_CachedCommandBuffers.Remove(evt);
+ }
+ else
+ {
+ cb = m_CommandBufferPool.Get();
+ cb.name = evt.ToString();
+ }
+ m_InUseCommandBuffers.Add(evt, cb);
+ }
+ }
+ foreach (var cb in m_CachedCommandBuffers)
+ {
+ m_CommandBufferPool.Release(cb.Value);
+ }
+ m_CachedCommandBuffers.Clear();
+ }
+
+ static CommandBuffer ClaimCommandBuffer()
+ {
+ CommandBuffer cb = m_CommandBufferPool.Get();
+ cb.Clear();
+ return cb;
+ }
+
+ static void ReleaseCommandBuffer(ref CommandBuffer cb)
+ {
+ m_CommandBufferPool.Release(cb);
+ cb = null;
+ } + + public void AddEffect(LensEffectBase effect)
+ {
+ m_Effects.Add(effect);
+ }
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Components/UnitLensEffect.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitLensEffect.cs.meta new file mode 100644 index 00000000..5a91ee87 --- /dev/null +++ b/Erika/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/Erika/Assets/Scripts/Unit/Components/UnitLensEffect_Effects.cs b/Erika/Assets/Scripts/Unit/Components/UnitLensEffect_Effects.cs new file mode 100644 index 00000000..31d3c549 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitLensEffect_Effects.cs @@ -0,0 +1,13 @@ +using UnityEngine; +using UnityEngine.Rendering; + +public partial class UnitLensEffect : UnitComponent +{
+
+ public void Dash(Color color, float lifeTime, float angle, UnitSnapshotInfo snapshot)
+ {
+ LensEffect_Dash dash = new LensEffect_Dash(color, lifeTime, angle, snapshot);
+ owner.unitLensEffect.AddEffect(dash);
+ }
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Components/UnitLensEffect_Effects.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitLensEffect_Effects.cs.meta new file mode 100644 index 00000000..78ed27ad --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitLensEffect_Effects.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 16bed6a0d9a62e74987b4e6b5d70403c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitMovement.cs b/Erika/Assets/Scripts/Unit/Components/UnitMovement.cs new file mode 100644 index 00000000..cb1df193 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitMovement.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UnitMovement : UnitComponent +{ + + +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitMovement.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitMovement.cs.meta new file mode 100644 index 00000000..6978a4bd --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitMovement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8a0ce2076d45ed44da0dfc96f277aa36 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitPostEffect.cs b/Erika/Assets/Scripts/Unit/Components/UnitPostEffect.cs new file mode 100644 index 00000000..ad98ff6a --- /dev/null +++ b/Erika/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/Erika/Assets/Scripts/Unit/Components/UnitPostEffect.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitPostEffect.cs.meta new file mode 100644 index 00000000..d91936b9 --- /dev/null +++ b/Erika/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/Erika/Assets/Scripts/Unit/Components/UnitPreprocessing.cs b/Erika/Assets/Scripts/Unit/Components/UnitPreprocessing.cs new file mode 100644 index 00000000..8c56f0b6 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitPreprocessing.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering;
+
+// 给每个角色准备一些特殊的前置渲染
+public class UnitPreprocessing : UnitComponent +{ + [Flags] + public enum EUnitPreprocessing + { + None, + DepthTexture, // Unit Depth Texture
+ WorldNormalTexture, // Unit World Normal Texture
+ } + + 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_CommandBufferBeforeDepth; + + private Material m_MaterialDepth; + + public override void Initialize() + { + base.Initialize(); + } + + public override void OnPostInitialize() + { + base.OnPostInitialize(); + + MainCamera.Instance.customRenderingPipeline.onPreCull += OnWillRenderUnit; + MainCamera.Instance.customRenderingPipeline.onPostRender += OnRenderUnit; + + m_CommandBufferBeforeDepth = new CommandBuffer(); + m_CommandBufferBeforeDepth.name = "Unit Preprocessing(" + owner.unitObj.name + ")"; + + PrepareRenderTextures(); + PrepareMaterials(); + } + + void PrepareRenderTextures() + { + int unitHash = owner.GetHashCode(); + + int width = MainCamera.Instance.camera.pixelWidth; + int height = MainCamera.Instance.camera.pixelHeight; + unitDepthTexture = new RenderTexture(width, height, 24, RenderTextureFormat.Depth, RenderTextureReadWrite.Linear); + unitDepthTexture.name = "UnitDepthTexture_" + owner.GetHashCode(); + } + + void PrepareMaterials() + { + m_MaterialDepth = new Material(Shader.Find(StaticDefine.shaders[EShader.UnitDepth].name)); + } + + public override void OnUpdate() + { + base.OnUpdate(); + } + + public override void Release() + { + MainCamera.Instance.customRenderingPipeline.onPreCull -= OnWillRenderUnit; + MainCamera.Instance.customRenderingPipeline.onPostRender -= OnRenderUnit; + + base.Release(); + } + + private void OnWillRenderUnit() + {
+ RenderDepthTexture();
+ //RenderWorldNormal();
+ RenderMotionVector();
+ MainCamera.Instance.camera.AddCommandBuffer(CameraEvent.BeforeDepthTexture, m_CommandBufferBeforeDepth);
+ } + + void RenderDepthTexture() + { + var cb = m_CommandBufferBeforeDepth; + cb.Clear(); + cb.SetRenderTarget(unitDepthTexture); + cb.ClearRenderTarget(true, true, new Color(0, 0, 0, 0)); + + cb.SetGlobalVector("unity_LightShadowBias", Vector4.zero); + + foreach (var r in GetRenderers()) + { + BodyPartRenderer br = r as BodyPartRenderer; + if (br == null) + continue; + Renderer renderer = br.renderer as Renderer; + if (renderer == null) + continue; + cb.DrawRenderer(renderer, m_MaterialDepth); + } + }
+
+ void RenderMotionVector()
+ {
+ }
+
+ //void RenderWorldNormal()
+ //{
+ // var cb = m_CommandBufferBeforeDepth;
+ // cb.Clear();
+ // cb.GetTemporaryRT(unitWorldNormalTextureID, -1, -1, 24, FilterMode.Point, RenderTextureFormat.RG16, RenderTextureReadWrite.Linear);
+ // cb.SetRenderTarget(unitWorldNormalTextureID);
+ // cb.ClearRenderTarget(true, true, new Color(0, 0, 0, 0));
+ //}
+
+ IEnumerable GetRenderers() + { + IBodyRendererAgent body = owner.unitRender.body; + if (body == null || body.renderers == null || body.renderers.Length == 0) + yield break; + for (int j = 0; j < body.renderers.Length; ++j) + { + yield return body.renderers[j]; + } + } + + private void OnRenderUnit() + {
+ //m_CommandBufferBeforeDepth.ReleaseTemporaryRT(unitDepthTextureID);
+
+ MainCamera.Instance.camera.RemoveCommandBuffer(CameraEvent.BeforeDepthTexture, m_CommandBufferBeforeDepth); + } +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Components/UnitPreprocessing.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitPreprocessing.cs.meta new file mode 100644 index 00000000..734df2f2 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitPreprocessing.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1998e85be970d1541843ff6166f6c771 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitRender.cs b/Erika/Assets/Scripts/Unit/Components/UnitRender.cs new file mode 100644 index 00000000..a5822ffe --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitRender.cs @@ -0,0 +1,61 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// 角色渲染 +[DisallowMultipleComponent] +public class UnitRender : UnitComponent +{ + public IBodyRendererAgent body { get { return m_Body; } } + private IBodyRendererAgent m_Body; + + public Renderer mainRenderer
+ {
+ get
+ {
+ if (this.owner.unitDetail == null)
+ return null;
+ return m_Body.mainRenderer.renderer;
+ }
+ } + + public override void Initialize()
+ {
+ base.Initialize();
+ } + + public override void OnPostInitialize()
+ {
+ base.OnPostInitialize();
+ m_Body = owner.unitDetail as IBodyRendererAgent;
+ } + + public void SetVisibilityInMainCamera(bool isVisible)
+ {
+ LayerMask mask = LayerMask.GetMask("PlayerCharacter");
+ if (!isVisible)
+ {
+ //SceneManager.Instance.mainCamera.cullingMask &= ~mask.value;
+ }
+ else
+ {
+ //SceneManager.Instance.mainCamera.cullingMask |= mask.value;
+ }
+ } + + public void SetVisibilityInAllCameras(bool isVisible)
+ {
+ if (mainRenderer == null)
+ return;
+
+ if (isVisible)
+ {
+ //mainRenderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.On;
+ }
+ else
+ {
+ //mainRenderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.ShadowsOnly;
+ }
+ } + +}
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitRender.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitRender.cs.meta new file mode 100644 index 00000000..98aaba31 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitRender.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8a5b6a015d074924b8a247980bb04693 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitSkill.cs b/Erika/Assets/Scripts/Unit/Components/UnitSkill.cs new file mode 100644 index 00000000..3e1e480d --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitSkill.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// 技能逻辑 +[DisallowMultipleComponent] + +public class UnitSkill : UnitComponent +{ + + +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitSkill.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitSkill.cs.meta new file mode 100644 index 00000000..882bb398 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitSkill.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d55937c5d88bcc84986d79cd2ec0468b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState.meta b/Erika/Assets/Scripts/Unit/Components/UnitState.meta new file mode 100644 index 00000000..7dca0bf1 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b9414a0ec8c909c4ebb11b46a7f0819d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/DroneState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/DroneState.cs new file mode 100644 index 00000000..28640664 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/DroneState.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DroneState : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/DroneState.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/DroneState.cs.meta new file mode 100644 index 00000000..ab3a2898 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/DroneState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a6917bf61e4a31945846081533eb02f4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs new file mode 100644 index 00000000..c2a581b1 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs @@ -0,0 +1,218 @@ +using System; +using System.Reflection; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MonsterState : UnitState +{ + public enum EUnitState + { + Nien, + + Idle, + + Move, + + HitLight, + HitAir, + HitInAir,
+ HitGround, + HitFall, + KnockDown, + Rise, + + Pull, + Landing, + } + + [SerializeField] private EUnitState m_State; + public EUnitState CurrentState { get { return m_State; } } + + UnitAnimation unitAnimation { get { return m_Owner.unitAnimation; } } + + public override void Initialize() + { + base.Initialize(); + } + + public void ChangeState<T>(EUnitState nextState, T param = default, bool bForce = false) + { + if (!IsChange(nextState, bForce)) + return; + + LogHelper.Log("Monster UnitState: " + m_State.ToString() + " -> " + nextState.ToString()); + + StopAllCoroutines(); + + EUnitState prevState = m_State; + string methodFunc = "On" + m_State.ToString() + "Exit"; + MethodInfo exitMethod = GetType().GetMethod(methodFunc, BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(EUnitState) }, null); + if (exitMethod != null) + { + exitMethod.Invoke(this, new object[] { nextState }); + } + else + { + LogHelper.LogError("缺少 " + methodFunc); + } + m_State = nextState; + + StartCoroutine(m_State.ToString(), param); + } + + bool IsChange(EUnitState newState, bool bForce) + { + if (newState != m_State || bForce) + return true; + return false; + } + + IEnumerator Nein() { yield break; } + void OnNienExit(EUnitState nextState) { } + + public struct IdleParam { } + + public struct LandingParam { } + + public struct HitLightParam { } + + public struct HitAirParam { } + + public struct RiseParam { } + + public struct HitInAirParam { } + + #region Idle + + IEnumerator Idle(IdleParam param) + { + //if (m_Owner.isInAir) // 浮空切换到landing + //{ + // ChangeState(EUnitState.Landing, new LandingParam()); + //} + //else // idle + //{ + m_Owner.SetYPosition(0); + m_Owner.monsterAnimation.AnimIdle(); + while (true) + { + yield return null; + } + //} + } + + void OnIdleExit(EUnitState nextState) + { + } + #endregion + + #region HitLight + + IEnumerator HitLight(HitLightParam param) + { + ((MonsterController)owner).FacePC(); + m_Owner.monsterAnimation.AnimHitBackHeavy(); + yield return null; + while (true) + { + bool reachEnd = m_Owner.monsterAnimation.layers[0].playbackNormalizedTime == 1; + if(reachEnd) + { + ChangeState(EUnitState.Idle, new IdleParam()); + } + yield return null; + } + } + + void OnHitLightExit(EUnitState nextState) + { + } + + #endregion + + #region HitAir + + IEnumerator HitAir(HitAirParam param) + { + ((MonsterController)owner).FacePC(); + m_Owner.monsterAnimation.AnimHitAir(); + yield return null; + while (true) + { + bool reachEnd = m_Owner.monsterAnimation.layers[0].playbackNormalizedTime == 1; + if (reachEnd) + { + //yield return new WaitForSeconds(1f); + ChangeState(EUnitState.Rise, new RiseParam()); + } + yield return null; + } + } + + void OnHitAirExit(EUnitState nextState) + { + }
+
+ #endregion +
+ #region HitInAir +
+ IEnumerator HitInAir(HitInAirParam param) + { + ((MonsterController)owner).FaceToFacePC(); + m_Owner.monsterAnimation.AnimHitInAir(); + yield return null; + float vy = -1f; + float g = -15.8f; + while (true) + { + bool reachEnd = m_Owner.monsterAnimation.baseLayer.playbackNormalizedTime == 1; + if (reachEnd) + { + vy += g * Time.deltaTime; + Vector3 pos = owner.transform.position; + pos.y += vy * Time.deltaTime; + if(pos.y <= 0)
+ {
+ yield return new WaitForSeconds(0.5f);
+ ChangeState(EUnitState.Rise, new RiseParam());
+ } + owner.transform.position = pos; + } + yield return null; + } + } + + void OnHitInAirExit(EUnitState nextState) + { + }
+
+ #endregion +
+ #region Rise +
+ IEnumerator Rise(RiseParam param) + { + m_Owner.monsterAnimation.AnimRise(); + yield return null; + while (true) + { + bool reachEnd = m_Owner.monsterAnimation.layers[0].playbackNormalizedTime == 1; + if (reachEnd) + { + ChangeState(EUnitState.Idle, new IdleParam()); + } + yield return null; + } + } + + void OnRiseExit(EUnitState nextState) + { + } + + + #endregion + + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs.meta new file mode 100644 index 00000000..7d60499f --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b7b1805198282374fbc67108671f8a72 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs new file mode 100644 index 00000000..6a326431 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs @@ -0,0 +1,186 @@ +using System; +using System.Reflection; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// 角色状态机 +[DisallowMultipleComponent] +public partial class PCState : UnitState +{ + public enum EUnitState + { + Nien, + + Idle, + Move, + Spawn, + Die, + Dead, + // + Attack, + AirAttack, + AttackToAir, + AirDash, + // + HitAir, + HitAirHit, + Knockdown, + // + HitGuard, + // + Walk, + // + Rise, + // + Jump, + // 转身 + Turn, + Landing, // 从空中降落 + } + + [SerializeField] private EUnitState m_State; + public EUnitState CurrentState { get { return m_State; } } + + private EUnitState m_PrevState; + + public override void Initialize() + { + base.Initialize(); + owner.onTimelineEvent += OnTimeLineEvent; + } + + public override void Release()
+ {
+ owner.onTimelineEvent -= OnTimeLineEvent;
+ base.Release();
+ } +
+ PCAnimation pcAnimation { get { return m_Owner.pcAnimation; } } + + public void ChangeState<T>(EUnitState nextState, T param = default, bool bForce = false) + { + if (!IsChange(nextState, bForce)) + return; + + LogHelper.Log("UnitState: " + m_State.ToString() + " -> " + nextState.ToString()); + + StopAllCoroutines(); + + string methodFunc = "On" + m_State.ToString() + "Exit"; + MethodInfo exitMethod = GetType().GetMethod(methodFunc, BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(EUnitState) }, null); + if (exitMethod != null) + { + exitMethod.Invoke(this, new object[] { nextState }); + } + else + { + LogHelper.LogError("缺少 " + methodFunc); + }
+ m_PrevState = m_State; + m_State = nextState;
+
+ if(m_PrevState != m_State && owner.unitRender != null)
+ {
+ // owner.unitRender.SetVisibilityInMainCamera(true);
+ }
+
+ StartCoroutine(m_State.ToString(), param); + } + + bool IsChange(EUnitState newState, bool bForce) + { + if (newState != m_State || bForce) + return true; + return false; + } + + public void TurnAround(bool bRight) + { + m_Owner.transform.rotation = Quaternion.Euler(0, bRight ? 0 : 180, 0); + } + + public void TurnLeft() + { + TurnAround(false); + } + + public void TurnRight() + { + TurnAround(true); + }
+
+ void TryDash()
+ {
+ if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A))
+ {
+ TurnLeft();
+ ChangeState(EUnitState.AirDash, new AirDashParam(), true);
+ }
+ if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D))
+ {
+ TurnRight();
+ ChangeState(EUnitState.AirDash, new AirDashParam(), true);
+ } + } + + void TryTurnAround()
+ {
+ if (Input.GetKey("a"))
+ {
+ TurnLeft();
+ }
+ if (Input.GetKey("d"))
+ {
+ TurnRight();
+ } + } + + bool TryTeleport()
+ {
+ if (Input.GetKeyDown("i"))
+ {
+ float offset = owner.isTowardRight ? 1.5f : -1.5f;
+
+ Vector3 targetPos = TestErika.Instance.monster.owner.center + new Vector3(offset, -0.5f, 0);
+ targetPos.y = Mathf.Max(1, targetPos.y);
+
+ UnitSnapshotInfo info = owner.TakeSnapshot();
+ Vector2 dir = targetPos - owner.center;
+ owner.unitLensEffect.Dash(Color.white, 0.1f, Mathf.Rad2Deg * Mathf.Atan2(dir.y, dir.x), info);
+
+ owner.center = targetPos;
+ TurnAround(!owner.isTowardRight);
+ return true;
+ } + return false; + } + + bool TryBlink()
+ {
+ return false;
+ }
+
+ bool TryTianyin()
+ {
+ if (Input.GetKeyDown("o"))
+ {
+ float offset = owner.isTowardRight ? 1.2f : -1.2f;
+ TestErika.Instance.monster.owner.center = owner.center + new Vector3(offset, 0.5f, 0);
+ ((MonsterController)TestErika.Instance.monster.owner).monsterState.ChangeState(MonsterState.EUnitState.HitInAir, new MonsterState.HitInAirParam(), true);
+ return true;
+ } + return false; + }
+
+ bool TryAttackToAir()
+ {
+ if(Input.GetKey("w") && Input.GetKeyDown("j"))
+ {
+ ChangeState(EUnitState.AttackToAir, new SkillParam());
+ return true;
+ }
+ return false;
+ }
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs.meta new file mode 100644 index 00000000..548a0a91 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9a888cbca17562d4dbea1f28fd4dcbab +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs new file mode 100644 index 00000000..73c65a0c --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs @@ -0,0 +1,24 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public partial class PCState : UnitState
+{
+
+
+ void OnTimeLineEvent(AnimationEventBase animEvent)
+ {
+ if(animEvent is EventUnit_SetPosition)
+ {
+ EventUnit_SetPosition setPos = animEvent as EventUnit_SetPosition;
+ Vector3 pos = owner.transform.position;
+ if(setPos.setY)
+ {
+ pos.y = setPos.y;
+ }
+ owner.transform.position = pos;
+ }
+
+ }
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs.meta new file mode 100644 index 00000000..7dc2d927 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 760f104e062ae884d809b7fc80b041b4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs new file mode 100644 index 00000000..738cc7ce --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs @@ -0,0 +1,390 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public partial class PCState : UnitState
+{
+
+ #region state param + public struct IdleParam { } + + public struct MoveParam + { + public bool isRight; + public string key; + } + + public struct SkillParam + { + public float offset;
+ } + + public struct AirDashParam + { + + } + + public struct JumpParam + { } + + public struct TurnParam + { + EUnitState nextState; + } + + public struct LandingParam { }
+
+ #endregion +
+ IEnumerator Nein() { yield break; } + void OnNienExit(EUnitState nextState) { } +
+ #region Idle +
+ IEnumerator Idle(IdleParam param) + {
+ m_Owner.pcAnimation.AnimIdle();
+ yield return new WaitForTransitionDone(owner.unitAnimation);
+ m_Owner.SetYPosition(0);
+ while (true)
+ {
+ if(TryAttackToAir())
+ {
+ yield break;
+ }
+ if (Input.GetKeyDown("j"))
+ {
+ ChangeState(EUnitState.Attack, new SkillParam());
+ yield break;
+ }
+ if (Input.GetKeyDown("space"))
+ {
+ ChangeState(EUnitState.Jump, new JumpParam());
+ yield break;
+ }
+ if (Input.GetKey("d"))
+ {
+ MoveParam move = new MoveParam();
+ move.isRight = true;
+ move.key = "d";
+ ChangeState(EUnitState.Move, move);
+ yield break;
+ }
+ if (Input.GetKey("a"))
+ {
+ MoveParam move = new MoveParam();
+ move.isRight = false;
+ move.key = "a";
+ ChangeState(EUnitState.Move, move);
+ yield break;
+ }
+ yield return null;
+ } + } + + void OnIdleExit(EUnitState nextState) + { + } + #endregion + + #region Move + IEnumerator Move(MoveParam param) + { + if (m_Owner.isTowardRight && !param.isRight + || !m_Owner.isTowardRight && param.isRight) + { + //m_Owner.pcAnimation.Play(UnitAnimation.EAnimState.Turn); + //yield return new WaitForActionReachEnd(m_Owner.pcAnimation); + //if (param.isRight) + // m_Owner.transform.rotation = Quaternion.Euler(0, 0, 0); + //else + // m_Owner.transform.rotation = Quaternion.Euler(0, 180, 0); + m_Owner.transform.rotation = Quaternion.Euler(0, param.isRight ? 0 : 180, 0); + } + //if (Input.GetKey(param.key)) + m_Owner.pcAnimation.AnimMove(); + while (Input.GetKey(param.key)) + {
+ TryAttackToAir();
+ yield return null; + } + ChangeState(EUnitState.Idle, new IdleParam()); + } + + void OnMoveExit(EUnitState nextState) + { + m_Owner.pcAnimation.animator.ResetTrigger("ToMove"); + }
+
+ #endregion +
+ #region Attack +
+ IEnumerator Attack(SkillParam param)
+ {
+ const int total = 4;
+ int id = 0;
+ m_Owner.pcAnimation.AnimAttack(id++);
+ yield return null;
+ while (true)
+ {
+ if (isComboOpen)
+ {
+ //if (InputManager.Instance.TryCommand(0.5f, KeyCode.W, KeyCode.J))
+ if (Input.GetKeyDown("u")) + {
+ SkillParam skill = new SkillParam();
+ skill.offset = 0.12f;
+ ChangeState(EUnitState.AttackToAir, skill);
+ }
+ }
+
+ if (isComboOpen && id < total)
+ {
+ if (Input.GetKeyDown("j"))
+ {
+ TryTurnAround(); +
+ m_Owner.pcAnimation.AnimAttack(id++);
+ yield return null;
+ yield return new WaitForTransitionDone(m_Owner.pcAnimation);
+ }
+ }
+
+ if (isAnimationReachEnd)
+ {
+ ChangeState(EUnitState.Idle, new IdleParam());
+ }
+
+ yield return null;
+ }
+ } + + void OnAttackExit(EUnitState next) + { + }
+
+ #endregion +
+ #region AttackToAir +
+ IEnumerator AttackToAir(SkillParam param)
+ {
+ m_Owner.pcAnimation.AnimAttackToAir(param.offset);
+ yield return null; + InputManager.Instance.ClearCommand(); + while (true)
+ {
+ TryTianyin();
+
+ if (isComboOpen)
+ {
+ TryDash();
+
+ if (InputManager.Instance.TryCommand(0.5f, false, KeyCode.J))
+ {
+ ChangeState(EUnitState.AirAttack, new SkillParam());
+ }
+ }
+
+ if (isAnimationReachEnd || isAnimationReachEndPoint) + { + ChangeState(EUnitState.Landing, new LandingParam()); + }
+ yield return null;
+ }
+ }
+
+ void OnAttackToAirExit(EUnitState next)
+ {
+ }
+
+ #endregion +
+ #region AirAttack +
+ IEnumerator AirAttack(SkillParam param) + { + int total = 5;
+ int id = 0;
+ m_Owner.pcAnimation.AnimAirAttack(id++); + yield return null; + InputManager.Instance.ClearCommand(); + while (true) + {
+ if (TryTeleport())
+ {
+ }
+
+ TryTianyin(); + + if (isComboOpen) + {
+ TryDash(); + + if (InputManager.Instance.TryCommand(0.3f, false, KeyCode.J)) + { + TryTurnAround();
+
+ m_Owner.pcAnimation.AnimAirAttack(id++);
+ id %= total; + yield return null; // 等待animator更新 + yield return new WaitForTransitionDone(m_Owner.pcAnimation); + } + } + + if (isAnimationReachEnd) + { + ChangeState(EUnitState.Landing, new LandingParam()); + } + + yield return null; + } + } + + void OnAirAttackExit(EUnitState next) + { + + } + + #endregion + + #region AirDash + + IEnumerator AirDash(AirDashParam param) + { + m_Owner.pcAnimation.AnimAirDash(); + yield return null; + while (true) + { + if (isAnimationReachEnd) + { + ChangeState(EUnitState.Landing, new LandingParam()); + } + + TryTianyin(); + + if (isComboOpen) + { + TryDash(); + + if (Input.GetKeyDown("j")) + {
+ TryTurnAround(); + ChangeState(EUnitState.AirAttack, new SkillParam()); + } + } + + yield return null; + } + } + + void OnAirDashExit(EUnitState next) + { + } + + #endregion + + #region Jump + + IEnumerator Jump(JumpParam param) + { + pcAnimation.AnimJump(); + yield return null; + yield return new WaitForTransitionDone(pcAnimation); + while (true) + { + if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A)) + { + TurnLeft(); + ChangeState(EUnitState.AirDash, new AirDashParam()); + } + if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D)) + { + TurnRight(); + ChangeState(EUnitState.AirDash, new AirDashParam()); + } + if (isAnimationReachEnd) + ChangeState(EUnitState.Landing, new LandingParam()); + bool canAttack = m_Owner.pcAnimation.baseLayer.IsToggleOpen(EAnimationToogle.Combo); + if (Input.GetKeyDown("j") && canAttack) + { + ChangeState(EUnitState.AirAttack, new SkillParam()); + } + yield return null; + } + } + + void OnJumpExit(EUnitState next) + { + } + + #endregion + + #region Landing + + IEnumerator Landing(LandingParam param) + { + m_Owner.pcAnimation.AnimLanding(); + yield return null; + yield return new WaitForTransitionDone(m_Owner.pcAnimation); + float vy = 0; + float g = -9.8f; + bool landingGround = false; + float vx = 5; + while (true) + { + Vector3 pos = m_Owner.transform.position; + + if(!landingGround)
+ {
+ vy += g * Time.deltaTime;
+ pos.y += vy * Time.deltaTime;
+ pos.y = Mathf.Max(0, pos.y);
+ } +
+ TryDash(); + + TryTianyin(); + + if (Input.GetKey("a")) + { + TurnAround(false); + pos.x -= vx * Time.deltaTime; + } + if (Input.GetKey("d")) + { + TurnAround(true); + pos.x += vx * Time.deltaTime; + } + + if (Input.GetKeyDown("j"))
+ {
+ ChangeState(EUnitState.AirAttack, new SkillParam());
+ } + + m_Owner.transform.position = pos; + + if (pos.y > 0 && pos.y <= 1 && !landingGround) + {
+ landingGround = true; + m_Owner.pcAnimation.AnimLandingGround(); + } + if (pos.y <= 0) + { + pos.y = 0; + m_Owner.transform.position = pos; + ChangeState(EUnitState.Idle, new IdleParam()); + } + + yield return null; + } + } + + void OnLandingExit(EUnitState next) + { + }
+
+ #endregion +
+}
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs.meta new file mode 100644 index 00000000..e314f21e --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bfcb25f32c442a5429ab4d0603b9df67 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PropState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/PropState.cs new file mode 100644 index 00000000..86b95e38 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PropState.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PropState : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PropState.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/PropState.cs.meta new file mode 100644 index 00000000..db5dd78f --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PropState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 96148351ded87a247bbdf39d56eb592e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/RobotState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/RobotState.cs new file mode 100644 index 00000000..68a11135 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/RobotState.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RobotState : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/RobotState.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/RobotState.cs.meta new file mode 100644 index 00000000..ef3ef469 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/RobotState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 12346a9b76519ab4098b11da90589040 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/UnitState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/UnitState.cs new file mode 100644 index 00000000..ff42c2be --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/UnitState.cs @@ -0,0 +1,40 @@ +using System; +using System.Reflection; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// 角色状态机 +[DisallowMultipleComponent] +public class UnitState : UnitComponent +{ + + public virtual bool isAnimationReachEnd
+ {
+ get
+ {
+ return owner.unitAnimation.baseLayer.playbackNormalizedTime == 1;
+ }
+ } + + // 如果设置了endpoint属性，检查是否到了endpoint + public virtual bool isAnimationReachEndPoint
+ {
+ get
+ {
+ var layer = owner.unitAnimation.baseLayer;
+ if (!layer.animationData.HasProperty(EAnimationProperty.Endpoint))
+ return false;
+ return layer.playbackNormalizedTime >= layer.animationData.GetProperty(EAnimationProperty.Endpoint);
+ }
+ } + + public virtual bool isComboOpen
+ {
+ get
+ {
+ return owner.unitAnimation.baseLayer.IsToggleOpen(EAnimationToogle.Combo);
+ }
+ } + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/UnitState.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/UnitState.cs.meta new file mode 100644 index 00000000..781994dc --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Components/UnitState/UnitState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e5c9c1db07e3c734ebf185f14cc7356a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Controller.meta b/Erika/Assets/Scripts/Unit/Controller.meta new file mode 100644 index 00000000..54dfab62 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8ee977d4de170a439bd598f793d4989 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs b/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs new file mode 100644 index 00000000..22645b47 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs @@ -0,0 +1,95 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MonsterController : UnitController
+{
+ public override UnitType type { get { return UnitType.Monster; } }
+
+ protected override void Initialize()
+ {
+ base.Initialize();
+
+ unitState = GetOrAddUnitComponent<MonsterState>();
+ unitState.Initialize();
+
+ unitAnimation = GetOrAddUnitComponent<MonsterAnimation>();
+ unitAnimation.Initialize();
+ }
+
+ public override void Update()
+ {
+ base.Update();
+ }
+
+ public override void OnHit(CollisionInfo info)
+ {
+ }
+
+ public override void OnGetHit(CollisionInfo info)
+ {
+ ColliderBox hitbox = info.collider.colliderInfo.collider;
+ Debug.Assert(hitbox.type == ColliderBox.EColliderType.HitBox);
+
+ if(hitbox.hitResponse == ColliderBox.EHitResponse.Light)
+ {
+ monsterState.ChangeState(MonsterState.EUnitState.HitLight, new MonsterState.HitLightParam(), true);
+ }
+ else if (hitbox.hitResponse == ColliderBox.EHitResponse.HitAir)
+ {
+ monsterState.ChangeState(MonsterState.EUnitState.HitAir, new MonsterState.HitAirParam());
+ }
+ else if (hitbox.hitResponse == ColliderBox.EHitResponse.HitInAir)
+ {
+ monsterState.ChangeState(MonsterState.EUnitState.HitInAir, new MonsterState.HitInAirParam(), true);
+ }
+
+ string path = hitbox.sparkPath;
+ GameObject vfx = ResourceManager.Instance.LoadAsset<GameObject>(path);
+ if(vfx != null)
+ {
+ GameObject go = GameObject.Instantiate(vfx);
+ go.transform.position = center + hitbox.sparkOffset;
+ go.transform.localScale = hitbox.sparkScale;
+ }
+ }
+
+ public override void OnGetShot(CollisionInfo info)
+ {
+ monsterState.ChangeState(MonsterState.EUnitState.HitLight, new MonsterState.HitLightParam(), true);
+ }
+
+ public virtual bool IsFacePC()
+ {
+ PCController pc = PCController.instance;
+ float pcX = pc.transform.position.x;
+ float x = transform.position.x;
+ bool isface = pcX > x && isTowardRight || pcX <= x && !isTowardRight;
+ return isface;
+ }
+
+ // 朝向PC
+ public virtual void FacePC()
+ {
+ if (IsFacePC())
+ return;
+ PCController pc = PCController.instance;
+ float pcX = pc.transform.position.x;
+ float x = transform.position.x;
+ if (pcX > x)
+ {
+ transform.rotation = Quaternion.Euler(0, 0, 0); + }
+ else
+ {
+ transform.rotation = Quaternion.Euler(0, 180, 0); + }
+ }
+
+ public virtual void FaceToFacePC()
+ {
+ PCController pc = PCController.instance;
+ transform.rotation = Quaternion.Euler(0, 180, 0) * pc.transform.rotation;
+ }
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs.meta b/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs.meta new file mode 100644 index 00000000..4762487a --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ba16c8e0e6cac0c43b8a80d13dafdda1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Controller/PCController.cs b/Erika/Assets/Scripts/Unit/Controller/PCController.cs new file mode 100644 index 00000000..35645d57 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/PCController.cs @@ -0,0 +1,65 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+// 玩家角色控制器
+[DisallowMultipleComponent]
+public class PCController : UnitController
+{
+ public static PCController instance;
+
+ #region Unit的三种效果
+ public UnitAfterImage unitAfterImage;
+ public UnitImageEffect unitImageEffect;
+ #endregion
+
+ public override UnitType type { get { return UnitType.PC; } }
+
+ private void Awake()
+ {
+ instance = this;
+ }
+
+ protected override void Initialize()
+ {
+ base.Initialize();
+
+ unitState = GetOrAddUnitComponent<PCState>();
+ unitState.Initialize();
+
+ unitAnimation = GetOrAddUnitComponent<PCAnimation>();
+ unitAnimation.Initialize();
+
+ unitAfterImage = GetOrAddUnitComponent<UnitAfterImage>();
+ unitAfterImage.Initialize();
+
+ unitImageEffect = GetOrAddUnitComponent<UnitImageEffect>();
+ unitImageEffect.Initialize();
+ }
+
+ public override void Update()
+ {
+ base.Update();
+ unitAfterImage.OnUpdate();
+ unitImageEffect.OnUpdate();
+ }
+
+ public override void OnHit(CollisionInfo info)
+ {
+ ColliderBox hitbox = info.collider.colliderInfo.collider;
+ Debug.Assert(hitbox.type == ColliderBox.EColliderType.HitBox);
+ }
+
+ public override void OnGetHit(CollisionInfo info)
+ {
+ }
+
+ public override void OnGrab()
+ {
+ }
+
+ public override void OnPull()
+ {
+ }
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Controller/PCController.cs.meta b/Erika/Assets/Scripts/Unit/Controller/PCController.cs.meta new file mode 100644 index 00000000..d7ed1aa3 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/PCController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7d3cdc0aac9d88142b135a9aa3792000 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Controller/PropController.cs b/Erika/Assets/Scripts/Unit/Controller/PropController.cs new file mode 100644 index 00000000..6449d49e --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/PropController.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PropController : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Erika/Assets/Scripts/Unit/Controller/PropController.cs.meta b/Erika/Assets/Scripts/Unit/Controller/PropController.cs.meta new file mode 100644 index 00000000..e5212ee7 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/PropController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 67cc84cac8614a646a7e981178ec9939 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Controller/RobotController.cs b/Erika/Assets/Scripts/Unit/Controller/RobotController.cs new file mode 100644 index 00000000..7a10c968 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/RobotController.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RobotController : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Erika/Assets/Scripts/Unit/Controller/RobotController.cs.meta b/Erika/Assets/Scripts/Unit/Controller/RobotController.cs.meta new file mode 100644 index 00000000..d40dd55d --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/RobotController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4f594c33f502a71408a6d16e21274ca2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Controller/UnitController.cs b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs new file mode 100644 index 00000000..06d5a840 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs @@ -0,0 +1,269 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+//public interface Interactable
+//{
+// void OnHit();
+// void OnHurt();
+// void OnGrab();
+//}
+
+public class UnitController : MonoBehaviour/*, Interactable*/
+{
+ public enum UnitType
+ {
+ PC,
+ Monster,
+ Prop,
+ }
+
+ public virtual UnitType type { get; }
+
+ // 角色共有的组件
+
+ public UnitRender unitRender;
+
+ public UnitState unitState;
+ public PCState pcState { get { return unitState as PCState; } }
+ public MonsterState monsterState { get { return unitState as MonsterState; } }
+
+ public UnitAnimation unitAnimation;
+ public PCAnimation pcAnimation { get { return unitAnimation as PCAnimation; } }
+ public MonsterAnimation monsterAnimation { get { return unitAnimation as MonsterAnimation; } }
+
+ public UnitSkill unitSkill;
+
+ public UnitRootMotion unitRootMotion;
+
+ public UnitCollider unitCollider;
+
+ public UnitDetail unitDetail;
+
+ public UnitBody unitBody;
+
+ public UnitLensEffect unitLensEffect;
+
+ public UnitPreprocessing unitPreprocessing;
+
+ public GameObject unitObj; // 角色模型
+
+ protected List<UnitComponent> unitComponents;
+
+ #region 事件监听
+ public delegate void OnTimelineEventHandle(AnimationEventBase animEvent);
+ public OnTimelineEventHandle onTimelineEvent { get; set; }
+ #endregion
+
+ public bool isTowardRight
+ {
+ get
+ {
+ return transform.rotation.eulerAngles.y == 0;
+ }
+ }
+
+ public virtual bool isOnGround
+ {
+ get
+ {
+ return transform.position.y <= 0f;
+ }
+ }
+
+ public bool isInAir
+ {
+ get
+ {
+ return !isOnGround;
+ }
+ }
+
+ private string m_Folder;
+ public string folder
+ {
+ get
+ {
+ return m_Folder;
+ }
+ }
+
+ private bool m_Visible;
+ public bool visible
+ {
+ get
+ {
+ return m_Visible;
+ }
+ }
+
+ public TRS trs
+ {
+ get
+ {
+ TRS trs = new TRS();
+ trs.position = position;
+ trs.rotation = rotation;
+ trs.scale = lossyScale;
+ return trs;
+ }
+ }
+
+ public virtual Vector3 center
+ {
+ get
+ {
+ return GetComponentInChildren<Renderer>().bounds.center;
+ }
+ set
+ {
+ Vector3 offset = new Vector3(0, -GetComponentInChildren<Renderer>().bounds.size.y / 2f, 0);
+ transform.position = value + offset;
+ }
+ }
+
+ public virtual Vector3 position
+ {
+ get
+ {
+ return transform.position;
+ }
+ set
+ {
+ transform.position = value;
+ }
+ }
+
+ public virtual Quaternion rotation
+ {
+ get
+ {
+ return transform.rotation;
+ }
+ set
+ {
+ transform.rotation = value;
+ }
+ }
+
+ public virtual Vector3 lossyScale
+ {
+ get
+ {
+ return transform.lossyScale;
+ }
+ }
+
+ public virtual void Initialize( GameObject obj , string folder)
+ {
+ unitObj = obj;
+ m_Folder = folder;
+ unitComponents = new List<UnitComponent>();
+
+ Initialize();
+
+ OnPostInitailize();
+ }
+
+ protected virtual void Initialize()
+ {
+ unitSkill = GetOrAddUnitComponent<UnitSkill>();
+ unitSkill.Initialize();
+
+ unitRootMotion = GetOrAddUnitComponent<UnitRootMotion>();
+ unitRootMotion.Initialize();
+
+ unitCollider = GetOrAddUnitComponent<UnitCollider>();
+ unitCollider.Initialize();
+
+ unitBody = GetOrAddUnitComponent<UnitBody>();
+ unitBody.Initialize();
+
+ unitRender = GetOrAddUnitComponent<UnitRender>();
+ unitRender.Initialize();
+
+ unitLensEffect = GetOrAddUnitComponent<UnitLensEffect>();
+ unitLensEffect.Initialize();
+
+ unitDetail = gameObject.GetComponentInChildren<UnitDetail>();
+
+ unitPreprocessing = GetOrAddUnitComponent<UnitPreprocessing>();
+ unitPreprocessing.Initialize();
+ }
+
+ private void OnPostInitailize()
+ {
+ if (unitComponents == null)
+ return;
+ for(int i = 0; i < unitComponents.Count; ++i)
+ {
+ unitComponents[i].OnPostInitialize();
+ }
+ }
+
+ protected T GetOrAddUnitComponent<T>() where T : UnitComponent
+ {
+ T comp = gameObject.GetOrAddComponent<T>();
+ Debug.Assert(unitComponents != null);
+ unitComponents.Add(comp);
+ return comp;
+ }
+
+ public virtual void Update()
+ {
+ unitRender.OnUpdate();
+ unitState.OnUpdate();
+ unitAnimation.OnUpdate();
+ unitSkill.OnUpdate();
+ unitRootMotion.OnUpdate();
+ unitLensEffect.OnUpdate();
+ }
+
+ public virtual void OnDestroy()
+ {
+ }
+
+ public virtual void OnHit(CollisionInfo info)
+ {
+ }
+
+ public virtual void OnGetHit(CollisionInfo info)
+ {
+ }
+
+ public virtual void OnGetShot(CollisionInfo info)
+ {
+ }
+
+
+ public virtual void OnGrab()
+ {
+ }
+
+ public virtual void OnPull()
+ {
+ }
+
+ public void SetYPosition(float y)
+ {
+ Vector3 pos = transform.position;
+ pos.y = y;
+ transform.position = pos;
+ }
+
+ public UnitSnapshotInfo TakeSnapshot()
+ {
+ UnitSnapshotInfo snapshot = new UnitSnapshotInfo();
+ snapshot.trs = new TRS(unitObj.transform.position, unitObj.transform.rotation, unitObj.transform.lossyScale);
+ snapshot.unit = this;
+ snapshot.animStateHash = unitAnimation.baseLayer.stateHash;
+ snapshot.normalizedTime = unitAnimation.baseLayer.playbackNormalizedTime;
+ return snapshot;
+ }
+
+ public UnitSnapshotInfo TakeSnapshotClosestDashPose(bool forward = true)
+ {
+ UnitSnapshotInfo snapshot = new UnitSnapshotInfo();
+ return snapshot;
+ }
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Controller/UnitController.cs.meta b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs.meta new file mode 100644 index 00000000..326dd122 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ea5af1ca0baa89e4fbbe5d87920fb748 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Editor.meta b/Erika/Assets/Scripts/Unit/Editor.meta new file mode 100644 index 00000000..45bf7867 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70a2febe367468c4ebf5c1b466b1a005 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Editor/TriggerAnimationDicDrawer.cs b/Erika/Assets/Scripts/Unit/Editor/TriggerAnimationDicDrawer.cs new file mode 100644 index 00000000..8dace739 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Editor/TriggerAnimationDicDrawer.cs @@ -0,0 +1,7 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEditor; + +[CustomPropertyDrawer(typeof(TriggerAnimationDictionary))] +public class TriggerAnimationDicDrawer : SerializableDictionaryPropertyDrawer { } diff --git a/Erika/Assets/Scripts/Unit/Editor/TriggerAnimationDicDrawer.cs.meta b/Erika/Assets/Scripts/Unit/Editor/TriggerAnimationDicDrawer.cs.meta new file mode 100644 index 00000000..1b2fcd94 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Editor/TriggerAnimationDicDrawer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 548e21e5e705cc44597ccc005450a9e2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Editor/UnitDictionariesDrawer.cs b/Erika/Assets/Scripts/Unit/Editor/UnitDictionariesDrawer.cs new file mode 100644 index 00000000..07e3073e --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Editor/UnitDictionariesDrawer.cs @@ -0,0 +1,9 @@ +using UnityEditor; + +[CustomPropertyDrawer(typeof(UnitBoneDictionary))] +public class UnitBoneDictionaryDrawer : SerializableDictionaryPropertyDrawer { } + + +[CustomPropertyDrawer(typeof(UnitReferencePointDictionary))] +public class UnitReferencePointDictionaryDrawer : SerializableDictionaryPropertyDrawer { } + diff --git a/Erika/Assets/Scripts/Unit/Editor/UnitDictionariesDrawer.cs.meta b/Erika/Assets/Scripts/Unit/Editor/UnitDictionariesDrawer.cs.meta new file mode 100644 index 00000000..4a92e024 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Editor/UnitDictionariesDrawer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8850261fe4c29b442a0e3b613e07597e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Effect.meta b/Erika/Assets/Scripts/Unit/Effect.meta new file mode 100644 index 00000000..18369d64 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Effect.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ff5e16d7cc0410489258a170a2a539a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Effect/UnitCamera.cs b/Erika/Assets/Scripts/Unit/Effect/UnitCamera.cs new file mode 100644 index 00000000..abb13a00 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Effect/UnitCamera.cs @@ -0,0 +1,55 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// 专门用来渲染character的相机，用来做特效 +[RequireComponent(typeof(Camera))] +public class UnitCamera : SingletonMB<UnitCamera> +{ + PCController pc { get { return UnitManager.Instance.pc; } } + + Camera m_Camera; + + private void OnEnable() + { + m_Camera = GetComponent<Camera>(); + m_Camera.enabled = false; + }
+
+ // 手动渲染
+ public void Render()
+ {
+ m_Camera.Render();
+ }
+
+ // 这里要用OnPreCull,不能是OnPreRender，因为设置了可见性，OnPreRender是在可见性剔除之后
+ void OnPreCull() + { + if (pc == null) + return; + if (pc.unitImageEffect == null || pc.unitImageEffect.effects.Count == 0) + return; + if (m_Camera == null) + return; + + Vector3 pos = transform.position; + transform.position = new Vector3(pc.center.x, pc.center.y, pos.z); + + float dz = Mathf.Abs(pos.z - pc.center.z); + float fov = 2 * Mathf.Atan2(pc.unitDetail.snapshotBound / 2, dz) * Mathf.Rad2Deg; + + m_Camera.fieldOfView = fov; + + // 开启unit的渲染 + pc.unitRender.SetVisibilityInAllCameras(true); + } + + void OnPostRender()
+ {
+ if (pc.unitImageEffect == null || pc.unitImageEffect.effects.Count == 0) + return; +
+ pc.unitRender.SetVisibilityInAllCameras(false); + } + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Effect/UnitCamera.cs.meta b/Erika/Assets/Scripts/Unit/Effect/UnitCamera.cs.meta new file mode 100644 index 00000000..e74544bd --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Effect/UnitCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c4798e37b95c98b4d9679542c6e14947 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events.meta b/Erika/Assets/Scripts/Unit/Events.meta new file mode 100644 index 00000000..afb263d4 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15b356fbacd238c4c967af284dcf9320 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/AnimationEventBase.cs b/Erika/Assets/Scripts/Unit/Events/AnimationEventBase.cs new file mode 100644 index 00000000..d8d97892 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/AnimationEventBase.cs @@ -0,0 +1,35 @@ +using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public abstract class AnimationEventBase : ScriptableObject
+{
+ public int startFrame;
+
+ public abstract TimelineEventProxy.EEventType type { get; }
+
+ public string fullName
+ {
+ get
+ {
+ return this.type.ToString();
+ }
+ }
+
+ public string Name
+ {
+ get
+ {
+ string name = fullName.Replace("Event", "");
+ //int underscore = name.IndexOf('_');
+ //if (underscore != -1)
+ //{
+ // name = name.Substring(underscore + 1, name.Length - underscore - 1);
+ //}
+ return name;
+ }
+ }
+
+ public abstract string shortName { get; }
+}
diff --git a/Erika/Assets/Scripts/Unit/Events/AnimationEventBase.cs.meta b/Erika/Assets/Scripts/Unit/Events/AnimationEventBase.cs.meta new file mode 100644 index 00000000..346639b7 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/AnimationEventBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dcc64954e16467640a4c85e184747ecd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/Editor.meta b/Erika/Assets/Scripts/Unit/Events/Editor.meta new file mode 100644 index 00000000..c76c19aa --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7fe98fd5a5f07b94694065f2722b59b1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/Editor/AnimationDataInspector.cs b/Erika/Assets/Scripts/Unit/Events/Editor/AnimationDataInspector.cs new file mode 100644 index 00000000..1ca321c8 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/Editor/AnimationDataInspector.cs @@ -0,0 +1,39 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+[CustomEditor(typeof(AnimationData))]
+public class AnimationDataEditor : Editor
+{
+ AnimationData animData;
+
+ public void OnEnable()
+ {
+ animData = target as AnimationData;
+ }
+
+ public void OnDisable()
+ {
+
+ }
+
+ public override void OnInspectorGUI()
+ {
+ this.DrawDefaultInspector();
+
+ //if (animData == null)
+ // return;
+ //EditorGUI.BeginChangeCheck();
+
+ //GUILayout.Label("Animation File:");
+ //GUILayout.TextField(animData.animationName);
+
+ //if(EditorGUI.EndChangeCheck())
+ //{
+ // EditorUtility.SetDirty(animData);
+ // AssetDatabase.SaveAssets();
+ //}
+ }
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Events/Editor/AnimationDataInspector.cs.meta b/Erika/Assets/Scripts/Unit/Events/Editor/AnimationDataInspector.cs.meta new file mode 100644 index 00000000..2ec7d039 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/Editor/AnimationDataInspector.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6f340a992a68e144cb133678df7b505d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventEffect.cs b/Erika/Assets/Scripts/Unit/Events/EventEffect.cs new file mode 100644 index 00000000..204fa528 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventEffect.cs @@ -0,0 +1,43 @@ +using UnityEngine;
+
+public class EventEffect : AnimationEventBase
+{
+ public enum EParentNode
+ {
+ Unit = 0,
+ World,
+ Bone,
+ PresetBone,
+ ReferencePoint,
+ }
+
+ public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventEffect; } }
+ public override string shortName { get { return "E"; } }
+
+ [Tooltip("Effect path")]
+ public string effectPath;
+
+ [Tooltip("Is attached to a bone")]
+ public bool attached = true;
+
+ [Tooltip("Parent node")]
+ public EParentNode parentNode = EParentNode.Unit;
+
+ [When("parentNode", EParentNode.Bone), Tooltip("Bone path attach to")]
+ public string bonePath;
+
+ [When("parentNode", EParentNode.PresetBone), Tooltip("Preset unit bone defined in unit details")]
+ public EUnitBone bone;
+
+ [When("parentNode", EParentNode.ReferencePoint), Tooltip("参考点")]
+ public EUnitReferencePoint referencePoint;
+
+ [Tooltip("Position offset")]
+ public Vector3 position;
+
+ [Tooltip("Rotation in euler")]
+ public Vector3 rotation;
+
+ [Tooltip("Scale")]
+ public Vector3 scale = Vector3.one;
+}
diff --git a/Erika/Assets/Scripts/Unit/Events/EventEffect.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventEffect.cs.meta new file mode 100644 index 00000000..c88ceaa0 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventEffect.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9fe45d0826fb033448a877f1d49199d6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs b/Erika/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs new file mode 100644 index 00000000..df393a6b --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs @@ -0,0 +1,12 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventGame_TimeScale : AnimationEventBase
+{
+ public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventGame_TimeScale; } }
+ public override string shortName { get { return "T"; } }
+
+ public AnimationCurve curve;
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs.meta new file mode 100644 index 00000000..8b5d5745 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 227b9bc615c7c8044be9c4547dee5fcf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs b/Erika/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs new file mode 100644 index 00000000..3eb161cb --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs @@ -0,0 +1,65 @@ +using UnityEngine;
+
+public class EventMesh_AfterImage : AnimationEventBase
+{
+ public enum ESpawnRange // 生成残影的范围
+ {
+ Once = 0, // 只生成一个残影
+ Duration = 1, // 给定一个时间范围内
+ WaitForAfterImageStopEvent = 2, // 等待触发afterImageStopEvent
+ Manual = 3, // 手动停止生成
+ }
+
+ public enum ESpawnPosition
+ {
+ InitPosition = 0, // 在触发事件的位置生成
+ Follow = 1, // 跟随
+ }
+
+ public enum ESpawnMode
+ {
+ Count = 0, // 生成固定数量个，间隔平均
+ Interval = 1, // 等时间间隔生成
+ Curve = 2, // 曲线
+ }
+
+ public enum EEffect // 效果
+ {
+ Original = 0, // 原样
+ RimLight = 1, // 边缘光
+ FullColor = 2, // 全着色
+ Ink = 3, // 墨水效果
+ Distorsion = 4, // 扭曲
+ Dissolve = 5, // 溶解
+ }
+
+ public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventMesh_AfterImage; } }
+ public override string shortName { get { return "A"; } }
+
+ [Comment("[ 残影生成 ]", TextAnchor.MiddleCenter)]
+ public ESpawnRange spawnRange;
+
+ [When("spawnRange", ESpawnRange.Duration), Tooltip("整个生成的持续时间（按时间，scaledTime）")]
+ public float duration;
+
+ public ESpawnPosition spawnPosition;
+
+ public ESpawnMode spawnMode;
+ [When("spawnMode", ESpawnMode.Count)]
+ public int spawnCount;
+ [When("spawnMode", ESpawnMode.Interval)]
+ public float interval;
+ [When("spawnMode", ESpawnMode.Curve)]
+ public AnimationCurve spawnCurve;
+
+ [Comment("[ 残影效果 ]", TextAnchor.MiddleCenter)]
+ public EEffect effect;
+
+ [ Tooltip("单个残影持续时间（按时间，scaledTime）")]
+ public float lifetime;
+
+ [When("effect", EEffect.RimLight)]
+ [HDR] public Color rimColor;
+
+ [HDR] public Color color;
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs.meta new file mode 100644 index 00000000..5e68ea59 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cbd5a33b9ed7704439230ab5ba43cb86 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs b/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs new file mode 100644 index 00000000..29d1adde --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs @@ -0,0 +1,19 @@ +using UnityEngine;
+
+public class EventMesh_FadeIn : AnimationEventBase
+{
+ public enum EFadeInMode
+ {
+ Linear = 0,
+ Curve = 1,
+ }
+
+ public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventMesh_FadeIn; } }
+ public override string shortName { get { return "I"; } }
+
+ public EFadeInMode mode;
+
+ [Tooltip("Duration in frame")]
+ public float duration;
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta new file mode 100644 index 00000000..5c943a7d --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 155962a945650e440806af7a4346f155 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs b/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs new file mode 100644 index 00000000..209810b2 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs @@ -0,0 +1,8 @@ +using UnityEngine;
+
+public class EventMesh_FadeOut : AnimationEventBase
+{
+ public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventMesh_FadeOut; } }
+ public override string shortName { get { return "O"; } }
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta new file mode 100644 index 00000000..7abb9b33 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3ed55d0137f7de849918ade75357e60b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs b/Erika/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs new file mode 100644 index 00000000..cb1a657c --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs @@ -0,0 +1,20 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventMesh_ImageEffect_MotionBlur : AnimationEventBase
+{
+ public override TimelineEventProxy.EEventType type => TimelineEventProxy.EEventType.EventMesh_ImageEffect_MotionBlur;
+
+ public override string shortName => "M";
+
+ public float lifeTime;
+
+ public float angle;
+
+ public float distance;
+
+ [Tooltip("隐藏角色")]
+ public bool hideUnitInMainCamera;
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs.meta new file mode 100644 index 00000000..e8e385f9 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a75401f0015aa1e4f856979c8aa1dae2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_LensEffect_Dash.cs b/Erika/Assets/Scripts/Unit/Events/EventMesh_LensEffect_Dash.cs new file mode 100644 index 00000000..0da254cc --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_LensEffect_Dash.cs @@ -0,0 +1,13 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventMesh_LensEffect_Dash : AnimationEventBase
+{
+ public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventMesh_LensEffect_Dash; } }
+ public override string shortName { get { return "D"; } }
+
+ public float lifeTime;
+ public float angle;
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_LensEffect_Dash.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventMesh_LensEffect_Dash.cs.meta new file mode 100644 index 00000000..7be0b8bf --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_LensEffect_Dash.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d52092c3bed6f524ead14801bb72e1c3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs b/Erika/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs new file mode 100644 index 00000000..cf6e1bc8 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs @@ -0,0 +1,13 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventMesh_VisibilityInMainCamera : AnimationEventBase
+{
+ public override TimelineEventProxy.EEventType type => TimelineEventProxy.EEventType.EventMesh_VisibilityInMainCamera;
+
+ public override string shortName => "V";
+
+ public bool isVisible;
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs.meta new file mode 100644 index 00000000..eb3e8bf8 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a4957372b8a4fd946b86016c20f83750 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventProjectile.cs b/Erika/Assets/Scripts/Unit/Events/EventProjectile.cs new file mode 100644 index 00000000..65bf4d29 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventProjectile.cs @@ -0,0 +1,68 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventProjectile : AnimationEventBase
+{
+ public enum EMoveType
+ {
+ Kinematic = 0,
+ Curve, // 用一个固定曲线运动
+ Procedural, // 程序控制
+ }
+
+ public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventProjectile; } }
+
+ public override string shortName { get { return "P"; } }
+
+ [Tooltip("名字，可以用来识别这个projectile")]
+ public string name;
+
+ [Tooltip("标签，可以用来做一些标记,逗号分隔")]
+ public string tag;
+
+ [Tooltip("Projectile path")]
+ public string projectilePath;
+
+ [Tooltip("Is attached to a bone")]
+ public bool attachedToBone;
+
+ [If("attachedToBone"), Tooltip("Bone path attach to")]
+ public string bone;
+
+ [Tooltip("Position offset")]
+ public Vector3 posOffset;
+
+ [Tooltip("Rotation in euler")]
+ public Vector3 rotation;
+
+ [Tooltip("Scale")]
+ public Vector3 scale = Vector3.one;
+
+ public float lifeTime;
+
+ [Comment("[ 运动方式 ]", TextAnchor.MiddleCenter)]
+
+ public EMoveType moveType;
+
+ [When("moveType", EMoveType.Kinematic), Tooltip("初始速度")]
+ public Vector3 velocity;
+ [When("moveType", EMoveType.Kinematic), Tooltip("加速度")]
+ public Vector3 acceleration;
+
+ [When("moveType", EMoveType.Curve), Tooltip("运动曲线")]
+ public string curvePath;
+ [When("moveType", EMoveType.Curve), Tooltip("运动速度")]
+ public AnimationCurve speedCurve;
+
+ [WhenNot("moveType", EMoveType.Procedural), Tooltip("forward朝向运动轨迹的方向")]
+ public bool towardDirection;
+
+ [Comment("[ 击中反馈 ]", TextAnchor.MiddleCenter)]
+
+ public string sparkPath;
+
+ [Tooltip("击中效果")]
+ public ColliderBox.EHitResponse hitResponse;
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Events/EventProjectile.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventProjectile.cs.meta new file mode 100644 index 00000000..4afba321 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventProjectile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 75c54c029c766614590737d26471b7a4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs b/Erika/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs new file mode 100644 index 00000000..2298492b --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs @@ -0,0 +1,23 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventUnit_SetPosition : AnimationEventBase
+{
+ public override TimelineEventProxy.EEventType type => TimelineEventProxy.EEventType.EventUnit_SetPosition;
+
+ public override string shortName => "P";
+
+ public bool setX;
+ [If("setX")]
+ public float x;
+
+ public bool setY;
+ [If("setY")]
+ public float y;
+
+ public bool setZ;
+ [If("setZ")]
+ public float z;
+
+}
diff --git a/Erika/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs.meta new file mode 100644 index 00000000..d7ccb476 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7b8952562a0fbae41a92bd6c1f897ca1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Helper.meta b/Erika/Assets/Scripts/Unit/Helper.meta new file mode 100644 index 00000000..e6ded530 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Helper.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2608980741d3e0d49864f1a2e240bb77 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Helper/DirectionCalculator.cs b/Erika/Assets/Scripts/Unit/Helper/DirectionCalculator.cs new file mode 100644 index 00000000..267fc86d --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Helper/DirectionCalculator.cs @@ -0,0 +1,11 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DirectionCalculator
+{
+
+
+}
+
+
diff --git a/Erika/Assets/Scripts/Unit/Helper/DirectionCalculator.cs.meta b/Erika/Assets/Scripts/Unit/Helper/DirectionCalculator.cs.meta new file mode 100644 index 00000000..61f34b48 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Helper/DirectionCalculator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2c264e119e0dde14ca91aefd61f02442 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/LensEffect.meta b/Erika/Assets/Scripts/Unit/LensEffect.meta new file mode 100644 index 00000000..ad9ac741 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d1f1847b55e52a448151b0186678736 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs b/Erika/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs new file mode 100644 index 00000000..94e5f6a7 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs @@ -0,0 +1,111 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+public class MaterialEntry
+{
+ public string shader;
+ public Material material;
+}
+
+// unit 镜头效果，和image effect的区别在于不光是后处理
+public abstract class LensEffectBase
+{
+ public enum EStage
+ {
+ BeforeIterate, // 迭代之前
+ Iterate, // 迭代renderer
+ AfterIterate, // 迭代之后
+ FinishRender, // 渲染角色之后（所有lens effect结束）
+ }
+
+ public abstract ERenderingEvent renderingEvents { get; }
+
+ protected static Dictionary<string/*shaderName*/, List<MaterialEntry>> m_MaterailPool = new Dictionary<string, List<MaterialEntry>>();
+
+ private List<MaterialEntry> m_InUseMaterials = new List<MaterialEntry>();
+
+ #region upvalues
+ public BodyPartRenderer curBodypartRenderer;
+ public UnitController owner;
+ #endregion
+
+ private static MaterialEntry ClaimMaterial(string shader)
+ {
+ List<MaterialEntry> mats;
+ if (m_MaterailPool.TryGetValue(shader, out mats) && mats.Count > 0)
+ {
+ MaterialEntry me = mats[mats.Count - 1];
+ mats.RemoveAt(mats.Count - 1);
+ return me;
+ }
+ Material mat = new Material(Shader.Find(shader));
+ MaterialEntry entry = new MaterialEntry();
+ entry.material = mat;
+ entry.shader = shader;
+ return entry;
+ }
+
+ private static void ReleaseMaterial(MaterialEntry entry)
+ {
+ List<MaterialEntry> mats;
+ if (!m_MaterailPool.TryGetValue(entry.shader, out mats))
+ {
+ mats = new List<MaterialEntry>();
+ m_MaterailPool.Add(entry.shader, mats);
+ }
+ mats.Add(entry);
+ } + + protected MaterialEntry GetTempMaterial(string shader)
+ {
+ MaterialEntry entry = ClaimMaterial(shader);
+ m_InUseMaterials.Add(entry);
+ return entry;
+ } + + protected void ReleaseAllInUsedMaterials()
+ {
+ for(int i = 0; i < m_InUseMaterials.Count; ++i)
+ {
+ ReleaseMaterial(m_InUseMaterials[i]);
+ }
+ m_InUseMaterials.Clear();
+ } +
+ public virtual void BeforeDepthTexture(EStage stage, CommandBuffer cb) { }
+ public virtual void AfterDepthTexture(EStage stage, CommandBuffer cb) { }
+
+ public virtual void BeforeDepthNormalsTexture(EStage stage, CommandBuffer cb) { }
+ public virtual void AfterDepthNormalsTexture(EStage stage, CommandBuffer cb) { }
+
+ public virtual void BeforeForwardOpaque(EStage stage, CommandBuffer cb) { }
+ public virtual void AfterForwardOpaque(EStage stage, CommandBuffer cb) { }
+
+ public virtual void BeforeImageEffectsOpaque(EStage stage, CommandBuffer cb) { }
+ public virtual void AfterImageEffectsOpaque(EStage stage, CommandBuffer cb) { }
+
+ public virtual void BeforeSkybox(EStage stage, CommandBuffer cb) { }
+ public virtual void AfterSkybox(EStage stage, CommandBuffer cb) { }
+
+ public virtual void BeforeForwardAlpha(EStage stage, CommandBuffer cb) { }
+ public virtual void AfterForwardAlpha(EStage stage, CommandBuffer cb) { }
+
+ public virtual void BeforeImageEffects(EStage stage, CommandBuffer cb) { }
+ public virtual void AfterImageEffects(EStage stage, CommandBuffer cb) { }
+
+ public virtual void BeforeEverything(EStage stage, CommandBuffer cb) { }
+ public virtual void AfterEverything(EStage stage, CommandBuffer cb) { }
+
+ public virtual bool CanDestroy() { return false; }
+
+ public virtual void OnDestroy() { }
+
+ // 角色渲染完毕
+ public virtual void OnRenderFinish()
+ {
+ ReleaseAllInUsedMaterials();
+ }
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs.meta b/Erika/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs.meta new file mode 100644 index 00000000..d0d0d81b --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 548560041d20266478078df50edab4e9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs new file mode 100644 index 00000000..db0c1956 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs @@ -0,0 +1,86 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+public class LensEffect_BlurRim : LensEffectBase
+{
+ public override ERenderingEvent renderingEvents => ERenderingEvent.AfterForwardOpaque;
+
+ Color rimColor;
+ int tempID;
+
+ public LensEffect_BlurRim(Color color) : base()
+ {
+ rimColor = color;
+ tempID = Shader.PropertyToID("_BlurRim_RT0");
+ }
+
+ public override void AfterForwardOpaque(EStage stage, CommandBuffer cb)
+ {
+ if (stage == EStage.BeforeIterate)
+ {
+ Before(cb); + }
+ else if (stage == EStage.Iterate)
+ {
+ Iterate(cb); + }
+ else if (stage == EStage.AfterIterate)
+ {
+ After(cb); + }
+ else if (stage == EStage.FinishRender)
+ {
+ }
+ }
+
+ void Before(CommandBuffer cb)
+ {
+ cb.GetTemporaryRT(tempID, -1, -1, 24, FilterMode.Bilinear);
+ cb.SetRenderTarget(tempID);
+ cb.ClearRenderTarget(true, true, new Color(0, 0, 0, 0));
+ }
+
+ void Iterate(CommandBuffer cb)
+ {
+ Matrix4x4 obj2Wod = Matrix4x4.identity;
+ int subMeshCount = 0;
+ if (curBodypartRenderer.renderer is SkinnedMeshRenderer)
+ {
+ SkinnedMeshRenderer smr = curBodypartRenderer.renderer as SkinnedMeshRenderer;
+ Vector3 pos = smr.rootBone.transform.position;
+ Quaternion rot = smr.rootBone.transform.rotation;
+ obj2Wod = MatrixUtility.RotateAndTranslate(pos, rot);
+ obj2Wod = Matrix4x4.Translate(new Vector3(1, 0, 0)) * obj2Wod;
+ subMeshCount = smr.sharedMesh.subMeshCount;
+ }
+ else if (curBodypartRenderer.renderer is MeshRenderer)
+ {
+ obj2Wod = curBodypartRenderer.renderer.transform.localToWorldMatrix;
+ obj2Wod = Matrix4x4.Translate(new Vector3(1, 0, 0)) * obj2Wod;
+ subMeshCount = curBodypartRenderer.renderer.GetComponent<MeshFilter>().sharedMesh.subMeshCount;
+ }
+
+ for (int i = 0; i < subMeshCount; ++i)
+ {
+ MaterialEntry mat = GetTempMaterial(StaticDefine.shaders[EShader.SolidColor].name);
+ mat.material.SetColor("_Color", rimColor);
+ mat.material.SetMatrix("_ObjectToWorld", obj2Wod);
+ mat.material.SetTexture("_MainTex", curBodypartRenderer.renderer.sharedMaterial.GetTexture("_MainTex"));
+ cb.DrawRenderer(curBodypartRenderer.renderer, mat.material, i);
+ }
+ }
+
+ void After(CommandBuffer cb)
+ {
+ MaterialEntry blur = GetTempMaterial(StaticDefine.shaders[EShader.Blur].name);
+
+ Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);
+ blur.material.SetVector("_UnitTileOffset", tileOffset);
+
+ cb.Blit(tempID, BuiltinRenderTextureType.CameraTarget, blur.material);
+ cb.ReleaseTemporaryRT(tempID);
+ }
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs.meta b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs.meta new file mode 100644 index 00000000..3a2e02ef --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f49dbf9002764be4aa6ca79b78052d7a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs new file mode 100644 index 00000000..252efc6e --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; + +// 蜂鸣 +public class LensEffect_Buzz : LensEffectBase +{ + public override ERenderingEvent renderingEvents => ERenderingEvent.AfterForwardAlpha; + + public LensEffect_Buzz() : base() + { + + } + + public override void AfterForwardAlpha(EStage stage, CommandBuffer cb) + { + if (stage == EStage.BeforeIterate) + { + Before(cb); + } + else if (stage == EStage.AfterIterate) + { + After(cb); + } + } + + void Before(CommandBuffer cb) + { + MaterialEntry buzz = GetTempMaterial(StaticDefine.shaders[EShader.Buzz].name); + + cb.SetGlobalTexture("_UnitDepthTexture", owner.unitPreprocessing.unitDepthTexture); + cb.Blit(BuiltinRenderTextureType.CameraTarget, BuiltinRenderTextureType.CameraTarget, buzz.material); + } + + void After(CommandBuffer cb) + { + + } + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs.meta b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs.meta new file mode 100644 index 00000000..24b527a2 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d76bd4e3298fc574e9f90efa626f6e17 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs new file mode 100644 index 00000000..d5d368d0 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs @@ -0,0 +1,94 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; + +public class LensEffect_Dash : LensEffectBase +{ + public override ERenderingEvent renderingEvents => ERenderingEvent.AfterForwardOpaque; + + Color rimColor; + int tempID; + float lifeTime;
+ UnitSnapshot snapshot;
+ TRS trs;
+ float angle;
+
+ float curTime = 0;
+
+ public LensEffect_Dash(Color color, float lifeTime, float angle, UnitSnapshotInfo snapshot) : base() + { + rimColor = color; + tempID = Shader.PropertyToID("RT_Dash"); + this.lifeTime = lifeTime;
+ trs = snapshot.trs;
+ this.snapshot = UnitManager.Instance.ClaimSnapshotSolo(snapshot);
+ this.angle = angle;
+ } + + public override void AfterForwardOpaque(EStage stage, CommandBuffer cb) + { + if (stage == EStage.BeforeIterate) + { + Before(cb); + } + else if (stage == EStage.AfterIterate) + { + After(cb); + } + else if (stage == EStage.FinishRender) + { + } + } + + void Before(CommandBuffer cb) + {
+ cb.GetTemporaryRT(tempID, -1, -1, 24, FilterMode.Bilinear); + cb.SetRenderTarget(tempID); + cb.ClearRenderTarget(true, true, new Color(0, 0, 0, 0));
+
+ // renderer
+ snapshot.transform.position = trs.position;
+ snapshot.transform.rotation = trs.rotation;
+ snapshot.transform.localScale = trs.scale;
+
+ Matrix4x4 obj2Wod = Matrix4x4.identity;
+ SkinnedMeshRenderer smr = snapshot.renderers[0] as SkinnedMeshRenderer;
+ Vector3 pos = smr.rootBone.transform.position;
+ Quaternion rot = smr.rootBone.transform.rotation;
+ obj2Wod = MatrixUtility.RotateAndTranslate(pos, rot);
+
+ MaterialEntry mat = GetTempMaterial(StaticDefine.shaders[EShader.SolidColor].name);
+ mat.material.SetColor("_Color", rimColor);
+ mat.material.SetMatrix("_ObjectToWorld", obj2Wod);
+ mat.material.SetTexture("_MainTex", snapshot.renderers[0].sharedMaterial.GetTexture("_MainTex"));
+
+ cb.DrawRenderer(snapshot.renderers[0], mat.material);
+ } + + void After(CommandBuffer cb) + {
+ curTime += Time.deltaTime;
+
+ MaterialEntry blur = GetTempMaterial(StaticDefine.shaders[EShader.MotionBlur].name); + + Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, trs.position, 6);
+ blur.material.SetVector("_UnitTileOffset", tileOffset);
+ blur.material.SetFloat("_Angle", angle);
+ blur.material.SetFloat("_AlphaMultiplier", Mathf.Clamp(1 - curTime / lifeTime, 0, 1));
+
+ cb.Blit(tempID, BuiltinRenderTextureType.CameraTarget, blur.material); + cb.ReleaseTemporaryRT(tempID); + }
+
+ public override bool CanDestroy()
+ {
+ return curTime > lifeTime;
+ }
+
+ public override void OnDestroy()
+ {
+ UnitManager.Instance.ReleaseSnapshot(ref snapshot);
+ }
+ +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs.meta b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs.meta new file mode 100644 index 00000000..f0c4f6ab --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3fac41ebc7706eb4abec04ae44602464 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Glitch.cs b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Glitch.cs new file mode 100644 index 00000000..00763a37 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Glitch.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LensEffect_Glitch : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Glitch.cs.meta b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Glitch.cs.meta new file mode 100644 index 00000000..88e5b0de --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_Glitch.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 48bd0d7bffad03a44a281ccb6f21f188 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs new file mode 100644 index 00000000..371186d0 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs @@ -0,0 +1,69 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+public class LensEffect_MotionBlur : LensEffectBase
+{
+ int tempID;
+
+ public LensEffect_MotionBlur()
+ {
+ }
+
+ public override ERenderingEvent renderingEvents => ERenderingEvent.AfterImageEffectsOpaque;
+
+ public override void AfterImageEffectsOpaque(EStage stage, CommandBuffer cb)
+ {
+ if (stage == EStage.BeforeIterate)
+ {
+ 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)); + }
+ else if(stage == EStage.Iterate)
+ {
+ Matrix4x4 obj2Wod = Matrix4x4.identity;
+ int subMeshCount = 0;
+ if (curBodypartRenderer.renderer is SkinnedMeshRenderer)
+ {
+ SkinnedMeshRenderer smr = curBodypartRenderer.renderer as SkinnedMeshRenderer;
+ Vector3 pos = smr.rootBone.transform.position;
+ Quaternion rot = smr.rootBone.transform.rotation;
+ obj2Wod = MatrixUtility.RotateAndTranslate(pos, rot);
+ subMeshCount = smr.sharedMesh.subMeshCount;
+ }
+ else if (curBodypartRenderer.renderer is MeshRenderer)
+ {
+ obj2Wod = curBodypartRenderer.renderer.transform.localToWorldMatrix;
+ subMeshCount = curBodypartRenderer.renderer.GetComponent<MeshFilter>().sharedMesh.subMeshCount;
+ }
+
+ for (int i = 0; i < subMeshCount; ++i)
+ {
+ MaterialEntry mat = GetTempMaterial(StaticDefine.shaders[EShader.SolidColor].name);
+ mat.material.SetColor("_Color", Color.red);
+ mat.material.SetMatrix("_ObjectToWorld", obj2Wod);
+
+ cb.DrawRenderer(curBodypartRenderer.renderer, mat.material, i);
+ } + }
+ else if(stage == EStage.AfterIterate)
+ {
+ MaterialEntry blur = GetTempMaterial(StaticDefine.shaders[EShader.Blur].name);
+
+ Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);
+ blur.material.SetVector("_UnitTileOffset", tileOffset);
+
+ cb.Blit(tempID, BuiltinRenderTextureType.CameraTarget, blur.material);
+ tempID = Shader.PropertyToID("_Temp1");
+ cb.ReleaseTemporaryRT(tempID); + }
+ else if(stage == EStage.FinishRender)
+ {
+ }
+ }
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs.meta b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs.meta new file mode 100644 index 00000000..364e3d30 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 499c4e25bc0f4d641b99f688e91c495f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/LensEffect/RendererProxy.cs b/Erika/Assets/Scripts/Unit/LensEffect/RendererProxy.cs new file mode 100644 index 00000000..17d8d611 --- /dev/null +++ b/Erika/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/Erika/Assets/Scripts/Unit/LensEffect/RendererProxy.cs.meta b/Erika/Assets/Scripts/Unit/LensEffect/RendererProxy.cs.meta new file mode 100644 index 00000000..5f8c904e --- /dev/null +++ b/Erika/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/Erika/Assets/Scripts/Unit/RootMotionProxy.cs b/Erika/Assets/Scripts/Unit/RootMotionProxy.cs new file mode 100644 index 00000000..96bba7ca --- /dev/null +++ b/Erika/Assets/Scripts/Unit/RootMotionProxy.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RootMotionProxy : MonoBehaviour +{ + + private void OnAnimatorMove() + { + } + +} diff --git a/Erika/Assets/Scripts/Unit/RootMotionProxy.cs.meta b/Erika/Assets/Scripts/Unit/RootMotionProxy.cs.meta new file mode 100644 index 00000000..159e22b9 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/RootMotionProxy.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a446cc0f3964e6248b0411882c74ceab +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs b/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs new file mode 100644 index 00000000..437b5b2d --- /dev/null +++ b/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs @@ -0,0 +1,175 @@ +using System; +using System.Collections; +using System.Reflection; +using System.Collections.Generic; +using UnityEngine; + +// 执行帧事件 +[DisallowMultipleComponent] +public partial class TimelineEventProxy +{
+
+#if UNITY_EDITOR // ActionTool里 + private static GameObject m_Root_Particles; + public static GameObject Root_Particles
+ {
+ get
+ {
+ if (m_Root_Particles == null)
+ {
+ m_Root_Particles = GameObject.Find("Root_Particles");
+ if(m_Root_Particles == null)
+ m_Root_Particles = new GameObject("Root_Particles");
+ }
+ return m_Root_Particles;
+ }
+ }
+ private static GameObject m_Root_Projectiles; + public static GameObject Root_Projectiles
+ {
+ get
+ {
+ m_Root_Projectiles = GameObject.Find("Root_Projectiles");
+ if (m_Root_Projectiles == null)
+ m_Root_Projectiles = new GameObject("Root_Projectiles");
+ return m_Root_Projectiles;
+ }
+ } + + public bool isInEditMode;
+
+ public delegate void RegisterProjectileHandle(Projectile projectile);
+ public RegisterProjectileHandle registerProjectile;
+
+ public delegate void RegisterParticleSystemHandle(FxClear vfx);
+ public RegisterParticleSystemHandle registerParticleSystem;
+#endif +
+ // 不要序列化枚举值，因为可能会随时更改
+ public enum EEventType + {
+ EventGame_TimeScale, // 缩放时间
+
+ EventMesh_ImageEffect_MotionBlur, // 运动模糊 + EventMesh_ImageEffect_Glitch, // glitch
+
+ EventMesh_LensEffect_Bloom, // bloom
+ EventMesh_LensEffect_MotionBlur, // motionBlur
+ EventMesh_LensEffect_Dash, // dash
+
+ EventMesh_PostEffect_Curly, //
+
+ EventMesh_AfterImage, // 角色残像
+ EventMesh_AfterImageStop, // 角色残像停止事件
+ EventMesh_FadeIn, // 角色透明度
+ EventMesh_FadeOut, // 角色透明度 + EventMesh_Gloss, // 角色泛光
+ EventMesh_VisibilityInMainCamera, // 是否在主相机渲染 + + EventUnit_SetPosition, // 设置位置
+ EventUnit_BulletTime, // 子弹时间 +
+ EventCamera_Zoom, // 相机聚焦 + EventCamera_Shake, // 相机晃动 + EventCamera_Blur, // 相机模糊 + EventCamera_WhiteOut, // 相机白屏 +
+ EventEnv_Dark, + EventEnv_Exposure, + + EventUI_Drift, // + EventUI_Blur, // + + EventProjectile, // 发射体 + EventEffect, // 特效 + EventSound, // 音效 + } + + public const int FPS = 30; // timeline 每秒采样30次 + + private int m_PrevFrame = -1; + + private Transform m_Root; + + private Transform m_UnitModel; // 模型的Unit prefab,默认是m_Root的第一个子节点 + + public UnitController owner { get; private set; }
+ + private UnitAnimation m_UnitAnimation { get { return owner.unitAnimation; } } + + private AnimationData m_PrevAnimationData;
+
+ public TimelineEventProxy( UnitController owner) + {
+ this.owner = owner;
+ m_Root = owner.transform; + m_PrevAnimationData = null; + m_UnitModel = m_Root.GetChild(0); + } + + public TimelineEventProxy(Transform root)
+ {
+ m_Root = root;
+ m_PrevAnimationData = null; + m_UnitModel = m_Root.GetChild(0); + } + + public static Type GetTypeByName(string name) + { + Type type = Type.GetType(name); + return type; + } + + public void ResetPrevAnimationData()
+ {
+ m_PrevAnimationData = null;
+ } + + public void ExecuteAnimationEvents(AnimationData animData, float animFrame) + { + if (animData == null) + return;
+
+ int frame = (int)animFrame; + if (m_PrevAnimationData != animData)
+ {
+ m_PrevFrame = frame;
+ m_PrevAnimationData = animData; + }
+ if (frame != m_PrevFrame) + { + for (int i = m_PrevFrame + 1; i <= frame; i++) + { + List<int> framesHasEvent = animData.GetAnimationEventFrameIndices(); + if (framesHasEvent.Contains(i)) + { + List<AnimationEventBase> events = animData.GetAnimationEventsAtFrame(i); + ExecuteEvents(events); + ListPool<AnimationEventBase>.Release(events); + } + ListPool<int>.Release(framesHasEvent); + } + } + m_PrevFrame = frame; + }
+
+ void ExecuteEvents(List<AnimationEventBase> events)
+ {
+ if (events == null || events.Count == 0)
+ return;
+ foreach (var e in events)
+ {
+ string name = e.type.ToString();
+ MethodInfo method = GetType().GetMethod(name, BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(AnimationEventBase) }, null);
+ if (method != null)
+ {
+ object[] param = new object[] { e };
+ method.Invoke(this, param);
+
+ if(owner != null)
+ owner.onTimelineEvent(e);
+ }
+ }
+ }
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs.meta b/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs.meta new file mode 100644 index 00000000..c311d274 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 893827f42c99cd849987e51e6af8820d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs b/Erika/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs new file mode 100644 index 00000000..cc352324 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs @@ -0,0 +1,203 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// Timeline Event Handlers +public partial class TimelineEventProxy +{ + + void EventEffect(AnimationEventBase animEvent) + { + EventEffect effect = animEvent as EventEffect; + if (effect == null) + return; + string path = effect.effectPath; + if (path == null || path == "") + return; + GameObject prefab = ResourceManager.Instance.LoadAsset<GameObject>(path); + if (prefab != null) + { + GameObject root = new GameObject(); + + GameObject go = GameObject.Instantiate(prefab); + go.transform.SetParent(root.transform); + FxClear onClear = root.AddComponent<FxClear>(); + onClear.gameObject.name = prefab.name + "(Clone)"; + + PlayEffectInfo info = new PlayEffectInfo(); + info.path = path; + info.playEffectType = EffectPlayTypes.Oneshot; + info.posOffset = effect.position; + info.rot = effect.rotation; + info.scale = effect.scale; + info.bAttached = effect.attached; + if (effect.attached) + { + if (effect.parentNode == global::EventEffect.EParentNode.Unit) + { + info.rootTr = m_Root; + } + else if(effect.parentNode == global::EventEffect.EParentNode.World)
+ {
+ info.rootTr = null;
+ } + else if (effect.parentNode == global::EventEffect.EParentNode.Bone) + { + if (m_UnitModel != null) + { + info.rootTr = m_UnitModel.Find(effect.bonePath); + } + } + else if(effect.parentNode == global::EventEffect.EParentNode.PresetBone) + { + if(m_UnitModel != null) + { + UnitDetail detail = m_UnitModel.GetComponent<UnitDetail>(); + if(detail) + { + info.rootTr = detail.GetBone(effect.bone); + } + } + } + else if(effect.parentNode == global::EventEffect.EParentNode.ReferencePoint)
+ {
+ } + } + + onClear.Initialize(info); +#if UNITY_EDITOR + if (isInEditMode && registerParticleSystem != null) + { + registerParticleSystem(onClear); + } + onClear.gameObject.transform.SetParent(Root_Particles.transform); +#endif + } + } + + void EventCamera_Shake(AnimationEventBase animEvent) + { + + } + + void EventProjectile(AnimationEventBase animEvent) + { + EventProjectile e = animEvent as EventProjectile; + if (e == null) + return; + string projectilePath = e.projectilePath; + if (projectilePath == null || projectilePath == "") + return; + GameObject prefab = ResourceManager.Instance.LoadAsset<GameObject>(projectilePath); + if (prefab == null) + { + LogHelper.LogError("缺少对应的projectile, " + projectilePath); + return; + } + if (prefab.GetComponent<Projectile>() == null) + { + LogHelper.LogError("没有projectile脚本"); + return; + } + GameObject obj = GameObject.Instantiate(prefab); + Projectile projectile = obj.GetComponent<Projectile>(); + ProjectileInfo info = new ProjectileInfo(); + info.name = e.name; + info.tag = e.tag; + info.moveType = e.moveType; + info.owner = owner; + info.position = m_Root.transform.position + e.posOffset; + info.rotation = e.rotation; + info.scale = e.scale; + if (owner) + { + info.velocity = owner.transform.rotation * e.velocity; + } + else + { + info.velocity = e.velocity; + } + info.acceleration = e.acceleration; + info.lifetime = e.lifeTime; + info.sparkPath = e.sparkPath; + projectile.Initialize(info); + +#if UNITY_EDITOR + if (isInEditMode && registerProjectile != null) + { + registerProjectile(projectile); + } + obj.transform.SetParent(Root_Projectiles.transform); +#endif + } + + void EventMesh_AfterImage(AnimationEventBase animEvent) + { +#if UNITY_EDITOR + if (isInEditMode) + return; +#endif + EventMesh_AfterImage afterImage = animEvent as EventMesh_AfterImage; + if (afterImage == null) + return; + string avatarPath = owner.unitDetail.afterImageAvatarPath; + GameObject go = ResourceManager.Instance.LoadAsset<GameObject>(avatarPath); + if (go) + { + GameObject instance = GameObject.Instantiate(go); + AfterImageAvatar avatar = instance.GetOrAddComponent<AfterImageAvatar>(); + if (!avatar) + { + GameObject.DestroyImmediate(instance); + return; + } + avatar.Initialize(owner); + } + } + + void EventUnit_SetPosition(AnimationEventBase animEvent) + { + // 在unitState回调里处理 + } + + void EventMesh_VisibilityInMainCamera(AnimationEventBase animEvent)
+ {
+ EventMesh_VisibilityInMainCamera visible = animEvent as EventMesh_VisibilityInMainCamera;
+ if (visible == null)
+ return;
+ if (owner == null || owner.unitRender == null)
+ return;
+ owner.unitRender.SetVisibilityInMainCamera(visible.isVisible);
+ }
+
+ #region Unit Image Effects + void EventMesh_ImageEffect_MotionBlur(AnimationEventBase animEvent)
+ {
+ EventMesh_ImageEffect_MotionBlur motionBlur = animEvent as EventMesh_ImageEffect_MotionBlur;
+ if (motionBlur == null)
+ return ;
+ if (owner == null || !(owner is PCController))
+ return;
+ float angle = motionBlur.angle;
+ angle = owner.isTowardRight ? angle : 180 - angle;
+ // ((PCController)owner).unitImageEffect.ShowMotionBlur(motionBlur.lifeTime, angle, motionBlur.distance);
+ ((PCController)owner).unitImageEffect.ShowGlitch(motionBlur.lifeTime);
+ }
+
+ #endregion +
+ #region Lens Effect
+
+ void EventMesh_LensEffect_Dash(AnimationEventBase animEvent)
+ {
+ EventMesh_LensEffect_Dash dashinfo = animEvent as EventMesh_LensEffect_Dash;
+ if (dashinfo == null)
+ return;
+
+ UnitSnapshotInfo info = owner.TakeSnapshot();
+ owner.unitLensEffect.Dash(Color.white, dashinfo.lifeTime, dashinfo.angle, info);
+ }
+
+ #endregion
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs.meta b/Erika/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs.meta new file mode 100644 index 00000000..8ac28875 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e3ae1078c8bcc2f4299aaa231266363e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/UnitActionData.cs b/Erika/Assets/Scripts/Unit/UnitActionData.cs new file mode 100644 index 00000000..8a06a249 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitActionData.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[Serializable] +public class TriggerAnimationDictionary : SerializableDictionary<string/*override clip name\state name*/, AnimationClip> { } + +// 配置角色的动画 +[CreateAssetMenu(fileName = "Unit Action Data")] +public class UnitActionData : ScriptableObject +{ + public TriggerAnimationDictionary actions; + + +} diff --git a/Erika/Assets/Scripts/Unit/UnitActionData.cs.meta b/Erika/Assets/Scripts/Unit/UnitActionData.cs.meta new file mode 100644 index 00000000..ed3d6b70 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitActionData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 34c4f0be042b58840bbd5f39068e5007 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/UnitData.cs b/Erika/Assets/Scripts/Unit/UnitData.cs new file mode 100644 index 00000000..81921d2f --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitData.cs @@ -0,0 +1,10 @@ +using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UnitData : ScriptableObject
+{
+ public List<AnimationData> animations;
+
+}
diff --git a/Erika/Assets/Scripts/Unit/UnitData.cs.meta b/Erika/Assets/Scripts/Unit/UnitData.cs.meta new file mode 100644 index 00000000..fdd22280 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3517d9ffab3b50f4d97c6a1db74fff11 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/UnitDetail.cs b/Erika/Assets/Scripts/Unit/UnitDetail.cs new file mode 100644 index 00000000..c57b87b5 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitDetail.cs @@ -0,0 +1,218 @@ +using System; +using UnityEngine.Serialization; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public enum EUnitBone +{ + Hips = 0, // 盆骨 + Spine , // 脊柱 + Chest , // 胸腔 + UpperChest , // + Neck , + Head , + LEye , + REye , + Jaw , + + LShoulder = 20, + LUpperArm, + LLowerArm, + LHand, + LFinger00, + LFinger01, + LFinger02, + LFinger10, + LFinger11, + LFinger12, + LFinger20, + LFinger21, + LFinger22, + LFinger30, + LFinger31, + LFinger32, + LFinger40, + LFinger41, + LFinger42, + + RShoulder = 40, + RUpperArm, + RLowerArm, + RHand, + RFinger00, + RFinger01, + RFinger02, + RFinger10, + RFinger11, + RFinger12, + RFinger20, + RFinger21, + RFinger22, + RFinger30, + RFinger31, + RFinger32, + RFinger40, + RFinger41, + RFinger42, + + LUpperLeg = 60, // 大腿 + LLowerLeg, // 小腿肚 + LFoot, // 左脚 + LToes, // 脚趾 + //LToe0, // 脚趾0 + //LToe1, // 脚趾1 + //LToe2, // 脚趾2 + //LToe3, // 脚趾3 + //LToe4, // 脚趾4 + + RUpperLeg = 80, // 大腿 + RLowerLeg, // 小腿肚 + RFoot, // 左脚 + RToes, // 脚趾 + //RToe0, // 脚趾0 + //RToe1, // 脚趾1 + //RToe2, // 脚趾2 + //RToe3, // 脚趾3 + //RToe4, // 脚趾4 + +} + +[Serializable] +public class UnitBoneDictionary : SerializableDictionary<EUnitBone, Transform> { } + +public enum EUnitReferencePoint
+{
+ None = 0,
+
+ Gunpoint = 1, // 枪口
+ Gunpoint2, // 枪口
+
+ SwordTop = 20, // 剑尖端
+ SwordBottom, // 剑底端
+
+ HitpointHead = 40,
+ HitpointHeadFront,
+ HitpointHeadBack,
+ HitpointNeck,
+ HitpointUpperBody,
+ HitpointUpperBodyFront,
+ HitpointUpperBodyBack,
+ HitpointLowerBody,
+ HitpointLowerBodyFront,
+ HitpointLowerBodyBack,
+
+ GrabpointChest = 60, // 被抓取的时候的挂点
+ GrabpointHead,
+ GrabpointLeg,
+
+} + +[Serializable] +public class UnitReferencePointDictionary : SerializableDictionary<EUnitReferencePoint, Transform> { } + +public enum EBodyPart
+{
+ Body = 0, // main body
+ Sword = 1,
+} + +[Serializable] +public class BodyPartRenderer
+{
+ [SerializeField] public EBodyPart tag;
+ [SerializeField] public Renderer renderer;
+} + +public interface IBodyRendererAgent
+{
+ BodyPartRenderer mainRenderer { get; }
+ BodyPartRenderer[] renderers { get; }
+} + +public interface IBodyJointAgent
+{
+ UnitBoneDictionary bones { get; }
+ UnitReferencePointDictionary referencePoints { get; }
+} + +// 角色的prefab附加数据 +// * afterimage的prefab +// * 骨骼映射 +// * 武器 +[DisallowMultipleComponent] +public class UnitDetail : MonoBehaviour, IBodyRendererAgent, IBodyJointAgent +{ + public bool showGizmos;
+
+ [FormerlySerializedAs("root")] + public Transform rootBone; + + [Tooltip("残影用的prefab")] + public string afterImageAvatarPath;
+
+ [Tooltip("Snapshot用的prefab")] + public string snapshotAvatarPath;
+
+ UnitBoneDictionary IBodyJointAgent.bones { get { return m_Bones; } }
+ [FormerlySerializedAs("bones")] + public UnitBoneDictionary m_Bones;
+
+ UnitReferencePointDictionary IBodyJointAgent.referencePoints { get { return m_ReferencePoints; } }
+ [FormerlySerializedAs("referencePoints")] + public UnitReferencePointDictionary m_ReferencePoints;
+
+ public float snapshotBound;
+
+ BodyPartRenderer IBodyRendererAgent.mainRenderer { get { return m_MainRenderer; } }
+ [SerializeField] private BodyPartRenderer m_MainRenderer;
+ BodyPartRenderer[] IBodyRendererAgent.renderers { get { return m_Renderers; } }
+ [SerializeField] private BodyPartRenderer[] m_Renderers;
+
+ public Vector3 center
+ {
+ get
+ {
+ if (m_MainRenderer == null || m_MainRenderer.renderer == null)
+ return Vector3.zero ;
+ return m_MainRenderer.renderer.bounds.center;
+ }
+ }
+
+ public UnitDetail() + {
+ m_Bones = new UnitBoneDictionary(); + foreach(EUnitBone e in Enum.GetValues(typeof(EUnitBone))) + {
+ m_Bones.Add(e, null); + } + } + + public Transform GetBone(EUnitBone bone) + { + if (m_Bones.ContainsKey(bone)) + return m_Bones[bone]; + return null; + } + + public bool HasBone(EUnitBone bone) + { + return m_Bones.ContainsKey(bone); + } + + private void OnDrawGizmos()
+ {
+ if (!showGizmos)
+ return;
+ Gizmos.DrawWireCube(center, new Vector3(snapshotBound, snapshotBound, 0));
+ } + + IEnumerator GetRenderers()
+ {
+ for(int i = 0; i < m_Renderers.Length; ++i)
+ {
+ yield return m_Renderers[i].renderer;
+ }
+ } + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/UnitDetail.cs.meta b/Erika/Assets/Scripts/Unit/UnitDetail.cs.meta new file mode 100644 index 00000000..f004ea18 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitDetail.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 75a2e2ebdc58ab940858d821f8a1ffa0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/UnitRootMotion.cs b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs new file mode 100644 index 00000000..5234daab --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs @@ -0,0 +1,127 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+// 同步root motion到角色根节点
+[DisallowMultipleComponent]
+public class UnitRootMotion : UnitComponent
+{
+ RootMotionData m_RootMotionData;
+
+ float m_PrevFrame;
+ AnimationData m_PrevAnimationData;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ m_PrevFrame = 0;
+ m_PrevAnimationData = null;
+ }
+
+#if false // 用自定义root motion
+
+ private float m_PrevNormalTime;
+
+ Dictionary<UnitAnimation.EAnimState, RootMotionData> m_RootMotionDic = new Dictionary<UnitAnimation.EAnimState, RootMotionData>();
+
+ public void Reset()
+ {
+ m_PrevNormalTime = 0;
+ }
+
+ public override void OnUpdate()
+ {
+ base.OnUpdate();
+
+ var state = m_Owner.unitAnimation.curState;
+ float playbackTime = m_Owner.unitAnimation.playbackTime;
+
+ var rootMotion = m_RootMotionDic[state];
+ float normalTime = (playbackTime % rootMotion.animationLength) / rootMotion.animationLength;
+
+ if (m_PrevNormalTime > normalTime)
+ m_PrevNormalTime = 0;
+
+ m_Owner.transform.position += rootMotion.GetRootMotionDistance(m_PrevNormalTime, normalTime);
+ m_PrevNormalTime = normalTime;
+ }
+
+ public void SetUpRootMotion(string unitFolder, UnitActionData actions)
+ {
+ if (actions == null)
+ return;
+
+ foreach (var action in actions.actions)
+ {
+#if UNITY_EDITOR
+ AnimationClip clip = action.Value;
+ string name = clip.name;
+ string path = unitFolder + "RootMotion/" + name + ".asset";
+ RootMotionData data = AssetDatabase.LoadAssetAtPath<RootMotionData>(path);
+ m_RootMotionDic.Add(action.Key, data);
+#endif
+ }
+ }
+
+#else
+
+ public override void OnUpdate()
+ {
+ base.OnUpdate();
+ }
+
+ public void OnAnimationChange()
+ {
+ m_PrevAnimationData = null;
+ }
+
+ public void UpdateRootMotion()
+ {
+ bool overrideRootMotion = m_Owner.unitAnimation.baseLayer.animationData.overrideRootMotion;
+ if(overrideRootMotion)
+ {
+ var baseLayer = m_Owner.unitAnimation.baseLayer;
+ var rmData = m_Owner.unitAnimation.baseLayer.animationData.rootMotionOverrideData;
+ float frame = baseLayer.playbackNormalizedTime * baseLayer.clipInfo.clip.length * TimelineEventProxy.FPS;
+ var animData = m_Owner.unitAnimation.baseLayer.animationData;
+ if(animData != m_PrevAnimationData)
+ {
+ m_PrevAnimationData = animData;
+ m_PrevFrame = frame;
+ }
+ if (m_PrevFrame > frame)
+ m_PrevFrame = frame;
+ Vector3 dest = rmData.GetRootMotionDistance(m_PrevFrame, frame);
+ Vector3 realDest = m_Owner.transform.rotation * dest;
+ if(animData.GetProperty(EAnimationProperty.ORMEnforcement) != 0)
+ {
+ if(m_Owner.transform.position.y + realDest.y < 0)
+ realDest.y = 0;
+ }
+ m_Owner.transform.position += realDest;
+
+ m_PrevFrame = frame;
+ }
+ else
+ {
+ // 因为Unti被旋转了90度，所以这里的deltaPosition的forward是x方向了
+ Vector3 dest = m_Owner.unitAnimation.animator.deltaPosition;
+ dest.z = 0;
+ var state = m_Owner.unitAnimation.baseLayer.stateInfo;
+ bool ignoreY = m_Owner.unitAnimation.baseLayer.animationData.GetProperty(EAnimationProperty.IgnoreY, 0) != 0;
+ if (state.IsTag("IgnoreY") || ignoreY)
+ {
+ dest.y = 0;
+ }
+ //m_Owner.transform.position += RootMotionUtility.ExchangeXZ(dest); // 不需要exchangeXZ
+ m_Owner.transform.position += dest;
+ }
+ }
+
+#endif
+
+}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/UnitRootMotion.cs.meta b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs.meta new file mode 100644 index 00000000..42622b66 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 05efd5500263f8b4083c459be5fb763d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/UnitSnapshot.cs b/Erika/Assets/Scripts/Unit/UnitSnapshot.cs new file mode 100644 index 00000000..f43189cb --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitSnapshot.cs @@ -0,0 +1,55 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+ +// 保存当前角色的快照 +public struct UnitSnapshotInfo +{
+ public UnitController unit;
+
+ public int animStateHash;
+
+ public float normalizedTime;
+
+ public TRS trs;
+
+}
+
+// 角色快照，用于lens effect
+public class UnitSnapshot : MonoBehaviour
+{
+ [HideInInspector]
+ public UnitController owner;
+ public Animator animator;
+ public Renderer[] renderers;
+
+ public bool active
+ {
+ get
+ {
+ return this.gameObject.activeSelf;
+ }
+ set
+ {
+ this.gameObject.SetActive(value);
+ }
+ }
+
+ public void Initialize(UnitController prototype)
+ {
+ owner = prototype;
+ animator.runtimeAnimatorController = prototype.unitAnimation.animator.runtimeAnimatorController;
+ animator.speed = 0;
+ }
+
+ public void ApplySnapshot(UnitSnapshotInfo info)
+ {
+ active = true;
+ animator.speed = 0.02f;
+ animator.Play(info.animStateHash, 0, info.normalizedTime);
+ animator.Update(1 / 60f);
+ animator.speed = 0;
+ active = false;
+ }
+
+}
diff --git a/Erika/Assets/Scripts/Unit/UnitSnapshot.cs.meta b/Erika/Assets/Scripts/Unit/UnitSnapshot.cs.meta new file mode 100644 index 00000000..31c837aa --- /dev/null +++ b/Erika/Assets/Scripts/Unit/UnitSnapshot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d63b30ef896f0a548865db54d2bdbbeb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: |