diff options
Diffstat (limited to 'Assets/Scripts')
23 files changed, 279 insertions, 57 deletions
diff --git a/Assets/Scripts/Avatar.meta b/Assets/Scripts/Avatar.meta index 11b04f5f..0819432c 100644 --- a/Assets/Scripts/Avatar.meta +++ b/Assets/Scripts/Avatar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10a2e913d181351499510c4c95e3eaae +guid: 01431b5a11017ed49a2687d2ebc20e69 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Avatar/Abilities/AttackAbility.cs b/Assets/Scripts/Avatar/Abilities/AttackAbility.cs index 9ca52a4c..117dca7e 100644 --- a/Assets/Scripts/Avatar/Abilities/AttackAbility.cs +++ b/Assets/Scripts/Avatar/Abilities/AttackAbility.cs @@ -15,18 +15,15 @@ public class AttackAbility : AbilityBase {
AttackAbilityConfig m_Config = new AttackAbilityConfig();
- /// <summary>
- /// 在跑动状态时可以切换的ability
- /// </summary>
private List<Trigger> m_Triggers = new List<Trigger>();
private List<Trigger> m_LateTriggers = new List<Trigger>();
- /// <summary>
- /// 这个招式所有hit的效果
- /// </summary>
- public HitDefination[] HitDef;
-
+ /// <summary>
+ /// 这个招式产生的hit
+ /// </summary>
+ private List<HitInfo> m_HitInfo = new List<HitInfo>();
+
/// <summary>
/// 从动画结束开始计时
/// </summary>
@@ -46,7 +43,7 @@ public class AttackAbility : AbilityBase {
get
{
- return HitDef != null ? HitDef.Length : 0;
+ return m_HitInfo != null ? m_HitInfo.Count : 0;
}
}
diff --git a/Assets/Scripts/Avatar/Abilities/JumpAbility.cs b/Assets/Scripts/Avatar/Abilities/JumpAbility.cs index e0f73efa..5e953403 100644 --- a/Assets/Scripts/Avatar/Abilities/JumpAbility.cs +++ b/Assets/Scripts/Avatar/Abilities/JumpAbility.cs @@ -20,19 +20,23 @@ public struct JumpAbilityConfig public int animFD;
public int animBD;
public int animJumpEnd;
+
+ public bool skipStart; //没有准备动作
} public class JumpAbility : AbilityBase { public enum Direction
{
+ None,
Neutral,
Forward,
Backward
} - private enum State
+ public enum State
{
+ None,
Ready,
Up,
Down,
@@ -66,7 +70,25 @@ public class JumpAbility : AbilityBase int m_CurDownMotion;
Vector3 m_CurInitVelocity;
- private List<Trigger> m_Triggers = new List<Trigger>();
+ public State CurState
+ {
+ get
+ {
+ return m_CurState;
+ }
+ }
+
+ public Direction CurDirection
+ {
+ get
+ {
+ return m_Dir;
+ }
+ }
+
+ private List<Trigger> m_Triggers = new List<Trigger>();
+
+ bool m_SkipStart;
public JumpAbility(JumpAbilityConfig config)
{
@@ -84,7 +106,8 @@ public class JumpAbility : AbilityBase m_AnimJumpBackUpwards = config.animBU;
m_AnimJumpBackDownwards = config.animBD;
m_AnimJumpEnd = config.animJumpEnd; // on ground again
- }
+ m_SkipStart = config.skipStart;
+ }
public void SetDir(Direction dir)
{
@@ -121,9 +144,9 @@ public class JumpAbility : AbilityBase bool isDown = m_Body.Velocity.y < 0;
bool isFreeFall = Mathf.Approximately(m_Body.Velocity.y, 0);
- if (isOnGround)
+ if (isOnGround && !m_SkipStart)
m_CurState = State.Ready;
- else if (isUp)
+ else if (isUp || isOnGround && m_SkipStart)
m_CurState = State.Up;
else if (isDown || isFreeFall)
m_CurState = State.Down;
@@ -149,17 +172,17 @@ public class JumpAbility : AbilityBase }
if(motionInfo.shortNameHash == m_AnimJumpStart && motionInfo.normalizedTime >= 1f)
{
- m_Body.LocalVelocity = m_CurInitVelocity;
m_CurState = State.Up;
}
break;
case State.Up:
if(m_CurAnim != m_CurUpMotion)
{
+ m_Body.LocalVelocity = m_CurInitVelocity;
m_Animator.CrossFade(m_CurUpMotion, 0.2f);
m_CurAnim = m_CurUpMotion;
}
- if(m_Body.Velocity.y <= 0)
+ if(m_Body.Velocity.y < 0)
{
m_CurState = State.Down;
}
@@ -167,7 +190,7 @@ public class JumpAbility : AbilityBase case State.Down:
if(m_CurAnim != m_CurDownMotion)
{
- m_Animator.CrossFade(m_CurDownMotion, 0.2f);
+ m_Animator.CrossFade(m_CurDownMotion, 0.5f);
m_CurAnim = m_CurDownMotion;
}
if(m_Collider.IsOnGround)
@@ -210,12 +233,12 @@ public class JumpAbility : AbilityBase /// 结束
/// </summary>
/// <returns></returns>
- public bool IsJumpDone()
+ public bool IsJumpDone(float t = 1f)
{
if (m_CurState == State.End)
{
AnimatorStateInfo state = m_Animator.GetCurrentAnimatorStateInfo(0);
- return state.shortNameHash == m_AnimJumpEnd && state.normalizedTime >= 1f;
+ return state.shortNameHash == m_AnimJumpEnd && state.normalizedTime >= t;
}
return false;
@@ -237,5 +260,4 @@ public class JumpAbility : AbilityBase m_Triggers.Add(trigger);
}
-
}
\ No newline at end of file diff --git a/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs new file mode 100644 index 00000000..effc3ca7 --- /dev/null +++ b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ActionSetVelocityX : ActionBase +{ + PhysicsBody m_Body; + + float m_VelX; + + public ActionSetVelocityX(PhysicsBody body, float x) + { + m_Body = body; + m_VelX = x; + } + + public override void Execute() + { + Vector3 v = m_Body.Velocity; + v.x = m_VelX; + m_Body.Velocity = v; + } +} diff --git a/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs.meta new file mode 100644 index 00000000..5b39b3ec --- /dev/null +++ b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6130f371839788049b56f4d71468bc51 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions.meta b/Assets/Scripts/Avatar/Conditions.meta index 0bfa1b8d..9ee89e8b 100644 --- a/Assets/Scripts/Avatar/Conditions.meta +++ b/Assets/Scripts/Avatar/Conditions.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2d3b745adf374e14b9f4e095c52ef3d6 +guid: 4564e909667997f48822cb2d05ed360f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs new file mode 100644 index 00000000..9afd68c4 --- /dev/null +++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ConditionCheckJumpState : ConditionBase +{ + JumpAbility m_Ability; + JumpAbility.State m_State; + JumpAbility.Direction m_Direction; + + public ConditionCheckJumpState(JumpAbility ability, JumpAbility.State state = JumpAbility.State.None, JumpAbility.Direction direction = JumpAbility.Direction.None) + { + m_Ability = ability; + m_State = state; + m_Direction = direction; + } + + public override bool Evaluate() + { + if (m_Ability == null) + return false; + if (m_State != JumpAbility.State.None && m_Direction != JumpAbility.Direction.None) + { + return m_Ability.CurState == m_State + && m_Ability.CurDirection == m_Direction; + } + else if (m_State != JumpAbility.State.None && m_Direction == JumpAbility.Direction.None) + { + return m_Ability.CurState == m_State; + } + else if (m_State == JumpAbility.State.None && m_Direction != JumpAbility.Direction.None) + { + return m_Ability.CurDirection == m_Direction; + } + else + return false; + } +} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta new file mode 100644 index 00000000..aefa0807 --- /dev/null +++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d7c948fe9eefbd14d9137b19e92e1fc4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs index 8d900348..1f213a50 100644 --- a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs +++ b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs @@ -5,14 +5,16 @@ using UnityEngine; public class ConditionJumpDone : ConditionBase
{
JumpAbility m_Jump;
+ float m_T;
- public ConditionJumpDone(JumpAbility jump)
+ public ConditionJumpDone(JumpAbility jump, float t = 1f)
{
m_Jump = jump;
- }
+ m_T = t;
+ }
public override bool Evaluate()
{
- return m_Jump.IsJumpDone();
+ return m_Jump.IsJumpDone(m_T);
}
}
diff --git a/Assets/Scripts/Avatar/HitDef.cs b/Assets/Scripts/Avatar/HitDef.cs deleted file mode 100644 index a0361753..00000000 --- a/Assets/Scripts/Avatar/HitDef.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-// 一个hit的效果，如果一个attack有多个hit，需要定义多个HitDef
-public struct HitDefination
-{
-
-}
diff --git a/Assets/Scripts/Avatar/HitDefination.cs b/Assets/Scripts/Avatar/HitDefination.cs new file mode 100644 index 00000000..1f622b32 --- /dev/null +++ b/Assets/Scripts/Avatar/HitDefination.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// 一个hit的效果，如果一个attack有多个hit，需要定义多个HitDef +public class HitDefination +{ + public float start = 0f; + public float end = 1f; // 触发的开始和结束时间范围，用来处理一个attack多个hit的情况 + + public int effectID = 0; // 特效 + public Transform effectHost = null; // 特效挂点 + public Vector3 effectPosition; // 特效位置（effectHost为空时生效） + public Quaternion effectRotation; // 特效旋转 + public Vector3 effectScale = Vector3.one; // 特效缩放 + + +}
\ No newline at end of file diff --git a/Assets/Scripts/Avatar/HitDef.cs.meta b/Assets/Scripts/Avatar/HitDefination.cs.meta index d542f9ff..d542f9ff 100644 --- a/Assets/Scripts/Avatar/HitDef.cs.meta +++ b/Assets/Scripts/Avatar/HitDefination.cs.meta diff --git a/Assets/Scripts/Avatar/HitInfo.cs b/Assets/Scripts/Avatar/HitInfo.cs new file mode 100644 index 00000000..bdb116eb --- /dev/null +++ b/Assets/Scripts/Avatar/HitInfo.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HitInfo +{ + public HitDefination defination; + + /// <summary> + /// 记录这个hit命中的avatar + /// </summary> + private List<Avatar> m_HitAvatars; + + public void AddRecord(Avatar avatar) + { + if (m_HitAvatars.Contains(avatar)) + m_HitAvatars.Add(avatar); + } + + // 招式结束后，清除记录的avatar + public void WipeRecords() + { + m_HitAvatars.Clear(); + } +} diff --git a/Assets/Scripts/Avatar/HitInfo.cs.meta b/Assets/Scripts/Avatar/HitInfo.cs.meta new file mode 100644 index 00000000..ab541e49 --- /dev/null +++ b/Assets/Scripts/Avatar/HitInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3f1668cf50ed81641a8f344328012e30 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Effects/HairAssignMaterials.cs b/Assets/Scripts/Effects/HairAssignMaterials.cs new file mode 100644 index 00000000..d2b42d05 --- /dev/null +++ b/Assets/Scripts/Effects/HairAssignMaterials.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[ExecuteInEditMode] +public class HairAssignMaterials : MonoBehaviour +{ + public Material material; + + public SkinnedMeshRenderer renderer; + + public int count; + + public void OnEnable() + { + if (renderer == null) + return; + Material[] materials = new Material[count]; + for(int i = 0; i < count;++i) + { + materials[i] = material; + } + renderer.sharedMaterials = materials; + } + +} diff --git a/Assets/Scripts/Effects/HairAssignMaterials.cs.meta b/Assets/Scripts/Effects/HairAssignMaterials.cs.meta new file mode 100644 index 00000000..a4a2c636 --- /dev/null +++ b/Assets/Scripts/Effects/HairAssignMaterials.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 06f8e7dbd5d25034ab87247a8458ed28 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects.meta b/Assets/Scripts/Managers.meta index 17a426dd..08725b58 100644 --- a/Assets/Scripts/Avatar/Actions/ActionEffects.meta +++ b/Assets/Scripts/Managers.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0b5ccfefc2e6b104a8566f4da9a16c5f +guid: 8fa7e6d20cdfaee42b39f1c7f5b5afd6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Physics/PhysicsPrimGroup.cs b/Assets/Scripts/Physics/PhysicsPrimGroup.cs index 4d296ac1..0a79eeff 100644 --- a/Assets/Scripts/Physics/PhysicsPrimGroup.cs +++ b/Assets/Scripts/Physics/PhysicsPrimGroup.cs @@ -16,6 +16,4 @@ public class PhysicsPrimGroup : MonoBehaviour }
}
-
-
}
diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta deleted file mode 100644 index bb96602e..00000000 --- a/Assets/Scripts/Props.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f299520ed9fcf4a45858ad4ef5a8d5d1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Test/SaionjiCloneScript.cs b/Assets/Scripts/Test/SaionjiCloneScript.cs new file mode 100644 index 00000000..d6ddba86 --- /dev/null +++ b/Assets/Scripts/Test/SaionjiCloneScript.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SaionjiCloneScript : MonoBehaviour +{ + public Animator m_Animator; + + public void OnEnable() + { + int Anim_Idle; + Anim_Idle = Animator.StringToHash("Idle_Fight2"); + m_Animator.CrossFade(Anim_Idle, 0); + } + + public void Update() + { + } + +} diff --git a/Assets/Scripts/Test/SaionjiCloneScript.cs.meta b/Assets/Scripts/Test/SaionjiCloneScript.cs.meta new file mode 100644 index 00000000..64a58ee0 --- /dev/null +++ b/Assets/Scripts/Test/SaionjiCloneScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 92d46c9d136abdc46bb8fc83c650891f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs index 32859b8d..8934b5da 100644 --- a/Assets/Scripts/Test/SaionjiScript_Ability.cs +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs @@ -49,17 +49,24 @@ public partial class SaionjiScript : Avatar MoveAbility move = new MoveAbility(animator, Anim_Run);
MoveAbility dash = new MoveAbility(animator, Anim_DashWithSword);
- JumpAbilityConfig jumpConfig = new JumpAbilityConfig();
- jumpConfig.animator = animator;
- jumpConfig.collider = m_BodyCollider;
- jumpConfig.body = m_Body;
- jumpConfig.neutralJumpSpeedY = 10f;
- jumpConfig.fowardJumpSpeedX = 5f;
- jumpConfig.backwardJumpSpeedX = -5f;
- jumpConfig.animJump = Anim_JumpStart;
- jumpConfig.animJumpEnd = Anim_JumpEnd;
- jumpConfig.animNU = Anim_JumpUp;
- jumpConfig.animND = Anim_JumpDown;
+ JumpAbilityConfig jumpConfig = new JumpAbilityConfig
+ {
+ animator = animator,
+ collider = m_BodyCollider,
+ body = m_Body,
+ neutralJumpSpeedY = 13f,
+ fowardJumpSpeedX = 5f,
+ backwardJumpSpeedX = -5f,
+ animJump = Anim_JumpStart,
+ animJumpEnd = Anim_JumpEnd,
+ animNU = Anim_JumpUp,
+ animND = Anim_JumpDown,
+ animFU = Anim_JumpUp,
+ animFD = Anim_JumpDown,
+ animBU = Anim_JumpUp,
+ animBD = Anim_JumpDown,
+ skipStart = true,
+ };
JumpAbility jump = new JumpAbility(jumpConfig);
AttackAbilityConfig config;
@@ -205,8 +212,17 @@ public partial class SaionjiScript : Avatar move.AddTrigger(trigger);
// jump ability
+ ConditionCheckJumpState condCheckJump = new ConditionCheckJumpState(jump, JumpAbility.State.None, JumpAbility.Direction.Neutral);
+ trigger = new Trigger(And(condRightButtonHold, condCheckJump), new List<ActionBase> { towardRight, new ActionSetVelocityX(m_Body, 4)}, TriggerOnlyOnce.Off, TriggerSwallow.Off);
+ jump.AddTrigger(trigger);
+ trigger = new Trigger(And(condLeftButtonHold, condCheckJump), new List<ActionBase> { towardLeft, new ActionSetVelocityX(m_Body,-4) }, TriggerOnlyOnce.Off, TriggerSwallow.Off);
+ jump.AddTrigger(trigger);
+ trigger = new Trigger(Ands(condCheckJump, Not(condRightButtonHold), Not(condLeftButtonHold)), new ActionSetVelocityX(m_Body, 0), TriggerOnlyOnce.Off, TriggerSwallow.Off);
+ jump.AddTrigger(trigger);
trigger = new Trigger(condJumpOnGround, new ActionSetVelocity(m_Body, Vector3.zero), TriggerOnlyOnce.On, TriggerSwallow.Off);
jump.AddTrigger(trigger);
+ trigger = new Trigger(Ands(new ConditionJumpDone(jump, 0.4f), condJumpOnGround, Or(condRightButtonHold, condLeftButtonHold)), switchToMove);
+ jump.AddTrigger(trigger);
trigger = new Trigger(condJumpDone, switchToIdle);
jump.AddTrigger(trigger);
diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs b/Assets/Scripts/Test/SaionjiScript_Anim.cs index 9b7bfca5..4cc729b9 100644 --- a/Assets/Scripts/Test/SaionjiScript_Anim.cs +++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs @@ -52,7 +52,6 @@ public partial class SaionjiScript : Avatar Anim_Gun3 = Animator.StringToHash("Gun03"); Anim_Gun4 = Animator.StringToHash("Gun04"); - Anim_JumpStart = Animator.StringToHash("Jump_Start"); Anim_JumpUp = Animator.StringToHash("Jump_Up"); Anim_JumpDown = Animator.StringToHash("Jump_Down"); |