|
|
@@ -49,7 +49,7 @@ public class Monkey : Enemy
|
|
|
return;
|
|
|
}
|
|
|
ChangeMonkeyState(MonkeyState.None);
|
|
|
- Debug.Log("常态状态机,从" + state + "切换到" + newState);
|
|
|
+ //Debug.Log("常态状态机,从" + state + "切换到" + newState);
|
|
|
switch (state)
|
|
|
{
|
|
|
case CharacterState.Run:
|
|
|
@@ -101,12 +101,20 @@ public class Monkey : Enemy
|
|
|
currentAnimation = "attack";
|
|
|
break;
|
|
|
case CharacterState.Die:
|
|
|
+ Debug.Log("死亡");
|
|
|
//ani.Play("die", 0, 0);
|
|
|
isWaitTank = false;
|
|
|
ChangeAnimation("die",0);
|
|
|
isDie = true;
|
|
|
dieKeepTime = totalDieKeepTime;
|
|
|
DropSouls();
|
|
|
+ if (killer != null && killer.GetComponent<Demonic>())
|
|
|
+ {
|
|
|
+ SoldierType st = killer.GetComponent<Demonic>().soldierType;
|
|
|
+ SoldierEXP.expInstance.AddEXP(st, (int)(exp * LevelSelect.EXPRatio + 0.5f));
|
|
|
+ }
|
|
|
+ PoolManager.Instantiate(dieEffect, transform.position);
|
|
|
+ gameObject.SetActive(false);
|
|
|
break;
|
|
|
case CharacterState.HitStun:
|
|
|
isWaitTank = false;
|
|
|
@@ -128,7 +136,7 @@ public class Monkey : Enemy
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
- Debug.Log("猴子状态机,从" + monkeyState + "切换到" + newState);
|
|
|
+ //Debug.Log("猴子状态机,从" + monkeyState + "切换到" + newState);
|
|
|
ChangeState(CharacterState.None);
|
|
|
switch (monkeyState)
|
|
|
{
|
|
|
@@ -405,22 +413,22 @@ public class Monkey : Enemy
|
|
|
transform.rotation = targetQt;
|
|
|
}
|
|
|
break;
|
|
|
- case CharacterState.Die:
|
|
|
- if (dieKeepTime <= 0)
|
|
|
- {
|
|
|
- if (killer != null && killer.GetComponent<Demonic>())
|
|
|
- {
|
|
|
- SoldierType st = killer.GetComponent<Demonic>().soldierType;
|
|
|
- SoldierEXP.expInstance.AddEXP(st, (int)(exp * LevelSelect.EXPRatio + 0.5f));
|
|
|
- }
|
|
|
- if (dieEffect)
|
|
|
- {
|
|
|
- PoolManager.Instantiate(dieEffect, transform.position);
|
|
|
- }
|
|
|
- gameObject.SetActive(false);
|
|
|
- break;
|
|
|
- }
|
|
|
- break;
|
|
|
+ //case CharacterState.Die:
|
|
|
+ // if (dieKeepTime <= 0)
|
|
|
+ // {
|
|
|
+ // if (killer != null && killer.GetComponent<Demonic>())
|
|
|
+ // {
|
|
|
+ // SoldierType st = killer.GetComponent<Demonic>().soldierType;
|
|
|
+ // SoldierEXP.expInstance.AddEXP(st, (int)(exp * LevelSelect.EXPRatio + 0.5f));
|
|
|
+ // }
|
|
|
+ // if (dieEffect)
|
|
|
+ // {
|
|
|
+ // PoolManager.Instantiate(dieEffect, transform.position);
|
|
|
+ // }
|
|
|
+ // gameObject.SetActive(false);
|
|
|
+ // break;
|
|
|
+ // }
|
|
|
+ // break;
|
|
|
case CharacterState.HitStun:
|
|
|
hitFeedbackSystem.HitStunUpdate();
|
|
|
break;
|
|
|
@@ -452,7 +460,6 @@ public class Monkey : Enemy
|
|
|
// break;
|
|
|
// }
|
|
|
//}
|
|
|
- Debug.Log(111);
|
|
|
velocity.x = -escapeSpeed;
|
|
|
if (bodyTrans.localScale.x < 0)
|
|
|
{
|