|
@@ -18,6 +18,7 @@ public enum CharacterState
|
|
|
Rush = 9,
|
|
Rush = 9,
|
|
|
Sprint = 10,
|
|
Sprint = 10,
|
|
|
Die = 11,
|
|
Die = 11,
|
|
|
|
|
+ Weak = 12,
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public enum AttackType
|
|
public enum AttackType
|
|
@@ -113,7 +114,7 @@ public class Character : MonoBehaviour
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public virtual void BeHit(int damage, Vector3 force, bool changeHurt, float hurtTime)
|
|
|
|
|
|
|
+ public virtual void BeHit(int damage, Vector3 force, bool changeHurt, float hurtTime, float repelValue)
|
|
|
{
|
|
{
|
|
|
if (invincibleTime > 0)
|
|
if (invincibleTime > 0)
|
|
|
{
|
|
{
|
|
@@ -125,12 +126,7 @@ public class Character : MonoBehaviour
|
|
|
{
|
|
{
|
|
|
rb.AddForce(force);
|
|
rb.AddForce(force);
|
|
|
ChangeState(CharacterState.Die);
|
|
ChangeState(CharacterState.Die);
|
|
|
- }
|
|
|
|
|
- else if (changeHurt)
|
|
|
|
|
- {
|
|
|
|
|
- rb.AddForce(force);
|
|
|
|
|
- hurtKeepTime = hurtTime;
|
|
|
|
|
- ChangeState(CharacterState.Hurt);
|
|
|
|
|
|
|
+ return;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -152,7 +148,7 @@ public class Character : MonoBehaviour
|
|
|
{
|
|
{
|
|
|
attackDir.x = -attackDir.x;
|
|
attackDir.x = -attackDir.x;
|
|
|
}
|
|
}
|
|
|
- bullet.BeShoot(this, shootPos[shootId].position, attackDir, attackInfo.damage, attackInfo.force, attackInfo.changeHurt, attackInfo.hurtTime, shootTrack, attackTarget?attackTarget:null);
|
|
|
|
|
|
|
+ bullet.BeShoot(this, shootPos[shootId].position, attackDir, attackInfo.damage, attackInfo.force, attackInfo.changeHurt, attackInfo.hurtTime, attackInfo.repelValue, shootTrack, attackTarget?attackTarget:null);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public virtual Vector3 GetMoveDir()
|
|
public virtual Vector3 GetMoveDir()
|
|
@@ -190,6 +186,7 @@ public class Character : MonoBehaviour
|
|
|
attackTriggers[i].damage = attack1Infos[i].damage;
|
|
attackTriggers[i].damage = attack1Infos[i].damage;
|
|
|
attackTriggers[i].changeHurt = attack1Infos[i].changeHurt;
|
|
attackTriggers[i].changeHurt = attack1Infos[i].changeHurt;
|
|
|
attackTriggers[i].hurtTime = attack1Infos[i].hurtTime;
|
|
attackTriggers[i].hurtTime = attack1Infos[i].hurtTime;
|
|
|
|
|
+ attackTriggers[i].repelValue = attack1Infos[i].repelValue;
|
|
|
Vector3 attackDir = attack1Infos[i].attackDir.normalized;
|
|
Vector3 attackDir = attack1Infos[i].attackDir.normalized;
|
|
|
if (bodyTrans.localScale.x < 0)
|
|
if (bodyTrans.localScale.x < 0)
|
|
|
{
|
|
{
|
|
@@ -235,6 +232,7 @@ public class Character : MonoBehaviour
|
|
|
attackTriggers[i].damage = attack2Infos[i].damage;
|
|
attackTriggers[i].damage = attack2Infos[i].damage;
|
|
|
attackTriggers[i].changeHurt = attack2Infos[i].changeHurt;
|
|
attackTriggers[i].changeHurt = attack2Infos[i].changeHurt;
|
|
|
attackTriggers[i].hurtTime = attack2Infos[i].hurtTime;
|
|
attackTriggers[i].hurtTime = attack2Infos[i].hurtTime;
|
|
|
|
|
+ attackTriggers[i].repelValue = attack2Infos[i].repelValue;
|
|
|
Vector3 attackDir = attack2Infos[i].attackDir.normalized;
|
|
Vector3 attackDir = attack2Infos[i].attackDir.normalized;
|
|
|
if (bodyTrans.localScale.x < 0)
|
|
if (bodyTrans.localScale.x < 0)
|
|
|
{
|
|
{
|