| @@ -57,7 +57,7 @@ v1.6 | |||||
| - 扣血则得分100×受到伤害/基本伤害(1500000) | - 扣血则得分100×受到伤害/基本伤害(1500000) | ||||
| - 技能惩罚(Punish)改为 | - 技能惩罚(Punish)改为 | ||||
| - CD:45s | - CD:45s | ||||
| - “使用瞬间,在**视野距离/4范围内(不是可视范围)的**翻窗、开锁门、攻击前后摇、**使用技能期间**的捣蛋鬼会被眩晕(3070+**500***已受伤害/基本伤害(1500000))ms” | |||||
| - “使用瞬间,在**视野距离/3范围内(不是可视范围)的**翻窗、开锁门、攻击前后摇、**使用技能期间**的捣蛋鬼会被眩晕(3070+**500***已受伤害/基本伤害(1500000))ms” | |||||
| - 技能喝茶(HaveTea)(新增) | - 技能喝茶(HaveTea)(新增) | ||||
| - CD:90s | - CD:90s | ||||
| - 在有队友受过伤的情况下,使用瞬间,向当前方向瞬移3000(可以穿墙),如果会碰撞则失败。 | - 在有队友受过伤的情况下,使用瞬间,向当前方向瞬移3000(可以穿墙),如果会碰撞则失败。 | ||||
| @@ -361,7 +361,9 @@ namespace GameClass.GameObj | |||||
| { | { | ||||
| lock (actionLock) | lock (actionLock) | ||||
| { | { | ||||
| if (playerState == PlayerStateType.Moving && IsMoving == 1) return PlayerStateType.Moving; | |||||
| if (playerState == PlayerStateType.Moving) | |||||
| if (IsMoving == 1) return PlayerStateType.Moving; | |||||
| else return PlayerStateType.Null; | |||||
| return playerState; | return playerState; | ||||
| } | } | ||||
| } | } | ||||
| @@ -341,7 +341,7 @@ namespace Gaming | |||||
| || character.PlayerState == PlayerStateType.UsingSkill | || character.PlayerState == PlayerStateType.UsingSkill | ||||
| || character.PlayerState == PlayerStateType.LockingTheDoor || character.PlayerState == PlayerStateType.OpeningTheDoor | || character.PlayerState == PlayerStateType.LockingTheDoor || character.PlayerState == PlayerStateType.OpeningTheDoor | ||||
| || character.PlayerState == PlayerStateType.ClimbingThroughWindows) | || character.PlayerState == PlayerStateType.ClimbingThroughWindows) | ||||
| && gameMap.CanSee(player, character)) | |||||
| && XY.DistanceFloor3(character.Position, player.Position) <= player.ViewRange / 3) | |||||
| { | { | ||||
| if (CharacterManager.BeStunned(character, GameData.timeOfGhostStunnedWhenPunish + GameData.factorOfTimeStunnedWhenPunish * (player.MaxHp - player.HP)) > 0) | if (CharacterManager.BeStunned(character, GameData.timeOfGhostStunnedWhenPunish + GameData.factorOfTimeStunnedWhenPunish * (player.MaxHp - player.HP)) > 0) | ||||
| player.AddScore(GameData.StudentScoreTrickerBeStunned(GameData.timeOfGhostStunnedWhenPunish + GameData.factorOfTimeStunnedWhenPunish * (player.MaxHp - player.HP))); | player.AddScore(GameData.StudentScoreTrickerBeStunned(GameData.timeOfGhostStunnedWhenPunish + GameData.factorOfTimeStunnedWhenPunish * (player.MaxHp - player.HP))); | ||||
| @@ -66,7 +66,7 @@ namespace Preparation.Interface | |||||
| public class Punish : ActiveSkill | public class Punish : ActiveSkill | ||||
| { | { | ||||
| public override int SkillCD => GameData.commonSkillCD; | |||||
| public override int SkillCD => GameData.commonSkillCD * 45 / 30; | |||||
| public override int DurationTime => 0; | public override int DurationTime => 0; | ||||
| } | } | ||||
| @@ -106,6 +106,7 @@ namespace Preparation.Utility | |||||
| Inspire = 13, | Inspire = 13, | ||||
| ShowTime = 14, | ShowTime = 14, | ||||
| SparksNSplash = 15, | SparksNSplash = 15, | ||||
| HaveTea = 16, | |||||
| } | } | ||||
| public enum PassiveSkillType | public enum PassiveSkillType | ||||
| { | { | ||||
| @@ -214,7 +214,7 @@ namespace Preparation.Utility | |||||
| public const int timeOfStudentStunnedWhenCharge = 2090; | public const int timeOfStudentStunnedWhenCharge = 2090; | ||||
| public const int timeOfGhostStunnedWhenPunish = 3070; | public const int timeOfGhostStunnedWhenPunish = 3070; | ||||
| public const int factorOfTimeStunnedWhenPunish = 300 / basicApOfGhost; | |||||
| public const int factorOfTimeStunnedWhenPunish = 500 / basicApOfGhost; | |||||
| public const int factorOfScoreWhenTeacherAttacked = 100;//每个 | public const int factorOfScoreWhenTeacherAttacked = 100;//每个 | ||||
| public const int timeOfGhostSwingingAfterHowl = 800; | public const int timeOfGhostSwingingAfterHowl = 800; | ||||