diff --git a/meng_yao/Assets/Prefabs/Bullet/bingqiu _ssy.prefab b/meng_yao/Assets/Prefabs/Bullet/bingqiu _ssy.prefab index 3307f667..783b73d6 100644 --- a/meng_yao/Assets/Prefabs/Bullet/bingqiu _ssy.prefab +++ b/meng_yao/Assets/Prefabs/Bullet/bingqiu _ssy.prefab @@ -4819,7 +4819,7 @@ MonoBehaviour: role: {fileID: 0} attackObj: {fileID: 0} myBulletType: 0 - bulletAttributes: 3 + bulletAttributes: 0 bulletMoveType: 0 BulletDeadTimer: 10 animator: {fileID: 0} diff --git a/meng_yao/Assets/Prefabs/charatar/enemy/SnowHp.prefab b/meng_yao/Assets/Prefabs/charatar/enemy/SnowHp.prefab index be52f72a..8de38ef3 100644 --- a/meng_yao/Assets/Prefabs/charatar/enemy/SnowHp.prefab +++ b/meng_yao/Assets/Prefabs/charatar/enemy/SnowHp.prefab @@ -80,7 +80,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\U0001F4A5\U0001F525100" + m_Text: --- !u!114 &7426565245524278981 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/common b/meng_yao/Assets/common index 2d4dd3e1..861ba21b 160000 --- a/meng_yao/Assets/common +++ b/meng_yao/Assets/common @@ -1 +1 @@ -Subproject commit 2d4dd3e1c9e746dc5568626b91fdc9cb45cb56cc +Subproject commit 861ba21b13a617c5391bec896a9960a08dffa00a diff --git a/meng_yao/Assets/script/A_Fight/SkillUp/ssy_SkillUp.cs b/meng_yao/Assets/script/A_Fight/SkillUp/ssy_SkillUp.cs index f57e29af..b6c76bd3 100644 --- a/meng_yao/Assets/script/A_Fight/SkillUp/ssy_SkillUp.cs +++ b/meng_yao/Assets/script/A_Fight/SkillUp/ssy_SkillUp.cs @@ -9,24 +9,24 @@ public class ssy_SkillUp : SkillUp /// public override void Skill_1_1() { - base.AttackCooldown += -0.25f; + base.attack.splitNum = 3; } /// /// 每个小子弹伤害增加30%,攻击CD增加5% /// public override void Skill_1_3() { - base.SpeedOfBullets += 0.2f; - base.AttackRange = -1; - attack.SetAttackRange(); + attack.SplitAttack *= (1 + 0.3f); + base.AttackCooldown += 0.05f; } /// /// 每次射出2个子弹,攻击CD增加5% /// public override void Skill_1_5() { + attack.BulletNumber = 2; base.AttackCooldown += 0.05f; - base.DamageUp += 0.3f; + } @@ -35,15 +35,15 @@ public class ssy_SkillUp : SkillUp /// public override void Skill_2_1() { - base.DamageOfSky += 0.25f; + base.DamageOfMin += 0.25f; } /// /// 攻击CD减少25%,射程减少1格 /// public override void Skill_2_3() { - //base.AttackCooldown += 0.75f; - DamageOfMin += 0.25f; + base.AttackCooldown -= 0.25f; + base.AttackRange = -1; attack.SetAttackRange(); } @@ -53,7 +53,8 @@ public class ssy_SkillUp : SkillUp public override void Skill_2_5() { Debug.Log("技能_2_5"); - base.CriticalRate += 0.2f; - base.AttackCooldown += 0.05f; + base.DamageOfMin += 0.25f; + base.AttackRange = -1; + attack.SetAttackRange(); } }