Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Prefabs/Bullet/ssm_bingqiu.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ee126b5eb1bd37a40928fea2d7a64c49
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/Prefabs/charatar/ssm.prefab

@@ -361,7 +361,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 90e9cd2fc0a74084fbf1a89015db94a9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  bulletPrefab: {fileID: 6998733212867311352, guid: 31d20ac9cf09bea42af60102f3dd8a0b, type: 3}
+  bulletPrefab: {fileID: 6998733212867311352, guid: ee126b5eb1bd37a40928fea2d7a64c49, type: 3}
   role: {fileID: 8433650274028726420}
   damageTyp: 2
   attackCooldown: 3

meng_yao/Assets/common

@@ -1 +1 @@
-Subproject commit cbe42ad621dba92dff20e4fc5704f5d90973acbf
+Subproject commit 1e14910b4dbc8af410380e609bcfc0010370c5e2

meng_yao/Assets/script/A_Fight/SkillUp/SkillUp.cs

@@ -83,7 +83,7 @@ public class SkillUp : Fun
     // 存储技能加成效果
     private Dictionary<string, Dictionary<int, System.Action>> skillUpgrades = new Dictionary<string, Dictionary<int, System.Action>>();
 
-    void Start()
+  public virtual void Start()
     {
         // 初始化技能加成升级
         InitializeSkillUpgrades();

meng_yao/Assets/script/A_Fight/SkillUp/ssm_SkillUp.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
 
 public class ssm_SkillUp : SkillUp
@@ -7,6 +9,24 @@ public class ssm_SkillUp : SkillUp
     /// <summary>
     /// 射程提升1格位置
     /// </summary>
+    /// 
+    private float poisonDuration = 10;//中毒时间
+    private float poisonInterval = 2;//中毒间隔
+    private float poisonDamage = 10;//中毒伤害
+    Action<Role> decelerationBuff;
+    public override void Start()
+    {
+        base.Start();
+        
+         decelerationBuff = CreatePoisonBuff(poisonDuration,poisonInterval,poisonDamage);
+
+        // 将 Buff 添加到玩家的 storageBuff 列表中
+        role.AddBuff(role.storageBuff, decelerationBuff);
+        Debug.LogError("使用技能1-3");
+    }
+
+    
+
     public override void Skill_1_1()
     {
         base.AttackRange = -1;
@@ -25,7 +45,7 @@ public class ssm_SkillUp : SkillUp
     /// </summary>
     public override void Skill_1_5()
     {
-        
+        attack.BulletNumber = 3;
       
     }
 
@@ -35,7 +55,8 @@ public class ssm_SkillUp : SkillUp
     /// </summary>
     public override void Skill_2_1()
     {
-        
+        poisonDamage *= 1.2f;
+        SetPoisonBuff();
     }
     /// <summary>
     /// 敌人中毒后毒药生效时间减少30% 攻击CD增加5%
@@ -43,8 +64,9 @@ public class ssm_SkillUp : SkillUp
     public override void Skill_2_3()
     {
         base.AttackCooldown += 0.05f;
+        poisonInterval *= 0.7f;
+        SetPoisonBuff();
 
-       
     }
     /// <summary>
     /// 敌人中毒后受到伤害提升50%,攻击CD增加5%
@@ -53,5 +75,14 @@ public class ssm_SkillUp : SkillUp
     {
         
         base.AttackCooldown += 0.05f;
+        poisonDamage *= 1.5f;
+        SetPoisonBuff();
+    }
+
+    private void SetPoisonBuff()//重置buff
+    {
+        role.RemoveBuff(role.storageBuff, decelerationBuff);
+        decelerationBuff = CreatePoisonBuff(poisonDuration, poisonInterval, poisonDamage);
+        role.AddBuff(role.storageBuff, decelerationBuff);
     }
 }