Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameLogic/Combat/Buff/BuffBasic.cs

@@ -16,12 +16,20 @@ namespace GameLogic.Combat.Buff
         protected TriggerData _triggerData;
         protected float _currTime;
 
+        public int buffCount {
+            get
+            {
+                return buffInf.count;
+            }
+        }
+
         public void Init(CombatHeroEntity combatHeroEntity, CombatHeroEntity source, BuffInfo buffInfo)
         {
             this.combatHeroEntity = combatHeroEntity;
             this.buffInf = buffInfo;
             this.source = source;
             ProInit();
+            UpdateEffect();
         }
 
         protected virtual void ProInit()
@@ -31,11 +39,18 @@ namespace GameLogic.Combat.Buff
         public override void ActiveObj()
         {
         }
+        public void UpdateEffect()
+        {
+            ProUpdateEffect();
+        }
+        protected virtual void ProUpdateEffect()
+        {
+        }
 
         public TimeLineEventLogicGroupBasic ActivationTimeLineData(string groupName,
             BetterList<ILifetCycleHitPoint> currTarget = null,
             Vector3[] customizePos = null, System.Action finishCallBack = null, float startTime = default,
-            object extraData = null,int indexCount=0)
+            object extraData = null, int indexCount = 0)
         {
             TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
                 source.combatHeroTimeLineControl

Assets/Scripts/GameLogic/Combat/Buff/b_1001.cs

@@ -5,35 +5,29 @@ using GameLogic.Player;
 namespace GameLogic.Combat.Buff
 {
     /// <summary>
-    /// 燃烧爆炸
+    /// 寒气 每到寒气对敌人的功法运转速度降低1%，10道寒气后，敌人将会被冻结，功法不在运转。火系功法能清除1层
     /// </summary>
     public class b_1001 : BuffBasic
     {
-        TimeLineEventLogicGroupBasic _timeLineEventLogicGroupBasic;
-
+        private float lasetAddValue;
         protected override void ProInit()
         {
-            string timeLineName = buffInf.BuffConfig.scriptsName.ToString();
-            _timeLineEventLogicGroupBasic = ActivationTimeLineData(timeLineName);
+            
         }
 
-        protected override void ProUpdate(float t)
-        {
-            if (_currTime >= 0.2f)
-            {
-                ActivationTimeLineData("b_1001_1");
 
-                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(source.CurrCombatHeroInfo.attack.Value,
-                    buffInf.BuffConfig.effectValue[0]);
-                HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(source, combatHeroEntity,
-                    v, AttType.Buff, _triggerData,WuXingType.Null);
-                combatHeroEntity.BuffControl.RemoveBuff(this);
-            }
+        protected override void ProUpdateEffect()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= lasetAddValue;
+            lasetAddValue = 0;
+            lasetAddValue = buffCount * buffInf.BuffConfig.effectValue[0];
+            
         }
 
         public override void Dispose()
         {
-            _timeLineEventLogicGroupBasic.BreakTimeLine(combatHeroEntity);
+            combatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= lasetAddValue;
+            lasetAddValue = 0;
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Buff/b_1002.cs

@@ -0,0 +1,10 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 冻结，敌人不能做任何作用，功法将会被封住。部分法宝可以释放
+    /// </summary>
+    public class b_1002 : BuffBasic
+    {
+        
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1002.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5e15c268a1b841798ba9fce04aa8d9f5
+timeCreated: 1743151459

Assets/Scripts/GameLogic/Combat/Buff/b_1003.cs

@@ -0,0 +1,9 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 3、毒：每层毒对敌人每秒照成1%伤害，10层毒后毒气会入侵五脏对敌人对敌人施加噬魂
+    /// </summary>
+    public class b_1003 : BuffBasic
+    {
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1003.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 602cbb382d5542409b165bd9879c9086
+timeCreated: 1743152447

Assets/Scripts/GameLogic/Combat/Buff/b_1004.cs

@@ -0,0 +1,9 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 4、噬魂：敌人每使用一次功法对应功法的伤势增加1
+    /// </summary>
+    public class b_1004 : BuffBasic
+    {
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1004.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1e495fdec5b540509a6f055c29d93b56
+timeCreated: 1743152834

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -36,7 +36,10 @@ public class CombatHeroInfo
     public HeroPowerUpConfig powerUpConfig;
     public MonsterPowerUpConfig MonsterPowerUpConfig;
     public HeroPromoteConfig promoteConfig;
-
+    /// <summary>
+    /// 添加的攻击速度比例%
+    /// </summary>
+    public float addAttSpeed_bl = (float)2;
     /// <summary>
     /// 金
     /// </summary>

Assets/Scripts/GameLogic/Combat/Skill/S2001.cs

@@ -5,6 +5,9 @@ using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace GameLogic.Combat.Skill
 {
+    /// <summary>
+    /// 烈焰剑  向前方发出一柄剑，对敌人造成火系伤害，对敌人施加一层灼热，比有10%概率对敌人造成1火伤势
+    /// </summary>
     public class S2001: SkillBasic
     {
         protected override void ProUseSkill()