diff --git a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AI/DefyDeathFightData.cs b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AI/DefyDeathFightData.cs index 6e773c52166..5aa10a8f492 100644 --- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AI/DefyDeathFightData.cs +++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AI/DefyDeathFightData.cs @@ -25,12 +25,14 @@ public sealed partial class DefyDeathFightData : Luban.BeanBase cacheJsonNode = _buf; { if(!_buf["LimitTrackRange"].IsBoolean) { throw new SerializationException(); } LimitTrackRange = _buf["LimitTrackRange"]; } { if(!_buf["SeekEnemy"].IsBoolean) { throw new SerializationException(); } SeekEnemy = _buf["SeekEnemy"]; } + { if(!_buf["JoinHoldFlag"].IsBoolean) { throw new SerializationException(); } JoinHoldFlag = _buf["JoinHoldFlag"]; } } - public DefyDeathFightData(bool LimitTrackRange, bool SeekEnemy ) + public DefyDeathFightData(bool LimitTrackRange, bool SeekEnemy, bool JoinHoldFlag ) { this.LimitTrackRange = LimitTrackRange; this.SeekEnemy = SeekEnemy; + this.JoinHoldFlag = JoinHoldFlag; } @@ -47,6 +49,10 @@ public sealed partial class DefyDeathFightData : Luban.BeanBase /// 是否追敌 /// public bool SeekEnemy { get; private set; } + /// + /// 是否加入战旗争夺 + /// + public bool JoinHoldFlag { get; private set; } public const int __ID__ = 1984081312; public override int GetTypeId() => __ID__; @@ -60,6 +66,7 @@ public sealed partial class DefyDeathFightData : Luban.BeanBase return "{ " + "LimitTrackRange:" + LimitTrackRange + "," + "SeekEnemy:" + SeekEnemy + "," + + "JoinHoldFlag:" + JoinHoldFlag + "," + "}"; } } diff --git a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AI/NormalFightData.cs b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AI/NormalFightData.cs index ede74cccc3b..787128e8bd1 100644 --- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AI/NormalFightData.cs +++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AI/NormalFightData.cs @@ -26,13 +26,15 @@ public sealed partial class NormalFightData : Luban.BeanBase { var __json0 = _buf["BuildingType"]; if(!__json0.IsArray) { throw new SerializationException(); } BuildingType = new System.Collections.Generic.List(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0; { if(!__e0.IsNumber) { throw new SerializationException(); } __v0 = __e0; } BuildingType.Add(__v0); } } { if(!_buf["LimitTrackRange"].IsBoolean) { throw new SerializationException(); } LimitTrackRange = _buf["LimitTrackRange"]; } { if(!_buf["SeekEnemy"].IsBoolean) { throw new SerializationException(); } SeekEnemy = _buf["SeekEnemy"]; } + { if(!_buf["JoinHoldFlag"].IsBoolean) { throw new SerializationException(); } JoinHoldFlag = _buf["JoinHoldFlag"]; } } - public NormalFightData(System.Collections.Generic.List BuildingType, bool LimitTrackRange, bool SeekEnemy ) + public NormalFightData(System.Collections.Generic.List BuildingType, bool LimitTrackRange, bool SeekEnemy, bool JoinHoldFlag ) { this.BuildingType = BuildingType; this.LimitTrackRange = LimitTrackRange; this.SeekEnemy = SeekEnemy; + this.JoinHoldFlag = JoinHoldFlag; } @@ -53,6 +55,10 @@ public sealed partial class NormalFightData : Luban.BeanBase /// 是否追敌 /// public bool SeekEnemy { get; private set; } + /// + /// 是否加入战旗争夺 + /// + public bool JoinHoldFlag { get; private set; } public const int __ID__ = -553400115; public override int GetTypeId() => __ID__; @@ -67,6 +73,7 @@ public sealed partial class NormalFightData : Luban.BeanBase + "BuildingType:" + Luban.StringUtil.CollectionToString(BuildingType) + "," + "LimitTrackRange:" + LimitTrackRange + "," + "SeekEnemy:" + SeekEnemy + "," + + "JoinHoldFlag:" + JoinHoldFlag + "," + "}"; } } diff --git a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AICfg/DataAIType.cs b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AICfg/DataAIType.cs index 9b79c44aef1..256179a294d 100644 --- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AICfg/DataAIType.cs +++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AICfg/DataAIType.cs @@ -85,7 +85,7 @@ public sealed partial class DataAIType : Luban.BeanBase /// public AICfg.EAIFightState FightState { get; private set; } /// - /// 常规战斗数据:建筑类型(无配置0),是否限制追踪距离,是否追敌 + /// 常规战斗数据:建筑类型(无配置0),是否限制追踪距离,是否追敌,是否参加战旗争夺(己方无相关逻辑) /// public AI.NormalFightData NormalFightData { get; private set; } /// diff --git a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AICfg/DataMonsterAIType.cs b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AICfg/DataMonsterAIType.cs index 4b68e15c954..8afc0446bce 100644 --- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AICfg/DataMonsterAIType.cs +++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/AICfg/DataMonsterAIType.cs @@ -101,7 +101,7 @@ public sealed partial class DataMonsterAIType : Luban.BeanBase /// public AICfg.EAIFightState FightState { get; private set; } /// - /// 常规战斗数据:建筑类型(无配置0),是否限制追踪距离,是否强行追敌 + /// 常规战斗数据:建筑类型(无配置0),是否限制追踪距离,是否强行追敌,是否参加战旗争夺 /// public AI.NormalFightData NormalFightData { get; private set; } /// @@ -109,7 +109,7 @@ public sealed partial class DataMonsterAIType : Luban.BeanBase /// public AI.SurviveFightData SurviveFightData { get; private set; } /// - /// 舍命数据:是否限制追踪距离,是否强制追敌 + /// 舍命数据:是否限制追踪距离,是否强制追敌,是否参加战旗争夺 /// public AI.DefyDeathFightData DefyDeathFightData { get; private set; } /// diff --git a/ProjectNLD/Assets/Config/Data/aicfg_aitypeconfig.json b/ProjectNLD/Assets/Config/Data/aicfg_aitypeconfig.json index 80821813948..1227c267635 100644 --- a/ProjectNLD/Assets/Config/Data/aicfg_aitypeconfig.json +++ b/ProjectNLD/Assets/Config/Data/aicfg_aitypeconfig.json @@ -20,7 +20,8 @@ 0 ], "LimitTrackRange": true, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": false }, "CoerceFightData": { "SeekEnemy": false @@ -47,7 +48,8 @@ 0 ], "LimitTrackRange": true, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": false }, "CoerceFightData": { "SeekEnemy": true @@ -74,7 +76,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": false }, "CoerceFightData": { "SeekEnemy": true @@ -101,7 +104,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": false }, "CoerceFightData": { "SeekEnemy": true diff --git a/ProjectNLD/Assets/Config/Data/aicfg_aitypemonsterconfig.json b/ProjectNLD/Assets/Config/Data/aicfg_aitypemonsterconfig.json index c64aea559e1..1216461b92e 100644 --- a/ProjectNLD/Assets/Config/Data/aicfg_aitypemonsterconfig.json +++ b/ProjectNLD/Assets/Config/Data/aicfg_aitypemonsterconfig.json @@ -28,7 +28,8 @@ 10 ], "LimitTrackRange": true, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -40,7 +41,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -76,7 +78,8 @@ 10 ], "LimitTrackRange": true, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -88,7 +91,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -124,7 +128,8 @@ 10 ], "LimitTrackRange": true, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -136,7 +141,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -170,7 +176,8 @@ 0 ], "LimitTrackRange": true, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -182,7 +189,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -218,7 +226,8 @@ 10 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -230,7 +239,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": true, @@ -266,7 +276,8 @@ 10 ], "LimitTrackRange": true, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -278,7 +289,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -312,7 +324,8 @@ 0 ], "LimitTrackRange": true, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -322,7 +335,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -356,7 +370,8 @@ 0 ], "LimitTrackRange": true, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -366,7 +381,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -400,7 +416,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -410,7 +427,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -444,7 +462,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -456,7 +475,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -490,7 +510,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -502,7 +523,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -536,7 +558,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -546,7 +569,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -580,7 +604,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -592,7 +617,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -626,7 +652,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -638,7 +665,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -672,7 +700,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -684,7 +713,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -718,7 +748,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -728,7 +759,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -762,7 +794,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -774,7 +807,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -808,7 +842,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -820,7 +855,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": true, @@ -854,7 +890,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -866,7 +903,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": true, @@ -900,7 +938,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -912,7 +951,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -948,7 +988,8 @@ 10 ], "LimitTrackRange": true, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": true }, "SurviveFightData": { "BuildingType": [ @@ -958,7 +999,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": true }, "PresetRoadData": { "IsAttack": false, @@ -992,7 +1034,8 @@ 0 ], "LimitTrackRange": false, - "SeekEnemy": true + "SeekEnemy": true, + "JoinHoldFlag": false }, "SurviveFightData": { "BuildingType": [ @@ -1002,7 +1045,8 @@ }, "DefyDeathFightData": { "LimitTrackRange": false, - "SeekEnemy": false + "SeekEnemy": false, + "JoinHoldFlag": false }, "PresetRoadData": { "IsAttack": false,