|
@@ -53,7 +53,7 @@ namespace GameLogic.Combat.Hero
|
|
|
|
|
|
public SkillTurntable SkillTurntable;
|
|
public SkillTurntable SkillTurntable;
|
|
|
|
|
|
-
|
|
|
|
|
|
+
|
|
protected override async CTask ProInit()
|
|
protected override async CTask ProInit()
|
|
{
|
|
{
|
|
SkillTurntable = new SkillTurntable();
|
|
SkillTurntable = new SkillTurntable();
|
|
@@ -64,8 +64,6 @@ namespace GameLogic.Combat.Hero
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
-
|
|
|
|
-
|
|
|
|
await SetNewSkill(PlayerManager.Instance.GongFaControl.allUseSkill);
|
|
await SetNewSkill(PlayerManager.Instance.GongFaControl.allUseSkill);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -93,14 +91,22 @@ namespace GameLogic.Combat.Hero
|
|
SkillInfo skillInfo = new SkillInfo(id, 1);
|
|
SkillInfo skillInfo = new SkillInfo(id, 1);
|
|
skillBasic.InitSkillConfig(_combatHeroEntity, skillInfo);
|
|
skillBasic.InitSkillConfig(_combatHeroEntity, skillInfo);
|
|
taoismSkillBasic = skillBasic;
|
|
taoismSkillBasic = skillBasic;
|
|
- _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(skillConfig.addcd+SkillTurntable.skillAddSkillCd);
|
|
|
|
|
|
+ // _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(skillConfig.addcd+SkillTurntable.skillAddSkillCd);
|
|
TaoismSkillAlterEventData taoismSkillAlterEventData = TaoismSkillAlterEventData.Create();
|
|
TaoismSkillAlterEventData taoismSkillAlterEventData = TaoismSkillAlterEventData.Create();
|
|
taoismSkillAlterEventData.CombatHeroEntity = _combatHeroEntity;
|
|
taoismSkillAlterEventData.CombatHeroEntity = _combatHeroEntity;
|
|
CombatEventManager.Instance.Dispatch(CombatEventType.TaoismSkillAlter, taoismSkillAlterEventData);
|
|
CombatEventManager.Instance.Dispatch(CombatEventType.TaoismSkillAlter, taoismSkillAlterEventData);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (!_combatHeroEntity.IsEnemy)
|
|
|
|
+ {
|
|
|
|
+ float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum * 3;
|
|
|
|
+ _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
|
|
|
|
+ cd + SkillTurntable.skillAddSkillCd);
|
|
|
|
+ }
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(_combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk+SkillTurntable.skillAddSkillCd);
|
|
|
|
|
|
+ _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
|
|
|
|
+ _combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk + SkillTurntable.skillAddSkillCd);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -164,6 +170,7 @@ namespace GameLogic.Combat.Hero
|
|
{
|
|
{
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
+
|
|
if (!_combatHeroEntity.IsEnemy && _combatHeroEntity.CombatAIBasic.currFocusTarget is BannerHero)
|
|
if (!_combatHeroEntity.IsEnemy && _combatHeroEntity.CombatAIBasic.currFocusTarget is BannerHero)
|
|
{
|
|
{
|
|
return null;
|
|
return null;
|
|
@@ -186,7 +193,7 @@ namespace GameLogic.Combat.Hero
|
|
{
|
|
{
|
|
float speed = _combatHeroEntity.CurrCombatHeroInfo.GetAttSpeed;
|
|
float speed = _combatHeroEntity.CurrCombatHeroInfo.GetAttSpeed;
|
|
float angle = 360 / (1.0f / speed);
|
|
float angle = 360 / (1.0f / speed);
|
|
- SkillTurntable.Update(t, angle*t);
|
|
|
|
|
|
+ SkillTurntable.Update(t, angle * t);
|
|
}
|
|
}
|
|
|
|
|
|
if (taoismSkillBasic != null)
|
|
if (taoismSkillBasic != null)
|