|
@@ -28,6 +28,7 @@ namespace GameLogic.Combat.CombatTool
|
|
|
|
|
|
private IUnRegister _unRegister;
|
|
|
protected bool _isOne;
|
|
|
+ private bool _isPengZhuang;
|
|
|
|
|
|
protected ParticleSystemPool ParticleSystemPool;
|
|
|
private int triigerCount;
|
|
@@ -49,17 +50,63 @@ namespace GameLogic.Combat.CombatTool
|
|
|
|
|
|
private void OnTriggerEnter(Collider collider, ITriggerEntity triggerEntity)
|
|
|
{
|
|
|
- HeroEntityMono heroEntityMono = collider.GetComponent<HeroEntityMono>();
|
|
|
- if (heroEntityMono == null || (heroEntityMono.combatHeroEntity != b))
|
|
|
- {
|
|
|
- return;
|
|
|
- }
|
|
|
+ // HeroEntityMono heroEntityMono = collider.GetComponent<HeroEntityMono>();
|
|
|
+ // if (heroEntityMono == null || (heroEntityMono.combatHeroEntity != b))
|
|
|
+ // {
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ //
|
|
|
+ // if (State != 1)
|
|
|
+ // {
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ //
|
|
|
+ // if (triigerCount >= 2)
|
|
|
+ // {
|
|
|
+ // MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData =
|
|
|
+ // CObjectPool.Instance.Fetch<MagicWeaponPingDouState.MagicWeaponPingDouData>();
|
|
|
+ // rollingStateData.target = b;
|
|
|
+ //
|
|
|
+ // a.CombatAIBasic.ChangeState(CombatHeroStateType.MagicWeaponPingDou,
|
|
|
+ // rollingStateData);
|
|
|
+ // MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData2 =
|
|
|
+ // CObjectPool.Instance.Fetch<MagicWeaponPingDouState.MagicWeaponPingDouData>();
|
|
|
+ // rollingStateData.target = a;
|
|
|
+ // b.CombatAIBasic.ChangeState(CombatHeroStateType.MagicWeaponPingDou,
|
|
|
+ // rollingStateData2);
|
|
|
+ // State = 2;
|
|
|
+ // _currTime = 0;
|
|
|
+ // CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_fb_duipin_dian",
|
|
|
+ // a.dotPos, null, false, null, delegate(ParticleSystemPool particleSystemPool)
|
|
|
+ // {
|
|
|
+ // particleSystemPool.transform.rotation =
|
|
|
+ // a.GameObject.transform.rotation;
|
|
|
+ // ParticleSystemPool = particleSystemPool;
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_fb_duipin_hit",
|
|
|
+ // collider.transform.position, null, false, null, delegate(ParticleSystemPool particleSystemPool)
|
|
|
+ // {
|
|
|
+ // particleSystemPool.transform.rotation =
|
|
|
+ // a.GameObject.transform.rotation;
|
|
|
+ // });
|
|
|
+ // triigerCount++;
|
|
|
+ // // a.ReduceHp(40);
|
|
|
+ // // _trigger = true;
|
|
|
+ // // _triggerTime = 0.5f;
|
|
|
+ // }
|
|
|
+ }
|
|
|
|
|
|
- if (State != 1)
|
|
|
+ protected void PongZhuang()
|
|
|
+ {
|
|
|
+ if (State != 1||_isPengZhuang)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ _isPengZhuang = true;
|
|
|
if (triigerCount >= 2)
|
|
|
{
|
|
|
MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData =
|
|
@@ -86,7 +133,7 @@ namespace GameLogic.Combat.CombatTool
|
|
|
else
|
|
|
{
|
|
|
CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_fb_duipin_hit",
|
|
|
- collider.transform.position, null, false, null, delegate(ParticleSystemPool particleSystemPool)
|
|
|
+ a.dotPos, null, false, null, delegate(ParticleSystemPool particleSystemPool)
|
|
|
{
|
|
|
particleSystemPool.transform.rotation =
|
|
|
a.GameObject.transform.rotation;
|
|
@@ -188,10 +235,16 @@ namespace GameLogic.Combat.CombatTool
|
|
|
a.GameObject.transform.rotation = Quaternion.LookRotation((a1 - a2).normalized);
|
|
|
b.combatHeroGameObject.SetPosition(b1);
|
|
|
b.GameObject.transform.rotation = Quaternion.LookRotation((b1 - b2).normalized);
|
|
|
+ if (_currTime > 0.48f)
|
|
|
+ {
|
|
|
+ PongZhuang();
|
|
|
+ }
|
|
|
+
|
|
|
if (_currTime >= 1)
|
|
|
{
|
|
|
_currTime = 0;
|
|
|
_isOne = !_isOne;
|
|
|
+ _isPengZhuang = false;
|
|
|
}
|
|
|
}
|
|
|
else if (State == 2)
|