【技能】移除主动技能附带 被动技能id

ProjectNLD/Assets/Code/Scripts/Gameplay/Skill/SkillManager.cs

@@ -161,38 +161,11 @@ namespace Gameplay.Skill
             var skill = addUnit.positiveSkill;
             // 增加附带的被动buff技能
             addUnit.AddPassiveBuffIds(skill.runtimeData.configData.PassiveBuffIds);
-            _AddSkillPassiveSkill(skill);
             
             _AddBreakPassiveSkill(character);
             _AddAwakePassiveSkill(character);
         }
 
-        private void _AddSkillPassiveSkill(SkillHandle skillHandle)
-        {
-            var passiveSkillIds = skillHandle.runtimeData.configData.PassiveSkillIds;
-            if (passiveSkillIds == null || passiveSkillIds.Count == 0)
-            {
-                return;
-            }
-            
-            var addUnit = GetUnitSkillManager(skillHandle.owner);
-            if (addUnit == null)
-            {
-                DebugUtil.LogError("角色:{0} 未初始化技能", skillHandle.owner.GetUnitDesc());
-                return;
-            }
-            
-            for (var i = 0; i < passiveSkillIds.Count; ++i)
-            {
-                var passiveSkillId = passiveSkillIds[i];
-                if (passiveSkillId == 0)
-                {
-                    continue;
-                }
-                _AddPassiveSkill(passiveSkillId, addUnit);
-            }
-        }
-
         private void _AddBreakPassiveSkill(Character character)
         {
             var addUnit = GetUnitSkillManager(character);

ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/SkillCfg/DataSkill.cs

@@ -34,7 +34,6 @@ public sealed partial class DataSkill :  Bright.Config.BeanBase
         { if(!_json["ShowEffectId"].IsNumber) { throw new SerializationException(); }  ShowEffectId = _json["ShowEffectId"]; }
         { if(!_json["IsEmitToFloor"].IsBoolean) { throw new SerializationException(); }  IsEmitToFloor = _json["IsEmitToFloor"]; }
         { var __json0 = _json["PassiveBuffIds"]; if(!__json0.IsArray) { throw new SerializationException(); } PassiveBuffIds = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  PassiveBuffIds.Add(__v0); }   }
-        { var __json0 = _json["PassiveSkillIds"]; if(!__json0.IsArray) { throw new SerializationException(); } PassiveSkillIds = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  PassiveSkillIds.Add(__v0); }   }
         { var __json0 = _json["IntParams"]; if(!__json0.IsArray) { throw new SerializationException(); } IntParams = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  IntParams.Add(__v0); }   }
         { var __json0 = _json["FloatParams"]; if(!__json0.IsArray) { throw new SerializationException(); } FloatParams = new System.Collections.Generic.List<float>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { float __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  FloatParams.Add(__v0); }   }
         { if(!_json["CDTime"].IsNumber) { throw new SerializationException(); }  CDTime = _json["CDTime"]; }
@@ -45,7 +44,7 @@ public sealed partial class DataSkill :  Bright.Config.BeanBase
         PostInit();
     }
 
-    public DataSkill(int ID, string NameRead, int AIControllId, int SkillActionId, SkillCfg.ETargetType TargetType, SkillCfg.EReleaseCheckType ReleaseCheckType, bool EnemySelectDisplay, int ReleaseArea, bool IgnoreBlock, int SelectCount, SkillCfg.ETargetPrefer TargetPrefer, int InfluenceAreaId, int ShowAreaId, int ShowEffectId, bool IsEmitToFloor, System.Collections.Generic.List<int> PassiveBuffIds, System.Collections.Generic.List<int> PassiveSkillIds, System.Collections.Generic.List<int> IntParams, System.Collections.Generic.List<float> FloatParams, float CDTime, int LogicId, bool ShowInSkillEditor, System.Collections.Generic.List<int> ReferIds, string IconPath ) 
+    public DataSkill(int ID, string NameRead, int AIControllId, int SkillActionId, SkillCfg.ETargetType TargetType, SkillCfg.EReleaseCheckType ReleaseCheckType, bool EnemySelectDisplay, int ReleaseArea, bool IgnoreBlock, int SelectCount, SkillCfg.ETargetPrefer TargetPrefer, int InfluenceAreaId, int ShowAreaId, int ShowEffectId, bool IsEmitToFloor, System.Collections.Generic.List<int> PassiveBuffIds, System.Collections.Generic.List<int> IntParams, System.Collections.Generic.List<float> FloatParams, float CDTime, int LogicId, bool ShowInSkillEditor, System.Collections.Generic.List<int> ReferIds, string IconPath ) 
     {
         this.ID = ID;
         this.NameRead = NameRead;
@@ -63,7 +62,6 @@ public sealed partial class DataSkill :  Bright.Config.BeanBase
         this.ShowEffectId = ShowEffectId;
         this.IsEmitToFloor = IsEmitToFloor;
         this.PassiveBuffIds = PassiveBuffIds;
-        this.PassiveSkillIds = PassiveSkillIds;
         this.IntParams = IntParams;
         this.FloatParams = FloatParams;
         this.CDTime = CDTime;
@@ -144,10 +142,6 @@ public sealed partial class DataSkill :  Bright.Config.BeanBase
     /// </summary>
     public System.Collections.Generic.List<int> PassiveBuffIds { get; private set; }
     /// <summary>
-    /// 技能附带的被动技能id
-    /// </summary>
-    public System.Collections.Generic.List<int> PassiveSkillIds { get; private set; }
-    /// <summary>
     /// 技能辅助数值int
     /// </summary>
     public System.Collections.Generic.List<int> IntParams { get; private set; }
@@ -207,7 +201,6 @@ public sealed partial class DataSkill :  Bright.Config.BeanBase
         + "ShowEffectId:" + ShowEffectId + ","
         + "IsEmitToFloor:" + IsEmitToFloor + ","
         + "PassiveBuffIds:" + Bright.Common.StringUtil.CollectionToString(PassiveBuffIds) + ","
-        + "PassiveSkillIds:" + Bright.Common.StringUtil.CollectionToString(PassiveSkillIds) + ","
         + "IntParams:" + Bright.Common.StringUtil.CollectionToString(IntParams) + ","
         + "FloatParams:" + Bright.Common.StringUtil.CollectionToString(FloatParams) + ","
         + "CDTime:" + CDTime + ","