diff --git a/ProjectNLD/Assets/Config/Data/buffcfg_buffconfig.json b/ProjectNLD/Assets/Config/Data/buffcfg_buffconfig.json index 1fe6c3cb15a..ecc3f418f58 100644 --- a/ProjectNLD/Assets/Config/Data/buffcfg_buffconfig.json +++ b/ProjectNLD/Assets/Config/Data/buffcfg_buffconfig.json @@ -25395,5 +25395,97 @@ "BuffDisplayIcon": "Icon_Debuff_bearweight_01", "BuffDesc": "", "GroundBuffDisplayIcon": "" + }, + { + "ID": 10000610, + "Name": "英杰庇护-常规", + "GroupId": 0, + "Level": 1, + "BuffEffectType": 0, + "CanTriggerOnDead": false, + "BlockPlayAudio": false, + "RepeatType": 0, + "BuffType": 30, + "ExistType": 0, + "IsSkillContinue": false, + "ExExitType": 0, + "ExExitParams": [], + "TriggerType": 0, + "MaxExistTime": 0, + "ExistEffectId": 0, + "TiggerUnitTime": 0, + "AttackPowerLevel": 30, + "AttackDirection": 0, + "AttackDamageType": 0, + "PorpParams": [], + "FloatParams": [ + 300, + 0 + ], + "BuffDisplayIcon": "", + "BuffDesc": "", + "GroundBuffDisplayIcon": "" + }, + { + "ID": 10000611, + "Name": "英杰庇护-常规", + "GroupId": 10000611, + "Level": 1, + "BuffEffectType": 0, + "CanTriggerOnDead": false, + "BlockPlayAudio": false, + "RepeatType": 2, + "BuffType": 33, + "ExistType": 2, + "IsSkillContinue": false, + "ExExitType": 0, + "ExExitParams": [], + "TriggerType": 3, + "MaxExistTime": 5, + "ExistEffectId": 0, + "TiggerUnitTime": 0, + "AttackPowerLevel": 30, + "AttackDirection": 0, + "AttackDamageType": 0, + "PorpParams": [ + 1 + ], + "FloatParams": [ + -0.1 + ], + "BuffDisplayIcon": "Icon_Buff_injuryreduction_01", + "BuffDesc": "", + "GroundBuffDisplayIcon": "" + }, + { + "ID": 10000612, + "Name": "英杰庇护-进修效果", + "GroupId": 10000612, + "Level": 1, + "BuffEffectType": 0, + "CanTriggerOnDead": false, + "BlockPlayAudio": false, + "RepeatType": 2, + "BuffType": 33, + "ExistType": 2, + "IsSkillContinue": false, + "ExExitType": 0, + "ExExitParams": [], + "TriggerType": 16, + "MaxExistTime": 5, + "ExistEffectId": 0, + "TiggerUnitTime": 0, + "AttackPowerLevel": 30, + "AttackDirection": 0, + "AttackDamageType": 0, + "PorpParams": [ + 1 + ], + "FloatParams": [ + -0.03 + ], + "BuffDisplayIcon": "", + "BuffDesc": "", + "GroundBuffDisplayIcon": "" } ] \ No newline at end of file diff --git a/ProjectNLD/Assets/Config/Data/bulletcfg_bulletconfig.json b/ProjectNLD/Assets/Config/Data/bulletcfg_bulletconfig.json index 294db5aa9f6..312c508bfab 100644 --- a/ProjectNLD/Assets/Config/Data/bulletcfg_bulletconfig.json +++ b/ProjectNLD/Assets/Config/Data/bulletcfg_bulletconfig.json @@ -21515,5 +21515,27 @@ "PrefabPath": "", "HitAudioId": "", "DestroyEffectId": 0 + }, + { + "ID": 10000610, + "Name": "英杰庇护-主动&衍生子弹", + "LockType": 0, + "ReCalcMiss": false, + "FlyLineType": 0, + "FlyLineParams": [], + "FlySpeed": 60, + "FilterId": 10000610, + "AreaId": -1, + "LightDuring": 0, + "AddBulletIds": [], + "BuffList": [ + 10000610, + 10000611, + 10000612 + ], + "WarningEffectId": 0, + "PrefabPath": "", + "HitAudioId": "", + "DestroyEffectId": 0 } ] \ No newline at end of file diff --git a/ProjectNLD/Assets/Config/Data/gamecfg_gfilterconfig.json b/ProjectNLD/Assets/Config/Data/gamecfg_gfilterconfig.json index 07a8e687fb6..3ed87b9ef20 100644 --- a/ProjectNLD/Assets/Config/Data/gamecfg_gfilterconfig.json +++ b/ProjectNLD/Assets/Config/Data/gamecfg_gfilterconfig.json @@ -12800,5 +12800,17 @@ "ActiveOnCharacter": true, "ActiveOnVehicle": true, "ActiveOnBuild": true + }, + { + "ID": 10000610, + "Name": "英杰庇护-主动&衍生子弹", + "FilterType": 2, + "JobFilters": [], + "FractionFilter": [], + "MoraleFilter": [], + "ExistBuffGroupIdFilter": [], + "ActiveOnCharacter": true, + "ActiveOnVehicle": false, + "ActiveOnBuild": false } ] \ No newline at end of file diff --git a/ProjectNLD/Assets/Config/Data/skillcfg_skillbase.json b/ProjectNLD/Assets/Config/Data/skillcfg_skillbase.json index 302db5a5eef..239ad86f115 100644 --- a/ProjectNLD/Assets/Config/Data/skillcfg_skillbase.json +++ b/ProjectNLD/Assets/Config/Data/skillcfg_skillbase.json @@ -1,11 +1,4 @@ [ - { - "ID": 1000610, - "RoleID": 100006, - "Holder": 0, - "SkillType": 0, - "UnlockType": "" - }, { "ID": 1000810, "RoleID": 100008, @@ -300,6 +293,13 @@ "SkillType": 0, "UnlockType": "" }, + { + "ID": 10000610, + "RoleID": 100006, + "Holder": 0, + "SkillType": 0, + "UnlockType": "" + }, { "ID": 2000011, "RoleID": 100001, diff --git a/ProjectNLD/Assets/Config/Data/skillcfg_skillconfig.json b/ProjectNLD/Assets/Config/Data/skillcfg_skillconfig.json index 266e6fbb7d2..b240d58d37f 100644 --- a/ProjectNLD/Assets/Config/Data/skillcfg_skillconfig.json +++ b/ProjectNLD/Assets/Config/Data/skillcfg_skillconfig.json @@ -1211,8 +1211,8 @@ "TargetPrefer": 0, "InfluenceAreaId": 1, "ShowAreaIcon": "UI_Area0.png", - "ShowAreaId": 0, - "IsEmitToFloor": false, + "ShowAreaId": 1, + "IsEmitToFloor": true, "PassiveBuffIds": [], "MaxUseCount": -1, "MaxStoreCount": 1, @@ -1344,6 +1344,35 @@ ], "IconPath": "Icon_skill_A00005.png" }, + { + "ID": 10000610, + "SkillLevel": 1, + "NameRead": "朱利亚斯", + "SkillActionId": 1, + "AISkillActionId": 5, + "TargetType": 0, + "ReleaseCheckType": 0, + "MinReleaseDistance": 0, + "ReleaseArea": 0, + "IgnoreBlock": false, + "SelectCount": -1, + "TargetPrefer": 0, + "InfluenceAreaId": 1, + "ShowAreaIcon": "UI_Area0.png", + "ShowAreaId": 1, + "IsEmitToFloor": true, + "PassiveBuffIds": [], + "MaxUseCount": -1, + "MaxStoreCount": 1, + "ChargeType": 3, + "ChargeParam": 20, + "LogicId": 100006, + "ShowInSkillEditor": true, + "ReferIds": [ + 10000610 + ], + "IconPath": "Icon_skill_A00006.png" + }, { "ID": 30001, "SkillLevel": 1, diff --git a/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_100006.json b/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_100006.json new file mode 100644 index 00000000000..b9b9201a47b --- /dev/null +++ b/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_100006.json @@ -0,0 +1 @@ +{"skillId":10000610,"actionList":[{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":3.3333334922790529,"actionType":4},{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":3.3333334922790529,"actionType":5},{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":0.0,"actionType":7},{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":2.2833333015441896,"actionType":1},{"id":71,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":0.0,"actionType":3},{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"SE_cha_skill_100006","triggerTime":0.0,"actionType":2}]} \ No newline at end of file diff --git a/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_10006.json.meta b/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_100006.json.meta similarity index 75% rename from ProjectNLD/Assets/Config/Skills/LogicAssets/logic_10006.json.meta rename to ProjectNLD/Assets/Config/Skills/LogicAssets/logic_100006.json.meta index c79683b110f..f4ff4fece41 100644 --- a/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_10006.json.meta +++ b/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_100006.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 555307e39bdb8e84499b1bbea760c710 +guid: f540aee486f2e3c45811b9698f247de7 TextScriptImporter: externalObjects: {} userData: diff --git a/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_10006.json b/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_10006.json deleted file mode 100644 index 0b43e21d56e..00000000000 --- a/ProjectNLD/Assets/Config/Skills/LogicAssets/logic_10006.json +++ /dev/null @@ -1 +0,0 @@ -{"skillId":1000610,"actionList":[{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":3.3333334922790529,"actionType":4},{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":3.3333334922790529,"actionType":5},{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":0.0,"actionType":7},{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":2.2833333015441896,"actionType":1},{"id":71,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"","triggerTime":0.0,"actionType":3},{"id":0,"subId":0,"floatParam1":0.0,"floatParam2":0.0,"floatParam3":0.0,"floatParam4":0.0,"intParam1":0,"intParam2":0,"intParam3":0,"intParam4":0,"stringParam1":"SE_cha_skill_100006","triggerTime":0.0,"actionType":2}]} \ No newline at end of file